Merge pull request #61 from Carthage/update-rac

mdiep · mdiep · commit d5be89ddcb70 · 2016-06-02T08:48:37.000-04:00
Update ReactiveCocoa to v4.2.0
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "ReactiveCocoa/ReactiveCocoa" ~> 4.1
+github "ReactiveCocoa/ReactiveCocoa" ~> 4.2
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -2,4 +2,4 @@ github "Quick/Nimble" "v4.0.0"
 github "Quick/Quick" "v0.9.2"
 github "antitypical/Result" "2.0.0"
 github "jspahrsummers/xcconfigs" "0.9"
-github "ReactiveCocoa/ReactiveCocoa" "v4.1.0"
+github "ReactiveCocoa/ReactiveCocoa" "v4.2.0"
diff --git a/Carthage/Checkouts/ReactiveCocoa b/Carthage/Checkouts/ReactiveCocoa
@@ -1 +1 @@
-Subproject commit fdbd3676cc4305c48e53bc25aebdb0eb607cdc2b
+Subproject commit 5cfcdccdcc693e7d685b4f7b7cf2c2ccf5c59c8d
diff --git a/ReactiveTask/Task.swift b/ReactiveTask/Task.swift
@@ -463,7 +463,6 @@ public func launchTask(task: Task, standardInput: SignalProducer<NSData, NoError
 
 						return aggregated.producer
 							.ignoreNil()
-							.promoteErrors(TaskError.self)
 							.flatMap(.Concat) { $0.producer }
 					}
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-github "ReactiveCocoa/ReactiveCocoa" ~> 4.1`
	`1`	`+github "ReactiveCocoa/ReactiveCocoa" ~> 4.2`
Original file line number	Diff line number	Diff line change
`@@ -463,7 +463,6 @@ public func launchTask(task: Task, standardInput: SignalProducer<NSData, NoError`
`463`	`463`
`464`	`464`	`return aggregated.producer`
`465`	`465`	`.ignoreNil()`
`466`		`- .promoteErrors(TaskError.self)`
`467`	`466`	`.flatMap(.Concat) { $0.producer }`
`468`	`467`	`}`
`469`	`468`