'Cancel' for PromiseKit -- fix Travis build -- update carthage PromiseKit dependencies for all extensions to temporarily point at the PromiseKit branch containing the cancellable classes

dougzilla32 · dougzilla32 · commit 0a35eac3b7ae · 2018-07-18T19:21:25.000-07:00
diff --git a/Cartfile b/Cartfile
@@ -1 +1,2 @@
-github "mxcl/PromiseKit" ~> 6.0
+#github "mxcl/PromiseKit" ~> 6.0
+github "dougzilla32/PromiseKit" "CoreCancel"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1 +1 @@
-github "mxcl/PromiseKit" "6.3.4"
+github "dougzilla32/PromiseKit" "e858d54f6bcb83a435c3ec8016c9a6c2f6befeb2"

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-github "mxcl/PromiseKit" ~> 6.0`
	`1`	`+#github "mxcl/PromiseKit" ~> 6.0`
	`2`	`+github "dougzilla32/PromiseKit" "CoreCancel"`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-github "mxcl/PromiseKit" "6.3.4"`
	`1`	`+github "dougzilla32/PromiseKit" "e858d54f6bcb83a435c3ec8016c9a6c2f6befeb2"`