Skip to content

Commit 07e19da

Browse files
committed
Merge pull request #6 from Carthage/bump-rac
Bump RAC to latest swift-development
2 parents e0d73f9 + 5fbe3c4 commit 07e19da

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
github "ReactiveCocoa/ReactiveCocoa" == 3.0.2
1+
github "ReactiveCocoa/ReactiveCocoa" "swift-development"
22
github "Quick/Quick" == 0.2.0
33
github "Quick/Nimble"
44
github "Carthage/LlamaKit" == 0.1.1

Cartfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
github "Carthage/LlamaKit" "carthage-0.1.1"
22
github "Quick/Nimble" "v0.2.0"
33
github "Quick/Quick" "v0.2.0"
4-
github "jspahrsummers/xcconfigs" "carthage-0.6"
5-
github "ReactiveCocoa/ReactiveCocoa" "swift-on-carthage-3.0.2"
4+
github "jspahrsummers/xcconfigs" "0.7"
5+
github "ReactiveCocoa/ReactiveCocoa" "3a34dfe2c2ecc53064bc1e163284e55eb01bb4a2"

Carthage.checkout/xcconfigs

ReactiveTask/Task.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ private final class Pipe {
172172
signal.startWithSink { inputDisposable in
173173
disposable.addDisposable(inputDisposable)
174174

175-
return eventSink(next: { data in
175+
return Event.sink(next: { data in
176176
let dispatchData = dispatch_data_create(data.bytes, UInt(data.length), queue, nil)
177177

178178
dispatch_io_write(channel, 0, dispatchData, queue) { (done, data, error) in
@@ -289,7 +289,7 @@ public func launchTask(taskDescription: TaskDescription, standardOutput: SinkOf<
289289
stdinSignal.startWithSink { stdinDisposable in
290290
disposable.addDisposable(stdinDisposable)
291291

292-
return eventSink(error: { error in
292+
return Event.sink(error: { error in
293293
sink.put(.Error(error))
294294
})
295295
}

0 commit comments

Comments
 (0)