Move all code base to Swift 3 and make tests pass 🎉

Author: freak4pc

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Change Log
 
 ## [Unreleased](https://github.com/RxSwiftCommunity/RxViewModel/tree/HEAD)
+- Support for Swift 3 & 4 [\#45](https://github.com/RxSwiftCommunity/RxViewModel/pull/45) ([freak4pc](https://github.com/freak4pc))
 
 [Full Changelog](https://github.com/RxSwiftCommunity/RxViewModel/compare/3.1.3...HEAD)
 

Demo/Demo.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Demo/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Demo/Demo.xcodeproj/xcshareddata/xcschemes/RxViewModelTests-macOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Demo/Demo.xcodeproj/xcshareddata/xcschemes/RxViewModelTests-tvOS.xcscheme

@@ -10,36 +10,9 @@ import UIKit
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
+    var window: UIWindow?
 
-  var window: UIWindow?
-
-
-  func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
-    // Override point for customization after application launch.
-    return true
-  }
-
-  func applicationWillResignActive(application: UIApplication) {
-    // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-    // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
-  }
-
-  func applicationDidEnterBackground(application: UIApplication) {
-    // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
-    // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
-  }
-
-  func applicationWillEnterForeground(application: UIApplication) {
-    // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
-  }
-
-  func applicationDidBecomeActive(application: UIApplication) {
-    // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
-  }
-
-  func applicationWillTerminate(application: UIApplication) {
-    // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
-  }
-
-
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+        return true
+    }
 }

Demo/Demo/AppDelegate.swift

@@ -9,16 +9,8 @@
 import UIKit
 
 class ViewController: UIViewController {
-
   override func viewDidLoad() {
     super.viewDidLoad()
-    // Do any additional setup after loading the view, typically from a nib.
-  }
-
-  override func didReceiveMemoryWarning() {
-    super.didReceiveMemoryWarning()
-    // Dispose of any resources that can be recreated.
   }
 
-
 }

Demo/Demo/ViewController.swift

@@ -41,11 +41,11 @@ class RxViewModelSpec: QuickSpec {
       }
 
       var nextSteps = 0
-      vm.didBecomeActive.subscribeNext { model in
+      vm.didBecomeActive.subscribe(onNext: { model in
         expect(model).to(equal(vm))
 
         nextSteps += 1
-      }.addDisposableTo(self.disposable)
+      }).disposed(by: self.disposable)
 
       expect(nextSteps).to(equal(0))
 
@@ -74,17 +74,17 @@ class RxViewModelSpec: QuickSpec {
       var completed = false
 
       let input = Observable.create { o -> Disposable in
-        o.on(.Next("1"))
-        o.on(.Next("2"))
+        o.on(.next("1"))
+        o.on(.next("2"))
 
-        return AnonymousDisposable {}
+        return Disposables.create { }
       } as Observable<String?>
 
-      vm.forwardSignalWhileActive(input).subscribe( onNext: { value in
+      vm.forwardSignalWhileActive(input).subscribe(onNext: { value in
         values.append(value!)
       }, onError: { _ in }, onCompleted: {
         completed = true
-      }).addDisposableTo(self.disposable)
+      }).disposed(by: self.disposable)
 
       var expectedValues = ["1", "2"]
       expect(values).to(equal(expectedValues))
@@ -112,28 +112,28 @@ class RxViewModelSpec: QuickSpec {
       var values = [String]()
       var completed = false
       let subject = ReplaySubject<String>.create(bufferSize: 5)
-      subject.on(.Next("0"))
+      subject.on(.next("0"))
 
       vm.throttleSignalWhileInactive(subject).subscribe( onNext: { value in
         values.append(value)
       }, onError: { _ in  }, onCompleted: {
         completed = true
-      }).addDisposableTo(self.disposable)
+      }).disposed(by: self.disposable)
 
       var expectedValues = ["0"]
       expect(values).to(equal(expectedValues))
       expect(completed).to(beFalsy())
 
-      subject.on(.Next("1"))
+      subject.on(.next("1"))
       expectedValues = ["0", "1"]
       expect(values).to(equal(expectedValues))
       expect(completed).to(beFalsy())
 
       vm.active = false
 
       // Since the VM is inactive, these events should be throttled.
-      subject.on(.Next("2"))
-      subject.on(.Next("3"))
+      subject.on(.next("2"))
+      subject.on(.next("3"))
 
       expect(values).to(equal(expectedValues))
       expect(completed).to(beFalsy())
@@ -143,24 +143,24 @@ class RxViewModelSpec: QuickSpec {
       expect(completed).to(beFalsy())
 
       // After reactivating, we should still get this event.
-      subject.on(.Next("4"))
+      subject.on(.next("4"))
       vm.active = true
 
       expectedValues = ["0", "1", "3", "4"]
       expect(values).toEventually(equal(expectedValues))
       expect(completed).to(beFalsy())
 
       // And now new events should be instant.
-      subject.on(.Next("5"))
+      subject.on(.next("5"))
 
       expectedValues = ["0", "1", "3", "4", "5"]
       expect(values).to(equal(expectedValues))
       expect(completed).to(beFalsy())
 
-      subject.on(.Completed)
+      subject.on(.completed)
 
       expect(values).to(equal(expectedValues))
       expect(completed).to(beTruthy())
     }
   }
-}
+}

Demo/Tests/Tests.swift

@@ -117,6 +117,7 @@
 				TargetAttributes = {
 					1168B9AF1D2E081800784841 = {
 						CreatedOnToolsVersion = 7.3.1;
+						LastSwiftMigration = 0830;
 					};
 				};
 			};
@@ -265,6 +266,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = es.estebantorr.RxViewModel;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -282,6 +284,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = es.estebantorr.RxViewModel;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};

RxViewModel.xcodeproj/project.pbxproj

@@ -36,40 +36,39 @@ import RxSwift
 returns `true`. Completion and errors are always forwarded immediately.
 */
 extension ObservableType {
-  public func throttle(interval: NSTimeInterval, valuesPassingTest predicate: (E) -> Bool) -> Observable<E> {
+  public func throttle(_ interval: TimeInterval, valuesPassingTest predicate: @escaping (E) -> Bool) -> Observable<E> {
     return Observable.create { (o: AnyObserver<E>) -> Disposable in
       let disposable = CompositeDisposable()
-      let scheduler = ConcurrentDispatchQueueScheduler(globalConcurrentQueueQOS: .Default)
+      let scheduler = ConcurrentDispatchQueueScheduler(qos: .default)
       let nextDisposable = SerialDisposable()
       var hasNextValue = false
       var nextValue: E?
       let parent = self.asObservable()
 
-      let subscriptionDisposable = parent.subscribeNext {
+      let subscriptionDisposable = parent.subscribe(onNext: {
         /**
         Disposes the «last» `next` subscription if there was a previous value it gets
         flushed to the observable `o`.
 
         - parameter send: 	`Bool` flag indicating where or not the `next` value should be
         «flushed» to the `observable` `o` or not.
         */
-        func flushNext(send: Bool) -> Void {
+        func flushNext(_ send: Bool) -> Void {
           nextDisposable.dispose()
 
-          guard let nV = nextValue where hasNextValue == true && send == true
-            else { return }
+          guard let nV = nextValue, hasNextValue, send else { return }
 
           nextValue = nil
           hasNextValue = false
-          
-          o.on(.Next(nV))
+
+          o.on(.next(nV))
         }
 
         let shouldThrottle = predicate($0)
         flushNext(false)
 
         if !shouldThrottle {
-          o.on(.Next($0))
+          o.on(.next($0))
 
           return
         }
@@ -79,16 +78,17 @@ extension ObservableType {
 
         let flush = flushNext
         let d = Observable<Int64>.timer(interval, scheduler: scheduler)
-          .subscribeNext { _ in
-          flush(true)
-        }
+          .subscribe(onNext: { _ in
+            flush(true)
+          })
 
-        disposable.addDisposable(d)
-      }
-      
-      disposable.addDisposable(subscriptionDisposable)
+        _ = disposable.insert(d)
+      })
+
+        
+      _ = disposable.insert(subscriptionDisposable)
 
       return disposable
     }
   }
-}
+}