Merge pull request #41 from ReactiveCocoa/ras-3.0

andersio · web-flow · commit 74905aec9dea · 2017-11-17T16:03:36.000+08:00
Update ReactiveSwift to 3.0.
diff --git a/Cartfile b/Cartfile
@@ -1,2 +1,2 @@
 github "ReactiveCocoa/ReactiveObjC" ~> 3.0.0
-github "ReactiveCocoa/ReactiveSwift" ~> 2.0.0
+github "ReactiveCocoa/ReactiveSwift" ~> 3.0.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,6 +1,6 @@
 github "Quick/Nimble" "v7.0.2"
 github "Quick/Quick" "v1.2.0"
 github "ReactiveCocoa/ReactiveObjC" "3.0.0"
-github "ReactiveCocoa/ReactiveSwift" "2.0.1"
-github "antitypical/Result" "3.2.3"
+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/Carthage/Checkouts/Result b/Carthage/Checkouts/Result
@@ -1 +1 @@
-Subproject commit c8446185238659a2b27c0261f64ff1254291d07d
+Subproject commit 7477584259bfce2560a19e06ad9f71db441fff11

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`github "ReactiveCocoa/ReactiveObjC" ~> 3.0.0`
`2`		`-github "ReactiveCocoa/ReactiveSwift" ~> 2.0.0`
	`2`	`+github "ReactiveCocoa/ReactiveSwift" ~> 3.0.0`