1) Cartfile & podspec updated for ReSwift4.x

2) Changed router init signature to match breaking changes on ReSwif4.x
3) Updated tests

Author: rpassis

Cartfile

@@ -1 +1 @@
-github "ReSwift/ReSwift" ~> 3.0.0
+github "ReSwift/ReSwift" ~> 4.0.0

Cartfile.resolved

@@ -1,3 +1,3 @@
-github "Quick/Nimble" "v5.1.1"
-github "Quick/Quick" "v1.0.0"
-github "ReSwift/ReSwift" "3.0.0"
+github "Quick/Nimble" "v6.1.0"
+github "Quick/Quick" "v1.1.0"
+github "ReSwift/ReSwift" "4.0.0"

ReSwiftRouter.podspec

@@ -18,5 +18,5 @@ Pod::Spec.new do |s|
   s.watchos.deployment_target = '2.0'
   s.requires_arc = true
   s.source_files     = 'ReSwiftRouter/**/*.swift'
-  s.dependency 'ReSwift', '~> 3.0.0'
+  s.dependency 'ReSwift', '~> 4.0.0'
 end

ReSwiftRouter/Router.swift

@@ -11,18 +11,17 @@ import ReSwift
 
 open class Router<State: StateType>: StoreSubscriber {
 
-    public typealias NavigationStateSelector = (State) -> NavigationState
+    public typealias NavigationStateTransform = (Subscription<State>) -> Subscription<NavigationState>
 
     var store: Store<State>
     var lastNavigationState = NavigationState()
     var routables: [Routable] = []
     let waitForRoutingCompletionQueue = DispatchQueue(label: "WaitForRoutingCompletionQueue", attributes: [])
 
-    public init(store: Store<State>, rootRoutable: Routable,  stateSelector: @escaping NavigationStateSelector) {
+    public init(store: Store<State>, rootRoutable: Routable,  stateTransform: @escaping NavigationStateTransform) {
         self.store = store 
         self.routables.append(rootRoutable)
-
-        self.store.subscribe(self, selector: stateSelector)
+        self.store.subscribe(self, transform: stateTransform)
     }
 
     open func newState(state: NavigationState) {

ReSwiftRouterTests/ReSwiftRouterIntegrationTests.swift

@@ -65,18 +65,14 @@ struct FakeAppState: StateType {
     var navigationState = NavigationState()
 }
 
-class FakeReducer: Reducer {
-    func handleAction(action: Action, state: FakeAppState?) -> FakeAppState {
-        return state ?? FakeAppState()
-    }
+func fakeReducer(action: Action, state: FakeAppState?) -> FakeAppState {
+    return state ?? FakeAppState()
 }
 
-struct AppReducer: Reducer {
-    func handleAction(action: Action, state: FakeAppState?) -> FakeAppState {
-        return FakeAppState(
-            navigationState: NavigationReducer.handleAction(action, state: state?.navigationState)
-        )
-    }
+func appReducer(action: Action, state: FakeAppState?) -> FakeAppState {
+    return FakeAppState(
+        navigationState: NavigationReducer.handleAction(action, state: state?.navigationState)
+    )
 }
 
 class SwiftFlowRouterIntegrationTests: QuickSpec {
@@ -88,7 +84,7 @@ class SwiftFlowRouterIntegrationTests: QuickSpec {
             var store: Store<FakeAppState>!
 
             beforeEach {
-                store = Store(reducer: CombinedReducer([AppReducer()]), state: FakeAppState())
+                store = Store(reducer: appReducer, state: FakeAppState())
             }
 
             describe("setup") {
@@ -107,7 +103,7 @@ class SwiftFlowRouterIntegrationTests: QuickSpec {
 
                     let routable = FakeRootRoutable()
                     let _ = Router(store: store, rootRoutable: routable) { state in
-                        state.navigationState
+                        state.select { $0.navigationState }
                     }
 
                     expect(routable.called).to(beFalse())
@@ -144,7 +140,7 @@ class SwiftFlowRouterIntegrationTests: QuickSpec {
                         }
 
                         let _ = Router(store: store, rootRoutable: rootRoutable) { state in
-                            state.navigationState
+                            state.select { $0.navigationState }
                         }
                     }
                 }
@@ -185,16 +181,18 @@ class SwiftFlowRouterIntegrationTests: QuickSpec {
                                 self.injectedRoutable = injectedRoutable
                             }
 
-                            func pushRouteSegment(_ routeElementIdentifier: RouteElementIdentifier, animated: Bool, completionHandler: @escaping RoutingCompletionHandler) -> Routable {
+                            func pushRouteSegment(_ routeElementIdentifier: RouteElementIdentifier,
+                                animated: Bool,
+                                completionHandler: @escaping RoutingCompletionHandler) -> Routable {
                                     completionHandler()
                                     return injectedRoutable
                             }
                         }
 
                         let _ = Router(store: store, rootRoutable:
                             FakeRootRoutable(injectedRoutable: fakeChildRoutable)) { state in
-                                state.navigationState
-                        }
+                                state.select { $0.navigationState }
+                            }
                     }
                 }
 
@@ -208,7 +206,7 @@ class SwiftFlowRouterIntegrationTests: QuickSpec {
             var store: Store<FakeAppState>!
 
             beforeEach {
-                store = Store(reducer: AppReducer(), state: nil)
+                store = Store(reducer: appReducer, state: nil)
             }
 
             context("when setting route specific data") {
@@ -236,10 +234,10 @@ class SwiftFlowRouterIntegrationTests: QuickSpec {
             var router: Router<FakeAppState>!
 
             beforeEach {
-                store = Store(reducer: AppReducer(), state: nil)
+                store = Store(reducer: appReducer, state: nil)
                 mockRoutable = MockRoutable()
                 router = Router(store: store, rootRoutable: mockRoutable) { state in
-                    state.navigationState
+                    state.select { $0.navigationState }
                 }
 
                 // silence router not read warning, need to keep router alive via reference