Merge pull request #106 from Carthage/reactiveswift-3.0

mdiep · web-flow · commit dfc17bba1485 · 2017-11-19T16:00:00.000-05:00
Update ReactiveSwift to 3.0
diff --git a/.travis.yml b/.travis.yml
@@ -6,13 +6,13 @@ branches:
 matrix:
   include:
     - os: osx
-      osx_image: xcode9
+      osx_image: xcode9.1
       xcode_scheme: ReactiveTask
       script:
         - set -o pipefail && xcodebuild -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "$TRAVIS_XCODE_SCHEME" test | xcpretty
       env: JOB=Xcode9
     - os: osx
-      osx_image: xcode9
+      osx_image: xcode9.1
       script:
         - swift --version
         - swift build
diff --git a/Cartfile b/Cartfile
@@ -1,2 +1,2 @@
 github "antitypical/Result" ~> 3.2.1
-github "ReactiveCocoa/ReactiveSwift" ~> 2.0.1
+github "ReactiveCocoa/ReactiveSwift" ~> 3.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,5 +1,5 @@
 github "Quick/Nimble" "v7.0.2"
 github "Quick/Quick" "v1.2.0"
-github "ReactiveCocoa/ReactiveSwift" "2.0.1"
+github "ReactiveCocoa/ReactiveSwift" "3.0.0"
 github "antitypical/Result" "3.2.4"
 github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"
diff --git a/Carthage/Checkouts/ReactiveSwift b/Carthage/Checkouts/ReactiveSwift
@@ -1 +1 @@
-Subproject commit b9d5b350a446b85704396ce332a1f9e4960cfc6b
+Subproject commit 2ec944c43ef9cf6b1380629e3ea483f62a7afaef
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -8,7 +8,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/antitypical/Result.git", from: "3.2.1"),
-        .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", from: "2.0.1"),
+        .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", from: "3.0.0"),
         .package(url: "https://github.com/Quick/Quick.git", from: "1.2.0"),
         .package(url: "https://github.com/Quick/Nimble.git", from: "7.0.2"),
     ],
diff --git a/Sources/Task.swift b/Sources/Task.swift
@@ -512,7 +512,7 @@ extension Task {
 								lifetime += stdoutAggregated
 									.then(stderrAggregated)
 									.flatMap(.concat) { data -> SignalProducer<TaskEvent<Data>, TaskError> in
-										let errorString = (data.count > 0 ? String(data: data, encoding: .utf8) : nil)
+										let errorString = (data.isEmpty ? nil : String(data: data, encoding: .utf8))
 										return SignalProducer(error: .shellTaskFailed(self, exitCode: terminationStatus, standardError: errorString))
 									}
 									.start(observer)

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`github "antitypical/Result" ~> 3.2.1`
`2`		`-github "ReactiveCocoa/ReactiveSwift" ~> 2.0.1`
	`2`	`+github "ReactiveCocoa/ReactiveSwift" ~> 3.0`
Original file line number	Diff line number	Diff line change
`@@ -512,7 +512,7 @@ extension Task {`
`512`	`512`	`lifetime += stdoutAggregated`
`513`	`513`	`.then(stderrAggregated)`
`514`	`514`	`.flatMap(.concat) { data -> SignalProducer<TaskEvent<Data>, TaskError> in`
`515`		`- let errorString = (data.count > 0 ? String(data: data, encoding: .utf8) : nil)`
	`515`	`+ let errorString = (data.isEmpty ? nil : String(data: data, encoding: .utf8))`
`516`	`516`	`return SignalProducer(error: .shellTaskFailed(self, exitCode: terminationStatus, standardError: errorString))`
`517`	`517`	`}`
`518`	`518`	`.start(observer)`