Merge pull request #34 from Carthage/update-rac

mdiep · mdiep · commit 0865b943ba07 · 2015-09-14T21:27:20.000-04:00
Update to RAC 3.0 final
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "ReactiveCocoa/ReactiveCocoa" "v3.0-RC.1"
+github "ReactiveCocoa/ReactiveCocoa" ~> 3.0
diff --git 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" "6c37b5ef416799a3a2a61ff78f051d5deb0d76b2"
+github "ReactiveCocoa/ReactiveCocoa" "v3.0.0"
diff --git a/Carthage/Checkouts/ReactiveCocoa b/Carthage/Checkouts/ReactiveCocoa
@@ -1 +1 @@
-Subproject commit 6c37b5ef416799a3a2a61ff78f051d5deb0d76b2
+Subproject commit e16f47cf9cb568136ebd81430b24af274c3c27c7
diff --git a/ReactiveTask/Info.plist b/ReactiveTask/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>0.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/ReactiveTaskTests/Info.plist b/ReactiveTaskTests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>0.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-github "ReactiveCocoa/ReactiveCocoa" "v3.0-RC.1"`
	`1`	`+github "ReactiveCocoa/ReactiveCocoa" ~> 3.0`