Merge pull request #35 from ReactiveCocoa/carthage-0.5

Migrate to Carthage 0.5
ReactiveCocoa · Dec 30, 2014 · f813ffb · f813ffb
2 parents c5d24ab + dc1917a
commit f813ffb
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 20 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,12 +1,16 @@
 [submodule "Carthage.checkout/Nimble"]
-	path = Carthage.checkout/Nimble
+	path = Carthage/Checkouts/Nimble
 	url = https://github.com/Quick/Nimble.git
 [submodule "Carthage.checkout/Quick"]
-	path = Carthage.checkout/Quick
+	path = Carthage/Checkouts/Quick
 	url = https://github.com/Quick/Quick.git
 [submodule "Carthage.checkout/xcconfigs"]
-	path = Carthage.checkout/xcconfigs
+	path = Carthage/Checkouts/xcconfigs
 	url = https://github.com/jspahrsummers/xcconfigs.git
 [submodule "Carthage.checkout/ReactiveCocoa"]
-	path = Carthage.checkout/ReactiveCocoa
+	path = Carthage/Checkouts/ReactiveCocoa
 	url = https://github.com/ReactiveCocoa/ReactiveCocoa.git
+[submodule "Carthage/Checkouts/Nimble"]
+	url = https://github.com/Quick/Nimble.git
+[submodule "Carthage/Checkouts/Quick"]
+	url = https://github.com/Quick/Quick.git
diff --git a/Cartfile b/Cartfile
@@ -1,4 +1 @@
-github "ReactiveCocoa/ReactiveCocoa" ~> 2.4.1
-github "jspahrsummers/xcconfigs" >= 0.6
-github "Quick/Quick" == 0.2.0
-github "Quick/Nimble"
+github "ReactiveCocoa/ReactiveCocoa" ~> 2.4.3
diff --git a/Cartfile.lock b/Cartfile.lock
diff --git a/Cartfile.private b/Cartfile.private
@@ -0,0 +1,3 @@
+github "jspahrsummers/xcconfigs" >= 0.7
+github "Quick/Quick" ~> 0.2
+github "Quick/Nimble" ~> 0.2
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -0,0 +1,4 @@
+github "Quick/Nimble" "v0.2.0"
+github "Quick/Quick" "v0.2.2"
+github "ReactiveCocoa/ReactiveCocoa" "v2.4.3"
+github "jspahrsummers/xcconfigs" "0.7"
diff --git a/Carthage.checkout/Quick b/Carthage.checkout/Quick
diff --git a/Carthage.checkout/ReactiveCocoa b/Carthage.checkout/ReactiveCocoa
diff --git a/Carthage.checkout/Nimble → Carthage/Checkouts/Nimble b/Carthage.checkout/Nimble → Carthage/Checkouts/Nimble
diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick
diff --git a/Carthage/Checkouts/ReactiveCocoa b/Carthage/Checkouts/ReactiveCocoa
diff --git a/Carthage.checkout/xcconfigs → Carthage/Checkouts/xcconfigs b/Carthage.checkout/xcconfigs → Carthage/Checkouts/xcconfigs
diff --git a/ReactiveViewModel.xcodeproj/project.pbxproj b/ReactiveViewModel.xcodeproj/project.pbxproj
@@ -102,8 +102,8 @@
 		D0948B591781618A00BA8F23 /* RVMViewModelSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RVMViewModelSpec.m; sourceTree = "<group>"; };
 		D0948B5C178161A800BA8F23 /* RVMTestViewModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RVMTestViewModel.h; sourceTree = "<group>"; };
 		D0948B5D178161A800BA8F23 /* RVMTestViewModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RVMTestViewModel.m; sourceTree = "<group>"; };
-		D0C7C39E19FEF8F60069B5C0 /* Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Framework.xcconfig; path = Carthage.checkout/xcconfigs/Base/Targets/Framework.xcconfig; sourceTree = SOURCE_ROOT; };
-		D0C7C39F19FEF8FC0069B5C0 /* iOS-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "iOS-Framework.xcconfig"; path = "Carthage.checkout/xcconfigs/iOS/iOS-Framework.xcconfig"; sourceTree = SOURCE_ROOT; };
+		D0C7C39E19FEF8F60069B5C0 /* Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Framework.xcconfig; path = Carthage/Checkouts/xcconfigs/Base/Targets/Framework.xcconfig; sourceTree = SOURCE_ROOT; };
+		D0C7C39F19FEF8FC0069B5C0 /* iOS-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "iOS-Framework.xcconfig"; path = "Carthage/Checkouts/xcconfigs/iOS/iOS-Framework.xcconfig"; sourceTree = SOURCE_ROOT; };
 		D0C7C3A719FEFB520069B5C0 /* ReactiveViewModel.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ReactiveViewModel.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		D0C7C3B119FEFB520069B5C0 /* ReactiveViewModel iOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ReactiveViewModel iOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		D0C7C3C719FEFC7D0069B5C0 /* ReactiveCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ReactiveCocoa.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -237,7 +237,7 @@
 				D0948A88178159DA00BA8F23 /* README.md */,
 			);
 			name = Configuration;
-			path = Carthage.checkout/xcconfigs;
+			path = Carthage/Checkouts/xcconfigs;
 			sourceTree = "<group>";
 		};
 		D0948A74178159DA00BA8F23 /* Base */ = {

diff --git a/ReactiveViewModel.xcworkspace/contents.xcworkspacedata b/ReactiveViewModel.xcworkspace/contents.xcworkspacedata