Merge pull request #74 from mattprowse/reactiveswift-value-not-next

Handle recent API changes in ReactiveSwift

Author: mdiep

Cartfile.resolved

@@ -1,5 +1,5 @@
-github "Quick/Nimble" "fcc28b23f57b30382e5f182c238674694d7174cb"
+github "Quick/Nimble" "197a46a5892340a2badc70af7f669b6aa4c8afa9"
 github "Quick/Quick" "8f2bc636ecfa2cc20696f62548b38d4ab943e299"
 github "antitypical/Result" "3.0.0"
 github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"
-github "ReactiveCocoa/ReactiveSwift" "f4e3bdc31456a23cf79f70fe3e2ff78bd0ecbfeb"
+github "ReactiveCocoa/ReactiveSwift" "2cdbc4159dede57a47df0e2eeccd8c0ba8436470"

Carthage/Checkouts/Nimble

@@ -161,7 +161,7 @@ private final class Pipe {
 				} else if error == ECANCELED {
 					observer.sendInterrupted()
 				} else {
-					observer.sendFailed(.posixError(error))
+					observer.send(error: .posixError(error))
 				}
 
 				close(self.readFD)
@@ -177,13 +177,13 @@ private final class Pipe {
 					bytes.deinitialize(count: dispatchData.count)
 					bytes.deallocate(capacity: dispatchData.count)
 
-					observer.sendNext(data)
+					observer.send(value: data)
 				}
 
 				if error == ECANCELED {
 					observer.sendInterrupted()
 				} else if error != 0 {
-					observer.sendFailed(.posixError(error))
+					observer.send(error: .posixError(error))
 				}
 
 				if done {
@@ -214,7 +214,7 @@ private final class Pipe {
 				} else if error == ECANCELED {
 					observer.sendInterrupted()
 				} else {
-					observer.sendFailed(.posixError(error))
+					observer.send(error: .posixError(error))
 				}
 
 				close(self.writeFD)
@@ -224,7 +224,7 @@ private final class Pipe {
 			producer.startWithSignal { signal, producerDisposable in
 				disposable.add(producerDisposable)
 
-				signal.observe(Observer(next: { data in
+				signal.observe(Observer(value: { data in
 					let dispatchData = data.withUnsafeBytes { (bytes: UnsafePointer<UInt8>) -> DispatchData in
 						let buffer = UnsafeBufferPointer(start: bytes, count: data.count)
 						return DispatchData(bytes: buffer)
@@ -234,7 +234,7 @@ private final class Pipe {
 						if error == ECANCELED {
 							observer.sendInterrupted()
 						} else if error != 0 {
-							observer.sendFailed(.posixError(error))
+							observer.send(error: .posixError(error))
 						}
 					}
 				}, completed: {
@@ -430,7 +430,7 @@ public func launchTask(_ task: Task, standardInput: SignalProducer<Data, NoError
 				})
 
 			case let .failure(error):
-				observer.sendFailed(error)
+				observer.send(error: error)
 				return
 			}
 		}
@@ -467,11 +467,11 @@ public func launchTask(_ task: Task, standardInput: SignalProducer<Data, NoError
 							disposable += signalDisposable
 
 							var aggregate = Data()
-							signal.observe(Observer(next: { data in
-								observer.sendNext(chunk(data))
+							signal.observe(Observer(value: { data in
+								observer.send(value: chunk(data))
 								aggregate.append(data)
 							}, failed: { error in
-								observer.sendFailed(error)
+								observer.send(error: error)
 								aggregated.value = .failed(error)
 							}, completed: {
 								aggregated.value = .value(aggregate)
@@ -515,7 +515,7 @@ public func launchTask(_ task: Task, standardInput: SignalProducer<Data, NoError
 						group.leave()
 					}
 
-					observer.sendNext(.launch(task))
+					observer.send(value: .launch(task))
 					process.launch()
 					close(stdoutPipe.writeFD)
 					close(stderrPipe.writeFD)

Carthage/Checkouts/ReactiveSwift

@@ -20,7 +20,7 @@ class TaskSpec: QuickSpec {
 
 			let task = Task("/usr/bin/true")
 			let result = launchTask(task)
-				.on(next: { event in
+				.on(value: { event in
 					if case let .launch(launched) = event {
 						isLaunched = true
 						expect(launched) == task