From b9e19d9e17b8cefaecc026f62da88cef005cee81 Mon Sep 17 00:00:00 2001 From: Andrew Breckenridge Date: Tue, 21 Jul 2015 20:58:08 -0700 Subject: [PATCH 1/4] Changed ReactiveCocoa branch name ReactiveCocoa no longer has the swift-development branch Moving to the swift-1.2 branch --- Cartfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cartfile b/Cartfile index 9ee2af9..4e45bc3 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "ReactiveCocoa/ReactiveCocoa" "swift-development" +github "ReactiveCocoa/ReactiveCocoa" "swift-1.2" From d3806a34c6b5e410baee1de1b944b941fd1de8f6 Mon Sep 17 00:00:00 2001 From: Andrew Breckenridge Date: Tue, 21 Jul 2015 23:40:34 -0700 Subject: [PATCH 2/4] update ReactiveCocoa to v3.0 rc1 --- Cartfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cartfile b/Cartfile index 4e45bc3..2a72ad2 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "ReactiveCocoa/ReactiveCocoa" "swift-1.2" +github "ReactiveCocoa/ReactiveCocoa" "6c37b5ef416799a3a2a61ff78f051d5deb0d76b2" From c1e9acb53f1a12ac71b430a334e4ddbced439112 Mon Sep 17 00:00:00 2001 From: Andrew Breckenridge Date: Wed, 22 Jul 2015 13:18:46 -0700 Subject: [PATCH 3/4] update Cartfile to use RC tag --- Cartfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cartfile b/Cartfile index 2a72ad2..53758e0 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "ReactiveCocoa/ReactiveCocoa" "6c37b5ef416799a3a2a61ff78f051d5deb0d76b2" +github "ReactiveCocoa/ReactiveCocoa" "v3.0-RC.1" From 5b3083d55e1908db8d619e2ad09be3ced51ffbea Mon Sep 17 00:00:00 2001 From: Andrew Breckenridge Date: Wed, 22 Jul 2015 13:24:22 -0700 Subject: [PATCH 4/4] update ReactiveCocoa submodule reference to v3.0RC1 --- Cartfile.resolved | 2 +- Carthage/Checkouts/ReactiveCocoa | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cartfile.resolved b/Cartfile.resolved index ec20cf4..c531372 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -3,4 +3,4 @@ github "Quick/Nimble" "v0.4.2" github "Quick/Quick" "v0.3.1" github "jspahrsummers/xcconfigs" "0.8.1" github "antitypical/Result" "0.4.4" -github "ReactiveCocoa/ReactiveCocoa" "72854649533c4df644a896df7070a0cb835f8d60" +github "ReactiveCocoa/ReactiveCocoa" "6c37b5ef416799a3a2a61ff78f051d5deb0d76b2" diff --git a/Carthage/Checkouts/ReactiveCocoa b/Carthage/Checkouts/ReactiveCocoa index 7285464..6c37b5e 160000 --- a/Carthage/Checkouts/ReactiveCocoa +++ b/Carthage/Checkouts/ReactiveCocoa @@ -1 +1 @@ -Subproject commit 72854649533c4df644a896df7070a0cb835f8d60 +Subproject commit 6c37b5ef416799a3a2a61ff78f051d5deb0d76b2