Fix a bunch of merge conflict screwups.

mluisbrown · mluisbrown · commit b1350e6bc199 · 2021-09-10T16:42:45.000+01:00
diff --git a/Examples/CaseStudies/UIKitCaseStudies/LoadThenNavigate.swift b/Examples/CaseStudies/UIKitCaseStudies/LoadThenNavigate.swift
@@ -39,7 +39,7 @@ let lazyNavigationReducer =
         state.isActivityIndicatorHidden = false
         return Effect(value: .setNavigationIsActiveDelayCompleted)
           .delay(1, on: environment.mainQueue)
-          .cancellable(id: CancelId()
+          .cancellable(id: CancelId())
       case .setNavigation(isActive: false):
         state.optionalCounter = nil
         return .none
diff --git a/Examples/CaseStudies/UIKitCaseStudies/NavigateAndLoad.swift b/Examples/CaseStudies/UIKitCaseStudies/NavigateAndLoad.swift
@@ -38,7 +38,7 @@ let eagerNavigationReducer =
         state.isNavigationActive = true
         return Effect(value: .setNavigationIsActiveDelayCompleted)
           .delay(1, on: environment.mainQueue)
-          .cancellable(id: CancelId()
+          .cancellable(id: CancelId())
       case .setNavigation(isActive: false):
         state.isNavigationActive = false
         state.optionalCounter = nil
diff --git a/Examples/TicTacToe/tic-tac-toe/Tests/AppCoreTests/AppCoreTests.swift b/Examples/TicTacToe/tic-tac-toe/Tests/AppCoreTests/AppCoreTests.swift
@@ -1,4 +1,5 @@
 import ComposableArchitecture
+import ReactiveSwift
 import AppCore
 import AuthenticationClient
 import XCTest
@@ -14,7 +15,7 @@ class AppCoreTests: XCTestCase {
       reducer: appReducer,
       environment: .init(
         authenticationClient: authenticationClient,
-        mainQueue: .immediate
+        mainQueue: ImmediateScheduler()
       )
     )
 
@@ -62,7 +63,7 @@ class AppCoreTests: XCTestCase {
       reducer: appReducer,
       environment: .init(
         authenticationClient: authenticationClient,
-        mainQueue: .immediate
+        mainQueue: ImmediateScheduler()
       )
     )
 
diff --git a/Examples/TicTacToe/tic-tac-toe/Tests/LoginCoreTests/LoginCoreTests.swift b/Examples/TicTacToe/tic-tac-toe/Tests/LoginCoreTests/LoginCoreTests.swift
@@ -1,11 +1,7 @@
 import AuthenticationClient
 import ComposableArchitecture
 import LoginCore
-<<<<<<< ours:Examples/TicTacToe/Tests/LoginCoreTests.swift
 import ReactiveSwift
-import TicTacToeCommon
-=======
->>>>>>> theirs:Examples/TicTacToe/tic-tac-toe/Tests/LoginCoreTests/LoginCoreTests.swift
 import TwoFactorCore
 import XCTest
 
diff --git a/Examples/TicTacToe/tic-tac-toe/Tests/LoginSwiftUITests/LoginSwiftUITests.swift b/Examples/TicTacToe/tic-tac-toe/Tests/LoginSwiftUITests/LoginSwiftUITests.swift
@@ -1,11 +1,7 @@
 import AuthenticationClient
 import ComposableArchitecture
 import LoginCore
-<<<<<<< ours:Examples/TicTacToe/Tests/LoginSwiftUITests.swift
 import ReactiveSwift
-import TicTacToeCommon
-=======
->>>>>>> theirs:Examples/TicTacToe/tic-tac-toe/Tests/LoginSwiftUITests/LoginSwiftUITests.swift
 import XCTest
 
 @testable import LoginSwiftUI
diff --git a/Examples/TicTacToe/tic-tac-toe/Tests/TwoFactorCoreTests/TwoFactorCoreTests.swift b/Examples/TicTacToe/tic-tac-toe/Tests/TwoFactorCoreTests/TwoFactorCoreTests.swift
@@ -1,5 +1,6 @@
 import AuthenticationClient
 import ComposableArchitecture
+import ReactiveSwift
 import TwoFactorCore
 import XCTest
 
@@ -10,7 +11,7 @@ class TwoFactorCoreTests: XCTestCase {
       reducer: twoFactorReducer,
       environment: TwoFactorEnvironment(
         authenticationClient: .failing,
-        mainQueue: .immediate
+        mainQueue: ImmediateScheduler()
       )
     )
 
@@ -46,7 +47,7 @@ class TwoFactorCoreTests: XCTestCase {
       reducer: twoFactorReducer,
       environment: TwoFactorEnvironment(
         authenticationClient: .failing,
-        mainQueue: .immediate
+        mainQueue: ImmediateScheduler()
       )
     )
 
diff --git a/Examples/TicTacToe/tic-tac-toe/Tests/TwoFactorSwiftUITests/TwoFactorSwiftUITests.swift b/Examples/TicTacToe/tic-tac-toe/Tests/TwoFactorSwiftUITests/TwoFactorSwiftUITests.swift
@@ -1,10 +1,6 @@
 import AuthenticationClient
 import ComposableArchitecture
-<<<<<<< ours:Examples/TicTacToe/Tests/TwoFactorSwiftUITests.swift
 import ReactiveSwift
-import TicTacToeCommon
-=======
->>>>>>> theirs:Examples/TicTacToe/tic-tac-toe/Tests/TwoFactorSwiftUITests/TwoFactorSwiftUITests.swift
 import TwoFactorCore
 import XCTest
 
diff --git a/Package.swift b/Package.swift
@@ -19,7 +19,7 @@ let package = Package(
   dependencies: [
     .package(name: "Benchmark", url: "https://github.com/google/swift-benchmark", from: "0.1.0"),
     .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift", from: "6.7.0"),
-    .package(url: "https://github.com/pointfreeco/swift-case-paths", from: "0.4.0"),
+    .package(url: "https://github.com/pointfreeco/swift-case-paths", from: "0.7.0"),
     .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "0.2.1"),
   ],
   targets: [

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import ComposableArchitecture`
	`2`	`+import ReactiveSwift`
`2`	`3`	`import AppCore`
`3`	`4`	`import AuthenticationClient`
`4`	`5`	`import XCTest`
`@@ -14,7 +15,7 @@ class AppCoreTests: XCTestCase {`
`14`	`15`	`reducer: appReducer,`
`15`	`16`	`environment: .init(`
`16`	`17`	`authenticationClient: authenticationClient,`
`17`		`- mainQueue: .immediate`
	`18`	`+ mainQueue: ImmediateScheduler()`
`18`	`19`	`)`
`19`	`20`	`)`
`20`	`21`
`@@ -62,7 +63,7 @@ class AppCoreTests: XCTestCase {`
`62`	`63`	`reducer: appReducer,`
`63`	`64`	`environment: .init(`
`64`	`65`	`authenticationClient: authenticationClient,`
`65`		`- mainQueue: .immediate`
	`66`	`+ mainQueue: ImmediateScheduler()`
`66`	`67`	`)`
`67`	`68`	`)`
`68`	`69`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`import AuthenticationClient`
`2`	`2`	`import ComposableArchitecture`
	`3`	`+import ReactiveSwift`
`3`	`4`	`import TwoFactorCore`
`4`	`5`	`import XCTest`
`5`	`6`
`@@ -10,7 +11,7 @@ class TwoFactorCoreTests: XCTestCase {`
`10`	`11`	`reducer: twoFactorReducer,`
`11`	`12`	`environment: TwoFactorEnvironment(`
`12`	`13`	`authenticationClient: .failing,`
`13`		`- mainQueue: .immediate`
	`14`	`+ mainQueue: ImmediateScheduler()`
`14`	`15`	`)`
`15`	`16`	`)`
`16`	`17`
`@@ -46,7 +47,7 @@ class TwoFactorCoreTests: XCTestCase {`
`46`	`47`	`reducer: twoFactorReducer,`
`47`	`48`	`environment: TwoFactorEnvironment(`
`48`	`49`	`authenticationClient: .failing,`
`49`		`- mainQueue: .immediate`
	`50`	`+ mainQueue: ImmediateScheduler()`
`50`	`51`	`)`
`51`	`52`	`)`
`52`	`53`