Merge pull request #13 from ReactiveCocoa/cartfile

jspahrsummers · jspahrsummers · commit 5164347fb2a4 · 2014-11-21T15:24:48.000-08:00
Use Carthage for managing submodules
diff --git a/.gitmodules b/.gitmodules
@@ -7,6 +7,15 @@
 [submodule "External/CocoaLumberjack"]
 	path = External/CocoaLumberjack
 	url = https://github.com/robbiehanson/CocoaLumberjack.git
-[submodule "External/ReactiveCocoa"]
-	path = External/ReactiveCocoa
+[submodule "Carthage.checkout/xcconfigs"]
+	path = Carthage.checkout/xcconfigs
+	url = https://github.com/jspahrsummers/xcconfigs.git
+[submodule "Carthage.checkout/ReactiveCocoa"]
+	path = Carthage.checkout/ReactiveCocoa
 	url = https://github.com/ReactiveCocoa/ReactiveCocoa.git
+[submodule "Carthage.checkout/Nimble"]
+	path = Carthage.checkout/Nimble
+	url = https://github.com/Quick/Nimble.git
+[submodule "Carthage.checkout/Quick"]
+	path = Carthage.checkout/Quick
+	url = https://github.com/Quick/Quick.git
diff --git a/Cartfile b/Cartfile
@@ -0,0 +1,2 @@
+github "ReactiveCocoa/ReactiveCocoa" ~> 2.4.1
+github "jspahrsummers/xcconfigs" >= 0.6
diff --git a/Cartfile.lock b/Cartfile.lock
@@ -0,0 +1,4 @@
+github "Quick/Nimble" "v0.1.0"
+github "Quick/Quick" "v0.2.0"
+github "jspahrsummers/xcconfigs" "carthage-0.6"
+github "ReactiveCocoa/ReactiveCocoa" "v2.4.1"
diff --git a/Carthage.checkout/Nimble b/Carthage.checkout/Nimble
@@ -0,0 +1 @@
+Subproject commit 81a2d8a63083ae6512d40f7a02d5e075e57be317
diff --git a/Carthage.checkout/Quick b/Carthage.checkout/Quick
@@ -0,0 +1 @@
+Subproject commit 315ae2a4a630156d5ac094ae1f107af60edce21d
diff --git a/Carthage.checkout/ReactiveCocoa b/Carthage.checkout/ReactiveCocoa
@@ -0,0 +1 @@
+Subproject commit 93068e32fdc5f242fd97058f907456d5970818ad
diff --git a/Carthage.checkout/xcconfigs b/Carthage.checkout/xcconfigs
@@ -0,0 +1 @@
+Subproject commit 6c7a02a43954c74d2be1d2fcf7bfd65a263e7c52
diff --git a/External/ReactiveCocoa b/External/ReactiveCocoa
diff --git a/RockemSockem.xcodeproj/project.pbxproj b/RockemSockem.xcodeproj/project.pbxproj
@@ -194,7 +194,7 @@
 				882438FB177B7EDC0071C196 /* iOS */,
 			);
 			name = xcconfigs;
-			path = External/ReactiveCocoa/external/xcconfigs;
+			path = Carthage.checkout/xcconfigs;
 			sourceTree = "<group>";
 		};
 		882438EA177B7EDC0071C196 /* Base */ = {
diff --git a/RockemSockem.xcworkspace/contents.xcworkspacedata b/RockemSockem.xcworkspace/contents.xcworkspacedata

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+github "ReactiveCocoa/ReactiveCocoa" ~> 2.4.1`
	`2`	`+github "jspahrsummers/xcconfigs" >= 0.6`