Update RxSwift to 6.0

.gitignore

@@ -59,3 +59,6 @@ Carthage/Build
 
 fastlane/report.xml
 fastlane/screenshots
+
+# SPM
+.swiftpm/

.travis.yml

@@ -3,7 +3,7 @@ env:
     - LC_CTYPE=en_US.UTF-8
     - XCPROJ="-workspace RxAutomaton.xcworkspace -scheme RxAutomaton"
 
-osx_image: xcode10.2
+osx_image: xcode12.5
 
 matrix:
   include:

Cartfile

@@ -1 +1 @@
-github "ReactiveX/RxSwift" ~> 5.0
+github "ReactiveX/RxSwift" ~> 6.0

Cartfile.resolved

@@ -1,5 +1,5 @@
-github "Quick/Nimble" "v8.0.2"
-github "Quick/Quick" "v2.1.0"
-github "ReactiveX/RxSwift" "5.0.1"
+github "Quick/Nimble" "v9.2.0"
+github "Quick/Quick" "v4.0.0"
+github "ReactiveX/RxSwift" "6.2.0"
 github "mrackwitz/xcconfigs" "3.0"
 github "shu223/Pulsator" "0.4.2"

Package.resolved

@@ -1,31 +1,13 @@
 {
   "object": {
     "pins": [
-      {
-        "package": "Nimble",
-        "repositoryURL": "https://github.com/Quick/Nimble.git",
-        "state": {
-          "branch": null,
-          "revision": "f8657642dfdec9973efc79cc68bcef43a653a2bc",
-          "version": "8.0.2"
-        }
-      },
-      {
-        "package": "Quick",
-        "repositoryURL": "https://github.com/Quick/Quick.git",
-        "state": {
-          "branch": null,
-          "revision": "94df9b449508344667e5afc7e80f8bcbff1e4c37",
-          "version": "2.1.0"
-        }
-      },
       {
         "package": "RxSwift",
         "repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
         "state": {
           "branch": null,
-          "revision": "b3e888b4972d9bc76495dd74d30a8c7fad4b9395",
-          "version": "5.0.1"
+          "revision": "7c17a6ccca06b5c107cfa4284e634562ddaf5951",
+          "version": "6.2.0"
         }
       }
     ]

Package.swift

@@ -11,12 +11,12 @@ let package = Package(
             targets: ["RxAutomaton"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/ReactiveX/RxSwift.git", from: "5.0.0"),
+        .package(url: "https://github.com/ReactiveX/RxSwift.git", from: "6.2.0"),
     ],
     targets: [
         .target(
             name: "RxAutomaton",
-            dependencies: ["RxSwift", "RxCocoa"],
+            dependencies: ["RxSwift", "RxCocoa", "RxRelay"],
             path: "Sources"),
     ]
 )
@@ -31,8 +31,8 @@ if ProcessInfo.processInfo.environment.keys.contains("RXAUTOMATON_SPM_TEST") {
 
     package.dependencies.append(
         contentsOf: [
-            .package(url: "https://github.com/Quick/Quick.git", from: "2.1.0"),
-            .package(url: "https://github.com/Quick/Nimble.git", from: "8.0.0"),
+            .package(url: "https://github.com/Quick/Quick.git", from: "4.0.0"),
+            .package(url: "https://github.com/Quick/Nimble.git", from: "9.2.0"),
         ]
     )
 }

RxAutomaton.podspec

@@ -1,18 +1,19 @@
 Pod::Spec.new do |s|
   s.name         = "RxAutomaton"
-  s.version      = "0.4.0"
+  s.version      = "0.5.0"
   s.summary      = "RxSwift + State Machine, inspired by Redux and Elm."
   s.homepage     = "https://github.com/inamiy/RxAutomaton"
   s.license      = { :type => "MIT", :file => "LICENSE" }
   s.author       = { "Yasuhiro Inami" => "[email protected]" }
 
-  s.ios.deployment_target = "8.0"
+  s.ios.deployment_target = "9.0"
   s.osx.deployment_target = "10.10"
   s.watchos.deployment_target = "3.0"
   s.tvos.deployment_target = "9.0"
 
   s.source       = { :git => "https://github.com/inamiy/RxAutomaton.git", :tag => "#{s.version}" }
   s.source_files  = "Sources/**/*.swift"
 
-  s.dependency "RxSwift", "~> 5.0"
+  s.dependency "RxSwift", "~> 6.0"
+  s.dependency "RxRelay", "~> 6.0"
 end

Sources/Automaton.swift

@@ -7,6 +7,7 @@
 //
 
 import RxSwift
+import RxRelay
 
 //
 // Terminology:
@@ -32,7 +33,7 @@ public final class Automaton<State, Input>
 
     /// Current state.
     /// - Todo: Use RxProperty https://github.com/inamiy/RxProperty
-    public let state: Variable<State>
+    public let state: BehaviorRelay<State>
 
     private let _replyObserver: AnyObserver<Reply<State, Input>>
 
@@ -62,7 +63,7 @@ public final class Automaton<State, Input>
     ///
     public init(state initialState: State, input inputSignal: Observable<Input>, mapping: @escaping EffectMapping, strategy: FlattenStrategy = .merge)
     {
-        let stateProperty = Variable(initialState)
+        let stateProperty = BehaviorRelay(value: initialState)
         self.state = stateProperty // TODO: AnyProperty(stateProperty)
 
         let p = PublishSubject<Reply<State, Input>>()
@@ -153,11 +154,11 @@ extension Observable {
 
 // No idea why this is not in RxSwift but RxCocoa...
 extension ObservableType {
-    fileprivate func bindTo(_ variable: Variable<E>) -> Disposable {
+    fileprivate func bindTo(_ variable: BehaviorRelay<Element>) -> Disposable {
         return subscribe { e in
             switch e {
             case let .next(element):
-                variable.value = element
+                variable.accept(element)
             case let .error(error):
                 let error = "Binding error to variable: \(error)"
                 #if DEBUG

Sources/RxSwift+Pipe.swift

@@ -11,8 +11,8 @@ import RxSwift
 extension ObservableType {
 
     /// From ReactiveCocoa.
-    public static func pipe() -> (Observable<E>, AnyObserver<E>) {
-        let p = PublishSubject<E>()
+    public static func pipe() -> (Observable<Element>, AnyObserver<Element>) {
+        let p = PublishSubject<Element>()
         return (p.asObservable(), AnyObserver(eventHandler: p.asObserver().on))
     }
 

Sources/RxSwift+Then.swift

@@ -12,7 +12,7 @@ extension ObservableType {
 
     /// From ReactiveCocoa (naive implementation).
     public func then<E2, O: ObservableConvertibleType>(_ second: O) -> Observable<E2>
-        where O.E == E2
+        where O.Element == E2
     {
         return self
             .filter { _ in false }

Tests/RxAutomatonTests/EffectMappingLatestSpec.swift

@@ -33,12 +33,12 @@ class EffectMappingLatestSpec: QuickSpec
                 /// Sends `.loginOK` after delay, simulating async work during `.loggingIn`.
                 let loginOKProducer =
                     Observable.just(AuthInput.loginOK)
-                        .delay(1, onScheduler: testScheduler)
+                    .delay(.seconds(1), onScheduler: testScheduler)
 
                 /// Sends `.logoutOK` after delay, simulating async work during `.loggingOut`.
                 let logoutOKProducer =
                     Observable.just(AuthInput.logoutOK)
-                        .delay(1, onScheduler: testScheduler)
+                    .delay(.seconds(1), onScheduler: testScheduler)
 
                 let mappings: [Automaton.EffectMapping] = [
                     .login    | .loggedOut  => .loggingIn  | loginOKProducer,

Tests/RxAutomatonTests/EffectMappingSpec.swift

@@ -34,12 +34,12 @@ class EffectMappingSpec: QuickSpec
                 /// Sends `.loginOK` after delay, simulating async work during `.loggingIn`.
                 let loginOKProducer =
                     Observable.just(AuthInput.loginOK)
-                        .delay(1, onScheduler: testScheduler)
+                    .delay(.seconds(1), onScheduler: testScheduler)
 
                 /// Sends `.logoutOK` after delay, simulating async work during `.loggingOut`.
                 let logoutOKProducer =
                     Observable.just(AuthInput.logoutOK)
-                        .delay(1, onScheduler: testScheduler)
+                    .delay(.seconds(1), onScheduler: testScheduler)
 
                 let mappings: [Automaton.EffectMapping] = [
                     .login    | .loggedOut  => .loggingIn  | loginOKProducer,
@@ -128,12 +128,12 @@ class EffectMappingSpec: QuickSpec
                 /// Sends `.loginOK` after delay, simulating async work during `.loggingIn`.
                 let loginOKProducer =
                     Observable.just(AuthInput.loginOK)
-                        .delay(1, onScheduler: testScheduler)
+                    .delay(.seconds(1), onScheduler: testScheduler)
 
                 /// Sends `.logoutOK` after delay, simulating async work during `.loggingOut`.
                 let logoutOKProducer =
                     Observable.just(AuthInput.logoutOK)
-                        .delay(1, onScheduler: testScheduler)
+                    .delay(.seconds(1), onScheduler: testScheduler)
 
                 let mapping: EffectMapping = { fromState, input in
                     switch (fromState, input) {

Tests/RxAutomatonTests/Fixtures/ToRACHelper.swift

@@ -12,7 +12,7 @@ import RxSwift
 // R-A-C! R-A-C!
 
 extension ObservableType {
-    func delay(_ time: TimeInterval, onScheduler scheduler: SchedulerType) -> Observable<E> {
+    func delay(_ time: DispatchTimeInterval, onScheduler scheduler: SchedulerType) -> Observable<Element> {
         return self.flatMap { element in
             return Observable<Int>.interval(time, scheduler: scheduler)
                 .map { _ in element }
@@ -23,18 +23,18 @@ extension ObservableType {
 
 extension ObservableType {
     @discardableResult
-    func observeValues(_ next: @escaping (E) -> Void) -> Disposable {
+    func observeValues(_ next: @escaping (Element) -> Void) -> Disposable {
         return self.subscribe(onNext: next)
     }
 
     @discardableResult
-    func observe(_ observer: @escaping (Event<E>) -> Void) -> Disposable {
+    func observe(_ observer: @escaping (Event<Element>) -> Void) -> Disposable {
         return self.subscribe(AnyObserver(eventHandler: observer))
     }
 }
 
 extension ObserverType {
-    func send(next value: E) {
+    func send(next value: Element) {
         self.onNext(value)
     }
 

Tests/RxAutomatonTests/TerminatingSpec.swift

@@ -39,8 +39,8 @@ class TerminatingSpec: QuickSpec
 
 
                 let sendInput1And2AfterDelay: Observable<MyInput> = Observable.concat([
-                    Observable.just(.input1).delay(1, onScheduler: testScheduler),
-                    Observable.just(.input2).delay(1, onScheduler: testScheduler),
+                    Observable.just(.input1).delay(.seconds(1), onScheduler: testScheduler),
+                    Observable.just(.input2).delay(.seconds(1), onScheduler: testScheduler),
                 ])
 
                 let mappings: [Automaton.EffectMapping] = [