Skip to content

Commit 2be283b

Browse files
committed
Fix some more merge bugs.
Add back Xcode 12 CI! Update ReactiveSwift version to 6.4.0 (for Xcode 12).
1 parent 5310c2b commit 2be283b

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
xcode:
1717
- 11.4
1818
- 11.7
19-
# - 12.0
19+
- 12.0
2020
steps:
2121
- uses: actions/checkout@v2
2222
- name: Select Xcode ${{ matrix.xcode }}

Examples/CaseStudies/SwiftUICaseStudies/04-HigherOrderReducers-Recursion.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import ComposableArchitecture
2+
import ReactiveSwift
23
import SwiftUI
34

45
private let readMe = """
@@ -69,7 +70,7 @@ let nestedReducer = Reducer<
6970

7071
state.description = name
7172
return Effect(value: .exclaim)
72-
.debounce(id: ExclaimId(), for: 1, scheduler: DispatchQueue.main)
73+
.debounce(id: ExclaimId(), interval: 1, scheduler: QueueScheduler.main)
7374
}
7475
}
7576

Examples/TicTacToe/Tests/LoginCoreTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class LoginCoreTests: XCTestCase {
7575
Effect(value: .init(token: "deadbeefdeadbeef", twoFactorRequired: false))
7676
}
7777
),
78-
mainQueue: AnyScheduler(self.scheduler)
78+
mainQueue: self.scheduler
7979
)
8080
)
8181

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.1
1+
// swift-tools-version:5.2
22

33
import PackageDescription
44

@@ -26,7 +26,7 @@ let package = Package(
2626
],
2727
dependencies: [
2828
.package(url: "https://github.com/pointfreeco/swift-case-paths", from: "0.1.1"),
29-
.package(url: "https://github.com/ReactiveCocoa/ReactiveSwift", from: "6.3.0"),
29+
.package(url: "https://github.com/ReactiveCocoa/ReactiveSwift", from: "6.4.0"),
3030
],
3131
targets: [
3232
.target(

0 commit comments

Comments
 (0)