Update ReactiveSwift to 3.0

Cartfile

@@ -1,7 +1,7 @@
 github "antitypical/Result" ~> 3.2
-github "Carthage/ReactiveTask" ~> 0.13
+github "Carthage/ReactiveTask" "reactiveswift-3.0"
 github "Carthage/Commandant" ~> 0.12
 github "jdhealy/PrettyColors" ~> 5.0
-github "ReactiveCocoa/ReactiveSwift" ~> 2.0
-github "mdiep/Tentacle" ~> 0.10
+github "ReactiveCocoa/ReactiveSwift" ~> 3.0
+github "mdiep/Tentacle" "reactiveswift-3.0"
 github "thoughtbot/Curry" ~> 3.0

Cartfile.resolved

@@ -1,10 +1,10 @@
 github "Carthage/Commandant" "0.12.0"
-github "Carthage/ReactiveTask" "0.13.0"
+github "Carthage/ReactiveTask" "a61a9689ce433c54fd1d097a166751c19967630f"
 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 "jdhealy/PrettyColors" "v5.0.0"
+github "jdhealy/PrettyColors" "5.0.1"
 github "jspahrsummers/xcconfigs" "0.9"
-github "mdiep/Tentacle" "0.10.0"
+github "mdiep/Tentacle" "66c71c8390a710ed505be8d0c2b6557e285c77b2"
 github "thoughtbot/Curry" "v3.0.0"

Package.resolved

@@ -33,8 +33,8 @@
         "repositoryURL": "https://github.com/jdhealy/PrettyColors.git",
         "state": {
           "branch": null,
-          "revision": "40dba7f0390e6daf855448acbe8762b40a2366cc",
-          "version": "5.0.0"
+          "revision": "1954a28331668a706134dc315fe264b15b74984e",
+          "version": "5.0.1"
         }
       },
       {
@@ -51,17 +51,17 @@
         "repositoryURL": "https://github.com/ReactiveCocoa/ReactiveSwift.git",
         "state": {
           "branch": null,
-          "revision": "b9d5b350a446b85704396ce332a1f9e4960cfc6b",
-          "version": "2.0.1"
+          "revision": "2ec944c43ef9cf6b1380629e3ea483f62a7afaef",
+          "version": "3.0.0"
         }
       },
       {
         "package": "ReactiveTask",
         "repositoryURL": "https://github.com/Carthage/ReactiveTask.git",
         "state": {
-          "branch": null,
-          "revision": "c4ac2a770d9991157561084ec7b9a4fe40fed87a",
-          "version": "0.13.0"
+          "branch": "reactiveswift-3.0",
+          "revision": "a61a9689ce433c54fd1d097a166751c19967630f",
+          "version": null
         }
       },
       {
@@ -77,9 +77,9 @@
         "package": "Tentacle",
         "repositoryURL": "https://github.com/mdiep/Tentacle.git",
         "state": {
-          "branch": null,
-          "revision": "90c57572d15c56d591e671bbe4fc37f7288df060",
-          "version": "0.10.0"
+          "branch": "reactiveswift-3.0",
+          "revision": "66c71c8390a710ed505be8d0c2b6557e285c77b2",
+          "version": null
         }
       }
     ]

Package.swift

@@ -10,11 +10,11 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/antitypical/Result.git", from: "3.2.1"),
-        .package(url: "https://github.com/Carthage/ReactiveTask.git", from: "0.13.0"),
+        .package(url: "https://github.com/Carthage/ReactiveTask.git", .branch("reactiveswift-3.0")),
         .package(url: "https://github.com/Carthage/Commandant.git", from: "0.12.0"),
         .package(url: "https://github.com/jdhealy/PrettyColors.git", from: "5.0.0"),
-        .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", from: "2.0.0"),
-        .package(url: "https://github.com/mdiep/Tentacle.git", from: "0.10.0"),
+        .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", from: "3.0.0"),
+        .package(url: "https://github.com/mdiep/Tentacle.git", .branch("reactiveswift-3.0")),
         .package(url: "https://github.com/thoughtbot/Curry.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"),

Source/CarthageKit/FrameworkExtensions.swift

@@ -35,7 +35,7 @@ extension Signal {
 	/// occurs on `otherSignal` (repeats included).
 	fileprivate func permute<U>(with otherSignal: Signal<U, Error>) -> Signal<(Value, U), Error> {
 		// swiftlint:disable:previous cyclomatic_complexity function_body_length
-		return Signal<(Value, U), Error> { observer in
+		return Signal<(Value, U), Error> { observer, lifetime in
 			let lock = NSLock()
 			lock.name = "org.carthage.CarthageKit.permute"
 
@@ -45,6 +45,7 @@ extension Signal {
 			var otherCompleted = false
 
 			let compositeDisposable = CompositeDisposable()
+			lifetime += compositeDisposable
 
 			compositeDisposable += self.observe { event in
 				switch event {
@@ -105,8 +106,6 @@ extension Signal {
 					observer.sendInterrupted()
 				}
 			}
-
-			return compositeDisposable
 		}
 	}
 }
@@ -155,11 +154,11 @@ extension Signal where Value: EventProtocol, Value.Error == Error {
 	/// Dematerializes the signal, like dematerialize(), but only yields inner
 	/// Error events if no values were sent.
 	internal func dematerializeErrorsIfEmpty() -> Signal<Value.Value, Error> {
-		return Signal<Value.Value, Error> { observer in
+		return Signal<Value.Value, Error> { observer, lifetime in
 			var receivedValue = false
 			var receivedError: Error?
 
-			return self.observe { event in
+			lifetime += self.observe { event in
 				switch event {
 				case let .value(innerEvent):
 					switch innerEvent.event {

Source/CarthageKit/Xcode.swift

@@ -982,8 +982,8 @@ extension Signal where Value: TaskEventType {
 	fileprivate func collectTaskEvents() -> Signal<TaskEvent<[Value.T]>, Error> {
 		var taskValues: [Value.T] = []
 
-		return Signal<TaskEvent<[Value.T]>, Error> { observer in
-			return self.observe { event in
+		return Signal<TaskEvent<[Value.T]>, Error> { observer, lifetime in
+			lifetime += self.observe { event in
 				switch event {
 				case let .value(value):
 					if let taskValue = value.value {