Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TCA using combine #113

Draft
wants to merge 20 commits into
base: feature/rxtca-0.52.0
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@
"version": "0.11.0"
}
},
{
"package": "RxCombine",
"repositoryURL": "https://github.com/jeffersonsetiawan/RxCombine",
"state": {
"branch": null,
"revision": "0b984ee089e29736b7f07df03b3af667683deefd",
"version": null
}
},
{
"package": "RxSwift",
"repositoryURL": "https://github.com/ReactiveX/RxSwift",
Expand Down Expand Up @@ -55,6 +64,15 @@
"version": "0.4.0"
}
},
{
"package": "swift-collections",
"repositoryURL": "https://github.com/apple/swift-collections",
"state": {
"branch": null,
"revision": "3d2dc41a01f9e49d84f0a3925fb858bed64f702d",
"version": "1.1.2"
}
},
{
"package": "swift-concurrency-extras",
"repositoryURL": "https://github.com/pointfreeco/swift-concurrency-extras",
Expand Down Expand Up @@ -82,6 +100,15 @@
"version": "0.6.0"
}
},
{
"package": "swift-identified-collections",
"repositoryURL": "https://github.com/pointfreeco/swift-identified-collections",
"state": {
"branch": null,
"revision": "d01446a78fb768adc9a78cbb6df07767c8ccfc29",
"version": "0.8.0"
}
},
{
"package": "xctest-dynamic-overlay",
"repositoryURL": "https://github.com/pointfreeco/xctest-dynamic-overlay",
Expand Down
3 changes: 2 additions & 1 deletion Examples/Examples/7-Timer/TimerVC+Reducer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
// Created by victor.cuaca on 07/10/22.
//

import UIKit
import RxComposableArchitecture
import RxSwift

Expand All @@ -21,7 +22,7 @@ struct TimerExample: ReducerProtocol {
func reduce(into state: inout State, action: Action) -> Effect<Action> {
switch action {
case .onDidLoad:
return Effect<Int>.timer(id: "0", every: .seconds(1), on: MainScheduler.instance)
return Effect.timer(id: "0", every: .seconds(1), on: DispatchQueue.main)
.map { _ in
print(">> Timer tick")
return Action.onTimerTick
Expand Down
14 changes: 6 additions & 8 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ let package = Package(
.package(name: "Benchmark", url: "https://github.com/google/swift-benchmark", from: "0.1.0"),
.package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "0.8.5"),
.package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "0.9.1"),
.package(url: "https://github.com/pointfreeco/swift-dependencies", from: "0.2.0")
.package(url: "https://github.com/pointfreeco/swift-dependencies", from: "0.2.0"),
.package(url: "https://github.com/pointfreeco/swift-identified-collections", from: "0.7.0"),
.package(url: "https://github.com/jeffersonsetiawan/RxCombine", revision: "0b984ee089e29736b7f07df03b3af667683deefd")
// .package(url: "https://github.com/jeffersonsetiawan/RxCombine", branch: "rxswift5")
],
targets: [
.target(
Expand All @@ -33,6 +36,8 @@ let package = Package(
.product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
.product(name: "CustomDump", package: "swift-custom-dump"),
.product(name: "Dependencies", package: "swift-dependencies"),
.product(name: "IdentifiedCollections", package: "swift-identified-collections"),
.product(name: "RxCombine", package: "RxCombine"),
]
),
.testTarget(
Expand All @@ -42,12 +47,5 @@ let package = Package(
.product(name: "CustomDump", package: "swift-custom-dump"),
]
),
.executableTarget(
name: "RxComposableArchitecture-Benchmark",
dependencies: [
"RxComposableArchitecture",
.product(name: "Benchmark", package: "Benchmark"),
]
),
]
)
2 changes: 2 additions & 0 deletions RxComposableArchitecture.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,7 @@ Pod::Spec.new do |s|
s.dependency 'XCTestDynamicOverlay'
s.dependency 'CustomDump'
s.dependency 'Dependencies'
s.dependency 'RxCombine'
s.dependency 'IdentifiedCollections'

end
54 changes: 0 additions & 54 deletions Sources/RxComposableArchitecture-Benchmark/Common.swift

This file was deleted.

37 changes: 0 additions & 37 deletions Sources/RxComposableArchitecture-Benchmark/Dependencies.swift

This file was deleted.

29 changes: 0 additions & 29 deletions Sources/RxComposableArchitecture-Benchmark/Effect.swift

This file was deleted.

48 changes: 0 additions & 48 deletions Sources/RxComposableArchitecture-Benchmark/StoreScope.swift

This file was deleted.

10 changes: 0 additions & 10 deletions Sources/RxComposableArchitecture-Benchmark/main.swift

This file was deleted.

Loading