From 4d540f0b2822d70fa62bb074c401243f70006bd0 Mon Sep 17 00:00:00 2001
From: Syo Ikeda <suicaicoca@gmail.com>
Date: Tue, 28 Feb 2017 13:59:01 +0900
Subject: [PATCH 1/2] Update ReactiveSwift to 1.1

---
 .Package.test.swift                    | 2 +-
 Cartfile                               | 2 +-
 Cartfile.resolved                      | 2 +-
 Carthage/Checkouts/ReactiveSwift       | 2 +-
 Package.swift                          | 2 +-
 Sources/Task.swift                     | 6 +-----
 Tests/ReactiveTaskTests/TaskSpec.swift | 3 +--
 7 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/.Package.test.swift b/.Package.test.swift
index 004ff7f..9c9ff8d 100644
--- a/.Package.test.swift
+++ b/.Package.test.swift
@@ -3,7 +3,7 @@ import PackageDescription
 let package = Package(
     name: "ReactiveTask",
     dependencies: [
-        .Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", majorVersion: 1),
+        .Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", versions: Version(1, 1, 0)..<Version(1, .max, .max)),
         .Package(url: "https://github.com/Quick/Quick.git", majorVersion: 1, minor: 1),
         .Package(url: "https://github.com/Quick/Nimble.git", majorVersion: 6),
     ]
diff --git a/Cartfile b/Cartfile
index c97e0fe..fee9fdb 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1 +1 @@
-github "ReactiveCocoa/ReactiveSwift" ~> 1.0
+github "ReactiveCocoa/ReactiveSwift" ~> 1.1
diff --git a/Cartfile.resolved b/Cartfile.resolved
index 156757e..66ea559 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,5 +1,5 @@
 github "Quick/Nimble" "v6.0.1"
 github "Quick/Quick" "v1.1.0"
+github "ReactiveCocoa/ReactiveSwift" "1.1.0"
 github "antitypical/Result" "3.1.0"
 github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"
-github "ReactiveCocoa/ReactiveSwift" "1.0.0"
diff --git a/Carthage/Checkouts/ReactiveSwift b/Carthage/Checkouts/ReactiveSwift
index 7920f19..c83de32 160000
--- a/Carthage/Checkouts/ReactiveSwift
+++ b/Carthage/Checkouts/ReactiveSwift
@@ -1 +1 @@
-Subproject commit 7920f196fd5073f4c98e03fa40b4e4b72470b935
+Subproject commit c83de32f1adbcef89618cde4222f69a8bcecd7c2
diff --git a/Package.swift b/Package.swift
index f5f09d0..6eccd8f 100644
--- a/Package.swift
+++ b/Package.swift
@@ -3,6 +3,6 @@ import PackageDescription
 let package = Package(
     name: "ReactiveTask",
     dependencies: [
-        .Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", majorVersion: 1),
+        .Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", versions: Version(1, 1, 0)..<Version(1, .max, .max)),
     ]
 )
diff --git a/Sources/Task.swift b/Sources/Task.swift
index 55b2884..643e4c6 100644
--- a/Sources/Task.swift
+++ b/Sources/Task.swift
@@ -389,11 +389,7 @@ extension Signal where Value: TaskEventType {
 	/// Ignores incremental standard output and standard error data from the given
 	/// task, sending only a single value with the final, aggregated result.
 	public func ignoreTaskData() -> Signal<Value.T, Error> {
-		return self
-			.map { event in
-				return event.value
-			}
-			.skipNil()
+		return self.filterMap { $0.value }
 	}
 }
 
diff --git a/Tests/ReactiveTaskTests/TaskSpec.swift b/Tests/ReactiveTaskTests/TaskSpec.swift
index 5c1e99e..7b357c8 100644
--- a/Tests/ReactiveTaskTests/TaskSpec.swift
+++ b/Tests/ReactiveTaskTests/TaskSpec.swift
@@ -71,8 +71,7 @@ class TaskSpec: QuickSpec {
 			let data = strings.map { $0.data(using: .utf8)! }
 
 			let result = Task("/usr/bin/sort").launch(standardInput: SignalProducer(data))
-				.map { event in event.value }
-				.skipNil()
+				.filterMap { event in event.value }
 				.single()
 
 			expect(result).notTo(beNil())

From 708451a21d95ebf73f5c2644e45625b972157946 Mon Sep 17 00:00:00 2001
From: Syo Ikeda <suicaicoca@gmail.com>
Date: Thu, 2 Mar 2017 06:50:34 +0900
Subject: [PATCH 2/2] Update Result to 3.2

---
 .Package.test.swift       | 1 +
 Cartfile                  | 1 +
 Cartfile.resolved         | 2 +-
 Carthage/Checkouts/Result | 2 +-
 Package.swift             | 1 +
 Sources/Task.swift        | 2 +-
 6 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.Package.test.swift b/.Package.test.swift
index 9c9ff8d..3ef5e04 100644
--- a/.Package.test.swift
+++ b/.Package.test.swift
@@ -3,6 +3,7 @@ import PackageDescription
 let package = Package(
     name: "ReactiveTask",
     dependencies: [
+        .Package(url: "https://github.com/antitypical/Result.git", versions: Version(3, 2, 0)..<Version(3, .max, .max)),
         .Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", versions: Version(1, 1, 0)..<Version(1, .max, .max)),
         .Package(url: "https://github.com/Quick/Quick.git", majorVersion: 1, minor: 1),
         .Package(url: "https://github.com/Quick/Nimble.git", majorVersion: 6),
diff --git a/Cartfile b/Cartfile
index fee9fdb..4a118dc 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1 +1,2 @@
+github "antitypical/Result" ~> 3.2
 github "ReactiveCocoa/ReactiveSwift" ~> 1.1
diff --git a/Cartfile.resolved b/Cartfile.resolved
index 66ea559..0092837 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,5 +1,5 @@
 github "Quick/Nimble" "v6.0.1"
 github "Quick/Quick" "v1.1.0"
 github "ReactiveCocoa/ReactiveSwift" "1.1.0"
-github "antitypical/Result" "3.1.0"
+github "antitypical/Result" "3.2.0"
 github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"
diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result
index 2dd1a0c..5db7bc7 160000
--- a/Carthage/Checkouts/Result
+++ b/Carthage/Checkouts/Result
@@ -1 +1 @@
-Subproject commit 2dd1a0c7bca4cc44082f72020fe8b14491056f88
+Subproject commit 5db7bc7b4af78d9b78294e1de87c51ae4726e4a2
diff --git a/Package.swift b/Package.swift
index 6eccd8f..5239014 100644
--- a/Package.swift
+++ b/Package.swift
@@ -3,6 +3,7 @@ import PackageDescription
 let package = Package(
     name: "ReactiveTask",
     dependencies: [
+        .Package(url: "https://github.com/antitypical/Result.git", versions: Version(3, 2, 0)..<Version(3, .max, .max)),
         .Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", versions: Version(1, 1, 0)..<Version(1, .max, .max)),
     ]
 )
diff --git a/Sources/Task.swift b/Sources/Task.swift
index 643e4c6..7bd81fb 100644
--- a/Sources/Task.swift
+++ b/Sources/Task.swift
@@ -436,7 +436,7 @@ extension Task {
 				}
 			}
 
-			SignalProducer(result: Pipe.create(queue, group) &&& Pipe.create(queue, group))
+			SignalProducer(result: Pipe.create(queue, group).fanout(Pipe.create(queue, group)))
 				.flatMap(.merge) { stdoutPipe, stderrPipe -> SignalProducer<TaskEvent<Data>, TaskError> in
 					let stdoutProducer = stdoutPipe.transferReadsToProducer()
 					let stderrProducer = stderrPipe.transferReadsToProducer()