Merge pull request #133 from ReactiveCocoa/anyerror

Use AnyError for `URLSession.reactive.data(with:)`

Author: mdiep

.Package.test.swift

@@ -3,7 +3,7 @@ import PackageDescription
 let package = Package(
     name: "ReactiveSwift",
     dependencies: [
-        .Package(url: "https://github.com/antitypical/Result.git", majorVersion: 3),
+        .Package(url: "https://github.com/antitypical/Result.git", versions: Version(3, 1, 0)..<Version(3, .max, .max)),
         .Package(url: "https://github.com/Quick/Quick", majorVersion: 1),
         .Package(url: "https://github.com/Quick/Nimble", majorVersion: 5, minor: 1),
     ],

Cartfile

@@ -1 +1 @@
-github "antitypical/Result" ~> 3.0
+github "antitypical/Result" ~> 3.1

Cartfile.resolved

@@ -1,4 +1,4 @@
 github "Quick/Nimble" "v5.1.1"
 github "Quick/Quick" "v1.0.0"
-github "antitypical/Result" "3.0.0"
+github "antitypical/Result" "3.1.0"
 github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"

Carthage/Checkouts/Result

@@ -3,7 +3,7 @@ import PackageDescription
 let package = Package(
     name: "ReactiveSwift",
     dependencies: [
-        .Package(url: "https://github.com/antitypical/Result.git", majorVersion: 3),
+        .Package(url: "https://github.com/antitypical/Result.git", versions: Version(3, 1, 0)..<Version(3, .max, .max)),
     ],
     exclude: [
         "Sources/Deprecations+Removals.swift",

Package.swift

@@ -17,5 +17,5 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/ReactiveCocoa/ReactiveSwift.git", :tag => "#{s.version}" }
   # Directory glob for all Swift files
   s.source_files  = "Sources/*.{swift}"
-  s.dependency 'Result', '~> 3.0'
+  s.dependency 'Result', '~> 3.1'
 end

ReactiveSwift.podspec

@@ -358,6 +358,11 @@ extension URLSession {
 	public func rac_data(with request: URLRequest) -> SignalProducer<(Data, URLResponse), NSError> { fatalError() }
 }
 
+extension Reactive where Base: URLSession {
+	@available(*, unavailable, message:"Use the overload which returns `SignalProducer<(Data, URLResponse), AnyError>` instead, and cast `AnyError.error` to `NSError` as you need")
+	public func data(with request: URLRequest) -> SignalProducer<(Data, URLResponse), NSError> { fatalError() }
+}
+
 // Free functions
 
 @available(*, unavailable, message:"timer(interval:on:) now uses DispatchTimeInterval")

Sources/Deprecations+Removals.swift

@@ -9,6 +9,7 @@
 import Foundation
 import Dispatch
 import enum Result.NoError
+import struct Result.AnyError
 
 #if os(Linux)
 	import let CDispatch.NSEC_PER_USEC
@@ -61,14 +62,14 @@ extension Reactive where Base: URLSession {
 	/// - note: This method will not send an error event in the case of a server
 	///         side error (i.e. when a response with status code other than
 	///         200...299 is received).
-	public func data(with request: URLRequest) -> SignalProducer<(Data, URLResponse), NSError> {
+	public func data(with request: URLRequest) -> SignalProducer<(Data, URLResponse), AnyError> {
 		return SignalProducer { [base = self.base] observer, disposable in
 			let task = base.dataTask(with: request) { data, response, error in
 				if let data = data, let response = response {
 					observer.send(value: (data, response))
 					observer.sendCompleted()
 				} else {
-					observer.send(error: error as NSError? ?? defaultSessionError)
+					observer.send(error: AnyError(error ?? defaultSessionError))
 				}
 			}