Merge pull request #17 from jeffreylyg/swift/4.0

Migrate to Swift 4

.swift-version

@@ -1 +1 @@
-3.1
+4.0

.travis.yml

@@ -3,7 +3,7 @@ env:
     - LC_CTYPE=en_US.UTF-8
     - XCPROJ="-workspace RxAutomaton.xcworkspace -scheme RxAutomaton"
 
-osx_image: xcode8.3
+osx_image: xcode9
 
 matrix:
   include:
@@ -42,7 +42,7 @@ matrix:
     - os: osx
       script:
         - pod repo update --silent
-        - pod lib lint --allow-warnings
+        # - pod lib lint --allow-warnings
       env: JOB=pod-lint
 
     - os: osx

Cartfile

@@ -1 +1 @@
-github "ReactiveX/RxSwift" ~> 3.0
+github "ReactiveX/RxSwift" ~> 4.0

Cartfile.private

@@ -1,4 +1,4 @@
 github "Quick/Quick" ~> 1.0
-github "Quick/Nimble" ~> 6.0
+github "Quick/Nimble" ~> 7.0
 github "mrackwitz/xcconfigs"
-github "shu223/Pulsator" ~> 0.3
+github "shu223/Pulsator" ~> 0.4

Cartfile.resolved

@@ -1,5 +1,5 @@
-github "Quick/Nimble" "v6.1.0"
-github "shu223/Pulsator" "0.3.0"
-github "Quick/Quick" "v1.1.0"
-github "ReactiveX/RxSwift" "3.4.0"
+github "Quick/Nimble" "v7.0.2"
+github "Quick/Quick" "v1.2.0"
+github "ReactiveX/RxSwift" "4.0.0"
 github "mrackwitz/xcconfigs" "3.0"
+github "shu223/Pulsator" "0.4.0"

Configurations/Base.xcconfig

@@ -3,4 +3,4 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0
 WATCHOS_DEPLOYMENT_TARGET = 2.0
 TVOS_DEPLOYMENT_TARGET = 9.0
 
-SWIFT_VERSION = 3.0
+SWIFT_VERSION = 4.0

Demo/Helpers.swift

@@ -15,19 +15,19 @@ import RxCocoa
 extension CALayer
 {
     public var rx_position: AnyObserver<CGPoint> {
-        return UIBindingObserver(UIElement: self) { layer, value in
+        return Binder(self) { layer, value in
             layer.position = value
         }.asObserver()
     }
 
     public var rx_hidden: AnyObserver<Bool> {
-        return UIBindingObserver(UIElement: self) { layer, value in
+        return Binder(self) { layer, value in
             layer.isHidden = value
         }.asObserver()
     }
 
     public var rx_backgroundColor: AnyObserver<CGColor?> {
-        return UIBindingObserver(UIElement: self) { layer, value in
+        return Binder(self) { layer, value in
             layer.backgroundColor = value
         }.asObserver()
     }

Demo/ViewController.swift

@@ -38,7 +38,7 @@ class AutomatonViewController: UIViewController
         {
             return Observable<Int>.interval(interval, scheduler: MainScheduler.instance)
                 .take(count)
-                .scan(0) { $0.0 + 1 }
+                .scan(0) { x, _ in x + 1 }
                 .startWith(0)
                 .map {
                     switch $0 {
@@ -80,34 +80,34 @@ class AutomatonViewController: UIViewController
             .subscribe(onNext: { reply in
                 print("received reply = \(reply)")
             })
-            .addDisposableTo(_disposeBag)
+            .disposed(by: _disposeBag)
 
         automaton.state.asObservable()
             .subscribe(onNext: { state in
                 print("current state = \(state)")
             })
-            .addDisposableTo(_disposeBag)
+            .disposed(by: _disposeBag)
 
         // Setup buttons.
         do {
             self.loginButton?.rx.tap
                 .subscribe(onNext: { _ in inputObserver.onNext(.login) })
-                .addDisposableTo(_disposeBag)
+                .disposed(by: _disposeBag)
 
             self.logoutButton?.rx.tap
                 .subscribe(onNext: { _ in inputObserver.onNext(.logout) })
-                .addDisposableTo(_disposeBag)
+                .disposed(by: _disposeBag)
 
             self.forceLogoutButton?.rx.tap
                 .subscribe(onNext: { _ in inputObserver.onNext(.forceLogout) })
-                .addDisposableTo(_disposeBag)
+                .disposed(by: _disposeBag)
         }
 
         // Setup label.
         do {
             textSignal
-                .bindTo(self.label!.rx.text)
-                .addDisposableTo(_disposeBag)
+                .bind(to: self.label!.rx.text)
+                .disposed(by: _disposeBag)
         }
 
         // Setup Pulsator.
@@ -121,19 +121,19 @@ class AutomatonViewController: UIViewController
                 .map(_pulsatorColor)
                 .map { $0.cgColor }
                 .drive(pulsator.rx_backgroundColor)
-                .addDisposableTo(_disposeBag)
+                .disposed(by: _disposeBag)
 
             automaton.state.asDriver()
                 .map(_pulsatorPosition)
                 .drive(pulsator.rx_position)
-                .addDisposableTo(_disposeBag)
+                .disposed(by: _disposeBag)
 
             // Overwrite the pulsator color to red if `.forceLogout` succeeded.
             automaton.replies
                 .filter { $0.toState != nil && $0.input == .forceLogout }
                 .map { _ in UIColor.red.cgColor }
-                .bindTo(pulsator.rx_backgroundColor)
-                .addDisposableTo(_disposeBag)
+                .bind(to: pulsator.rx_backgroundColor)
+                .disposed(by: _disposeBag)
         }
 
     }

Package.swift

@@ -7,12 +7,12 @@ let package = Package(
     name: "RxAutomaton",
     dependencies: {
         var deps: [Package.Dependency] = [
-            .Package(url: "https://github.com/ReactiveX/RxSwift.git", majorVersion: 3)
+            .Package(url: "https://github.com/ReactiveX/RxSwift.git", majorVersion: 4)
         ]
         if isSwiftPackageManagerTest {
             deps += [
                 .Package(url: "https://github.com/Quick/Quick", majorVersion: 1),
-                .Package(url: "https://github.com/Quick/Nimble", majorVersion: 6)
+                .Package(url: "https://github.com/Quick/Nimble", majorVersion: 7)
             ]
         }
         return deps

RxAutomaton.podspec

@@ -14,5 +14,5 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/inamiy/RxAutomaton.git", :tag => "#{s.version}" }
   s.source_files  = "Sources/**/*.swift"
 
-  s.dependency "RxSwift", "~> 3.0"
+  s.dependency "RxSwift", "~> 4.0"
 end

RxAutomaton.xcodeproj/project.pbxproj

@@ -367,7 +367,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0810;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = "Yasuhiro Inami";
 				TargetAttributes = {
 					488738DB1D61689000BF70F4 = {
@@ -518,14 +518,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -551,6 +557,7 @@
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -567,14 +574,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -593,6 +606,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";

RxAutomaton.xcodeproj/xcshareddata/xcschemes/RxAutomaton.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0810"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -55,6 +56,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

Sources/Automaton.swift

@@ -74,11 +74,11 @@ public final class Automaton<State, Input>
         {
             return Observable<Input>.create { observer in
                 let mappingSignal = inputProducer
-                    .withLatestFrom(stateProperty.asObservable()) { $0 }
+                    .withLatestFrom(stateProperty.asObservable()) { ($0, $1) }
                     .map { input, fromState in
                         return (input, fromState, mapping(fromState, input)?.1)
                     }
-                    .shareReplay(1)
+                    .share(replay: 1)
 
                 let successSignal = mappingSignal
                     .filterMap { input, fromState, effect in
@@ -101,7 +101,7 @@ public final class Automaton<State, Input>
         }
 
         let replySignal = recurInputProducer(inputSignal, strategy: strategy)
-            .withLatestFrom(stateProperty.asObservable()) { $0 }
+            .withLatestFrom(stateProperty.asObservable()) { ($0, $1) }
             .flatMap(.merge) { input, fromState -> Observable<Reply<State, Input>> in
                 if let (toState, _) = mapping(fromState, input) {
                     return .just(.success(input, fromState, toState))
@@ -110,7 +110,7 @@ public final class Automaton<State, Input>
                     return .just(.failure(input, fromState))
                 }
             }
-            .shareReplay(1)
+            .share(replay: 1)
 
         replySignal
             .flatMap(.merge) { reply -> Observable<State> in
@@ -122,11 +122,11 @@ public final class Automaton<State, Input>
                 }
             }
             .bindTo(stateProperty)
-            .addDisposableTo(_disposeBag)
+            .disposed(by: _disposeBag)
 
         replySignal
             .subscribe(self._replyObserver)
-            .addDisposableTo(_disposeBag)
+            .disposed(by: _disposeBag)
     }
 
     deinit
@@ -137,9 +137,9 @@ public final class Automaton<State, Input>
 
 // MARK: Private
 
-private func _compose<A, B, C>(_ g: @escaping (B) -> C, _ f: @escaping (A) -> B) -> (A) -> C
+private func _compose<A, B, C, D>(_ g: @escaping ((C) -> D), _ f: @escaping ((A, B) -> C)) -> ((A, B) -> D)
 {
-    return { x in g(f(x)) }
+    return { x, y in g(f(x, y)) }
 }
 
 private func _toEffectMapping<State, Input>(toState: State?) -> (State, Observable<Input>)?

Tests/RxAutomatonTests/Fixtures/ToRACHelper.swift

@@ -23,22 +23,22 @@ extension ObservableType {
 
 extension ObservableType {
     @discardableResult
-    final func observeValues(_ next: @escaping (E) -> Void) -> Disposable {
+    func observeValues(_ next: @escaping (E) -> Void) -> Disposable {
         return self.subscribe(onNext: next)
     }
 
     @discardableResult
-    final func observe(_ observer: @escaping (Event<E>) -> Void) -> Disposable {
+    func observe(_ observer: @escaping (Event<E>) -> Void) -> Disposable {
         return self.subscribe(AnyObserver(eventHandler: observer))
     }
 }
 
 extension ObserverType {
-    final func send(next value: E) {
+    func send(next value: E) {
         self.onNext(value)
     }
 
-    final func sendCompleted() {
+    func sendCompleted() {
         self.onCompleted()
     }
 }