Fix compile errors with latest ReactiveSwift

Cartfile

@@ -1,2 +1,2 @@
 github "ReactiveCocoa/ReactiveObjC" ~> 3.0.0
-github "ReactiveCocoa/ReactiveSwift" ~> 1.1
+github "ReactiveCocoa/ReactiveSwift" "2.0.0-rc.3"

Cartfile.private

@@ -1,3 +1,3 @@
 github "jspahrsummers/xcconfigs" "3d9d996"
 github "Quick/Quick" ~> 1.1
-github "Quick/Nimble" "8116a83864ee78339798c3ef425c42f6ca6bf034"
+github "Quick/Nimble" ~> 6.1

Cartfile.resolved

@@ -1,6 +1,6 @@
-github "Quick/Nimble" "8116a83864ee78339798c3ef425c42f6ca6bf034"
+github "Quick/Nimble" "v6.1.0"
 github "Quick/Quick" "v1.1.0"
 github "ReactiveCocoa/ReactiveObjC" "3.0.0"
-github "antitypical/Result" "3.2.1"
+github "ReactiveCocoa/ReactiveSwift" "2.0.0-rc.3"
+github "antitypical/Result" "3.2.3"
 github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"
-github "ReactiveCocoa/ReactiveSwift" "1.1.2"

ReactiveObjCBridge/ObjectiveCBridging.swift

@@ -11,14 +11,14 @@ import ReactiveObjC
 import ReactiveSwift
 import Result
 
-extension SignalProtocol {
+extension Signal {
 	/// Turns each value into an Optional.
 	fileprivate func optionalize() -> Signal<Value?, Error> {
 		return map(Optional.init)
 	}
 }
 
-extension SignalProducerProtocol {
+extension SignalProducer {
 	/// Turns each value into an Optional.
 	fileprivate func optionalize() -> SignalProducer<Value?, Error> {
 		return lift { $0.optionalize() }
@@ -206,7 +206,7 @@ public func bridgedSignalProducer<First, Second, Third, Fourth, Fifth>(from sign
 	return _bridgedSignalProducer(from: signal, file: file, line: line).map { $0.map(bridgedTuple) }
 }
 
-extension SignalProducerProtocol where Value: AnyObject {
+extension SignalProducer where Value: AnyObject {
 	/// Create a `RACSignal` that will `start()` the producer once for each
 	/// subscription.
 	///
@@ -235,7 +235,7 @@ extension SignalProducerProtocol where Value: AnyObject {
 	}
 }
 
-extension SignalProducerProtocol where Value: OptionalProtocol, Value.Wrapped: AnyObject {
+extension SignalProducer where Value: OptionalProtocol, Value.Wrapped: AnyObject {
 	/// Create a `RACSignal` that will `start()` the producer once for each
 	/// subscription.
 	///
@@ -267,7 +267,7 @@ extension SignalProducerProtocol where Value: OptionalProtocol, Value.Wrapped: A
 	}
 }
 
-extension SignalProtocol where Value: AnyObject {
+extension Signal where Value: AnyObject {
 	/// Create a `RACSignal` that will observe the given signal.
 	///
 	/// - note: Any `interrupted` events will be silently discarded.
@@ -295,7 +295,7 @@ extension SignalProtocol where Value: AnyObject {
 	}
 }
 
-extension SignalProtocol where Value: OptionalProtocol, Value.Wrapped: AnyObject {
+extension Signal where Value: OptionalProtocol, Value.Wrapped: AnyObject {
 	/// Create a `RACSignal` that will observe the given signal.
 	///
 	/// - note: Any `interrupted` events will be silently discarded.
@@ -328,7 +328,7 @@ extension SignalProtocol where Value: OptionalProtocol, Value.Wrapped: AnyObject
 
 // MARK: -
 
-extension ActionProtocol {
+extension Action {
 	fileprivate var isCommandEnabled: RACSignal<NSNumber> {
 		return self.isEnabled.producer
 			.map { $0 as NSNumber }
@@ -363,7 +363,7 @@ public func bridgedAction<Input, Output>(from command: RACCommand<Input, Output>
 	}
 }
 
-extension ActionProtocol where Input: AnyObject, Output: AnyObject {
+extension Action where Input: AnyObject, Output: AnyObject {
 	/// Creates a RACCommand that will execute the action.
 	///
 	/// - note: The returned command will not necessarily be marked as executing
@@ -372,14 +372,14 @@ extension ActionProtocol where Input: AnyObject, Output: AnyObject {
 	///
 	/// - returns: `RACCommand` with bound action.
 	public func toRACCommand() -> RACCommand<Input, Output> {
-		return RACCommand<Input, Output>(enabled: action.isCommandEnabled) { input -> RACSignal<Output> in
+		return RACCommand<Input, Output>(enabled: self.isCommandEnabled) { input -> RACSignal<Output> in
 			return self.apply(input!)
 				.toRACSignal()
 		}
 	}
 }
 
-extension ActionProtocol where Input: OptionalProtocol, Input.Wrapped: AnyObject, Output: AnyObject {
+extension Action where Input: OptionalProtocol, Input.Wrapped: AnyObject, Output: AnyObject {
 	/// Creates a RACCommand that will execute the action.
 	///
 	/// - note: The returned command will not necessarily be marked as executing
@@ -388,15 +388,15 @@ extension ActionProtocol where Input: OptionalProtocol, Input.Wrapped: AnyObject
 	///
 	/// - returns: `RACCommand` with bound action.
 	public func toRACCommand() -> RACCommand<Input.Wrapped, Output> {
-		return RACCommand<Input.Wrapped, Output>(enabled: action.isCommandEnabled) { input -> RACSignal<Output> in
+		return RACCommand<Input.Wrapped, Output>(enabled: self.isCommandEnabled) { input -> RACSignal<Output> in
 			return self
 				.apply(Input(reconstructing: input))
 				.toRACSignal()
 		}
 	}
 }
 
-extension ActionProtocol where Input: AnyObject, Output: OptionalProtocol, Output.Wrapped: AnyObject {
+extension Action where Input: AnyObject, Output: OptionalProtocol, Output.Wrapped: AnyObject {
 	/// Creates a RACCommand that will execute the action.
 	///
 	/// - note: The returned command will not necessarily be marked as executing
@@ -405,15 +405,15 @@ extension ActionProtocol where Input: AnyObject, Output: OptionalProtocol, Outpu
 	///
 	/// - returns: `RACCommand` with bound action.
 	public func toRACCommand() -> RACCommand<Input, Output.Wrapped> {
-		return RACCommand<Input, Output.Wrapped>(enabled: action.isCommandEnabled) { input -> RACSignal<Output.Wrapped> in
+		return RACCommand<Input, Output.Wrapped>(enabled: self.isCommandEnabled) { input -> RACSignal<Output.Wrapped> in
 			return self
 				.apply(input!)
 				.toRACSignal()
 		}
 	}
 }
 
-extension ActionProtocol where Input: OptionalProtocol, Input.Wrapped: AnyObject, Output: OptionalProtocol, Output.Wrapped: AnyObject {
+extension Action where Input: OptionalProtocol, Input.Wrapped: AnyObject, Output: OptionalProtocol, Output.Wrapped: AnyObject {
 	/// Creates a RACCommand that will execute the action.
 	///
 	/// - note: The returned command will not necessarily be marked as executing
@@ -422,7 +422,7 @@ extension ActionProtocol where Input: OptionalProtocol, Input.Wrapped: AnyObject
 	///
 	/// - returns: `RACCommand` with bound action.
 	public func toRACCommand() -> RACCommand<Input.Wrapped, Output.Wrapped> {
-		return RACCommand<Input.Wrapped, Output.Wrapped>(enabled: action.isCommandEnabled) { input -> RACSignal<Output.Wrapped> in
+		return RACCommand<Input.Wrapped, Output.Wrapped>(enabled: self.isCommandEnabled) { input -> RACSignal<Output.Wrapped> in
 			return self
 				.apply(Input(reconstructing: input))
 				.toRACSignal()
@@ -495,6 +495,8 @@ extension DispatchTimeInterval {
 			return TimeInterval(UInt64(us) * NSEC_PER_USEC) / TimeInterval(NSEC_PER_SEC)
 		case let .nanoseconds(ns):
 			return TimeInterval(ns) / TimeInterval(NSEC_PER_SEC)
+		case let .never:
+			return .infinity
 		}
 	}
 }