Merge pull request #86 from mdiep/ras-2.0

Update ReactiveSwift to 2.0

Author: mdiep

.swift-version

@@ -1 +1 @@
-3.0.2
+3.1

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode8.2
+osx_image: xcode8.3
 branches:
   only:
     - master
@@ -13,12 +13,6 @@ matrix:
       env: XCODE_ACTION="build-for-testing test-without-building"
     - xcode_scheme: Tentacle-iOS
       env: XCODE_ACTION="build-for-testing test-without-building"
-    - xcode_scheme: Tentacle-OSX
-      env: XCODE_ACTION="build-for-testing test-without-building"
-      osx_image: xcode8.3
-    - xcode_scheme: Tentacle-iOS
-      env: XCODE_ACTION="build-for-testing test-without-building"
-      osx_image: xcode8.3
     - xcode_scheme: update-test-fixtures
       env: XCODE_ACTION=build
     - before_script: true

Cartfile

@@ -1,3 +1,3 @@
-github "ReactiveCocoa/ReactiveSwift" ~> 1.1.5
+github "ReactiveCocoa/ReactiveSwift" ~> 2.0
 github "thoughtbot/Argo" ~> 4.1.2
 github "thoughtbot/Curry" ~> 3.0

Cartfile.resolved

@@ -1,4 +1,4 @@
-github "ReactiveCocoa/ReactiveSwift" "1.1.5"
+github "ReactiveCocoa/ReactiveSwift" "2.0.0"
 github "antitypical/Result" "3.2.3"
 github "thoughtbot/Argo" "v4.1.2"
 github "thoughtbot/Curry" "v3.0.0"

Carthage/Checkouts/ReactiveSwift

@@ -0,0 +1,36 @@
+{
+  "autoPin": true,
+  "pins": [
+    {
+      "package": "Argo",
+      "reason": null,
+      "repositoryURL": "https://github.com/thoughtbot/Argo.git",
+      "version": "4.1.2"
+    },
+    {
+      "package": "Curry",
+      "reason": null,
+      "repositoryURL": "https://github.com/thoughtbot/Curry.git",
+      "version": "3.0.0"
+    },
+    {
+      "package": "ReactiveSwift",
+      "reason": null,
+      "repositoryURL": "https://github.com/ReactiveCocoa/ReactiveSwift.git",
+      "version": "2.0.0"
+    },
+    {
+      "package": "Result",
+      "reason": null,
+      "repositoryURL": "https://github.com/antitypical/Result.git",
+      "version": "3.2.3"
+    },
+    {
+      "package": "Runes",
+      "reason": null,
+      "repositoryURL": "https://github.com/thoughtbot/Runes.git",
+      "version": "4.1.0"
+    }
+  ],
+  "version": 1
+}

Package.pins

@@ -5,6 +5,6 @@ let package = Package(
     dependencies: [
         .Package(url: "https://github.com/thoughtbot/Argo.git", versions: Version(4, 1, 2)..<Version(4, .max, .max)),
         .Package(url: "https://github.com/thoughtbot/Curry.git", majorVersion: 3),
-        .Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", versions: Version(1, 1, 5)..<Version(1, .max, .max)),
+        .Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", majorVersion: 2),
     ]
 )

Package.swift

@@ -42,13 +42,13 @@ extension URLSession {
 	/// Returns a producer that will download a file using the given request. The file will be
 	/// deleted after the producer terminates.
 	internal func downloadFile(_ request: URLRequest) -> SignalProducer<URL, AnyError> {
-		return SignalProducer { observer, disposable in
+		return SignalProducer { observer, lifetime in
 			let serialDisposable = SerialDisposable()
-			let handle = disposable.add(serialDisposable)
+			let handle = lifetime += serialDisposable
 
 			let task = self.downloadTask(with: request) { (url, response, error) in
 				// Avoid invoking cancel(), or the download may be deleted.
-				handle.remove()
+				handle?.dispose()
 
 				if let url = url {
 					observer.send(value: url)
@@ -60,7 +60,7 @@ extension URLSession {
                 }
 			}
 
-			serialDisposable.inner = ActionDisposable {
+			serialDisposable.inner = AnyDisposable {
 				task.cancel()
 			}
 
@@ -196,10 +196,14 @@ public final class Client {
             .flatMap(.concat) { data, response -> SignalProducer<(Response, Any), Error> in
                 let response = response as! HTTPURLResponse
                 let headers = response.allHeaderFields as! [String:String]
-                return SignalProducer
-                    .attempt {
-                        return JSONSerialization.deserializeJSON(data).mapError { Error.jsonDeserializationError($0.error) }
-                    }
+
+                // The explicitness is required to pick up
+                // `init(_ action: @escaping () -> Result<Value, Error>)`
+                // over `init(_ action: @escaping () -> Value)`.
+                let producer: SignalProducer<Any, Error> = SignalProducer { () -> Result<Any, Error> in
+                    return JSONSerialization.deserializeJSON(data).mapError { Error.jsonDeserializationError($0.error) }
+                }
+                return producer
                     .attemptMap { JSON in
                         if response.statusCode == 404 {
                             return .failure(.doesNotExist)