Skip to content

Commit 801e295

Browse files
committed
Merge pull request #37 from Carthage/rac4-alpha3
Update RAC to 4.0-alpha.3
2 parents 30160d1 + 9c12444 commit 801e295

File tree

9 files changed

+33
-39
lines changed

9 files changed

+33
-39
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode7
2+
osx_image: xcode7.1
33
xcode_workspace: ReactiveTask.xcworkspace
44
xcode_scheme: ReactiveTask
55
script: script/cibuild

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.2"
1+
github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.3"

Cartfile.private

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github "Quick/Quick" ~> 0.7
2-
github "Quick/Nimble" ~> 2.0
1+
github "Quick/Quick" ~> 0.8
2+
github "Quick/Nimble" ~> 3.0
33
github "jspahrsummers/xcconfigs" "ec5753493605deed7358dec5f9260f503d3ed650"

Cartfile.resolved

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
github "Quick/Nimble" "v2.0.0"
2-
github "Quick/Quick" "v0.7.0"
3-
github "antitypical/Result" "0.6.0-beta.3"
1+
github "Quick/Nimble" "v3.0.0"
2+
github "Quick/Quick" "v0.8.0"
3+
github "antitypical/Result" "0.6.0-beta.5"
44
github "jspahrsummers/xcconfigs" "ec5753493605deed7358dec5f9260f503d3ed650"
5-
github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.2"
5+
github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.3"

ReactiveTask/Task.swift

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ private final class Pipe {
127127
} else if error == ECANCELED {
128128
observer.sendInterrupted()
129129
} else {
130-
observer.sendError(.POSIXError(error))
130+
observer.sendFailed(.POSIXError(error))
131131
}
132132

133133
close(self.readFD)
@@ -143,7 +143,7 @@ private final class Pipe {
143143
if error == ECANCELED {
144144
observer.sendInterrupted()
145145
} else if error != 0 {
146-
observer.sendError(.POSIXError(error))
146+
observer.sendFailed(.POSIXError(error))
147147
}
148148

149149
if done {
@@ -174,7 +174,7 @@ private final class Pipe {
174174
} else if error == ECANCELED {
175175
observer.sendInterrupted()
176176
} else {
177-
observer.sendError(.POSIXError(error))
177+
observer.sendFailed(.POSIXError(error))
178178
}
179179

180180
close(self.writeFD)
@@ -191,7 +191,7 @@ private final class Pipe {
191191
if error == ECANCELED {
192192
observer.sendInterrupted()
193193
} else if error != 0 {
194-
observer.sendError(.POSIXError(error))
194+
observer.sendFailed(.POSIXError(error))
195195
}
196196
}
197197
}, completed: {
@@ -252,14 +252,12 @@ private func aggregateDataReadFromPipe(pipe: Pipe) -> SignalProducer<ReadData, R
252252
} else {
253253
buffer = data
254254
}
255-
}, error: { error in
256-
observer.sendError(error)
257-
}, completed: {
255+
}, failed: observer.sendFailed
256+
, completed: {
258257
observer.sendNext(.aggregated(buffer))
259258
observer.sendCompleted()
260-
}, interrupted: {
261-
observer.sendInterrupted()
262-
}))
259+
}, interrupted: observer.sendInterrupted
260+
))
263261
}
264262
}
265263
}
@@ -426,7 +424,7 @@ public func launchTask(taskDescription: TaskDescription) -> SignalProducer<TaskE
426424
})
427425

428426
case let .Failure(error):
429-
observer.sendError(error)
427+
observer.sendFailed(error)
430428
return
431429
}
432430
}
@@ -451,14 +449,12 @@ public func launchTask(taskDescription: TaskDescription) -> SignalProducer<TaskE
451449
case let .Aggregated(data):
452450
stdoutAggregatedObserver.sendNext(data)
453451
}
454-
}, error: { error in
455-
observer.sendError(error)
456-
stdoutAggregatedObserver.sendError(error)
457-
}, completed: {
458-
stdoutAggregatedObserver.sendCompleted()
459-
}, interrupted: {
460-
stdoutAggregatedObserver.sendInterrupted()
461-
}))
452+
}, failed: { error in
453+
observer.sendFailed(error)
454+
stdoutAggregatedObserver.sendFailed(error)
455+
}, completed: stdoutAggregatedObserver.sendCompleted
456+
, interrupted: stdoutAggregatedObserver.sendInterrupted
457+
))
462458
}
463459

464460
stderrProducer.startWithSignal { signal, signalDisposable in
@@ -472,14 +468,12 @@ public func launchTask(taskDescription: TaskDescription) -> SignalProducer<TaskE
472468
case let .Aggregated(data):
473469
stderrAggregatedObserver.sendNext(data)
474470
}
475-
}, error: { error in
476-
observer.sendError(error)
477-
stderrAggregatedObserver.sendError(error)
478-
}, completed: {
479-
stderrAggregatedObserver.sendCompleted()
480-
}, interrupted: {
481-
stderrAggregatedObserver.sendInterrupted()
482-
}))
471+
}, failed: { error in
472+
observer.sendFailed(error)
473+
stderrAggregatedObserver.sendFailed(error)
474+
}, completed: stderrAggregatedObserver.sendCompleted
475+
, interrupted: stderrAggregatedObserver.sendInterrupted
476+
))
483477
}
484478

485479
task.standardOutput = stdoutPipe.writeHandle

0 commit comments

Comments
 (0)