Merge pull request #421 from libgit2/cartfile

jspahrsummers · jspahrsummers · commit 4d1cb9caf96e · 2014-11-21T14:36:56.000-08:00
Use Carthage to manage submodules
diff --git a/.gitmodules b/.gitmodules
@@ -1,15 +1,18 @@
 [submodule "libgit2"]
 	path = External/libgit2
 	url = https://github.com/libgit2/libgit2.git
-[submodule "Configuration"]
-	path = External/Configuration
-	url = https://github.com/jspahrsummers/xcconfigs.git
 [submodule "openssl"]
 	path = External/openssl
 	url = https://github.com/openssl/openssl.git
 [submodule "libssh2"]
 	path = External/libssh2
 	url = git://git.libssh2.org/libssh2.git
-[submodule "External/Quick"]
-	path = External/Quick
-	url = https://github.com/github/Quick.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
+[submodule "Carthage.checkout/xcconfigs"]
+	path = Carthage.checkout/xcconfigs
+	url = https://github.com/jspahrsummers/xcconfigs.git
diff --git a/Cartfile b/Cartfile
@@ -0,0 +1,3 @@
+github "jspahrsummers/xcconfigs" >= 0.6
+github "Quick/Quick" == 0.2.0
+github "Quick/Nimble"
diff --git a/Cartfile.lock b/Cartfile.lock
@@ -0,0 +1,3 @@
+github "Quick/Nimble" "v0.1.0"
+github "Quick/Quick" "v0.2.0"
+github "jspahrsummers/xcconfigs" "carthage-0.6"
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/xcconfigs b/Carthage.checkout/xcconfigs
diff --git a/External/Quick b/External/Quick
diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj
@@ -888,7 +888,7 @@
 				D0D8186C174421EB00995A2E /* README.md */,
 			);
 			name = Configuration;
-			path = External/Configuration;
+			path = Carthage.checkout/xcconfigs;
 			sourceTree = "<group>";
 		};
 		D0D81862174421EB00995A2E /* iOS */ = {
diff --git a/ObjectiveGitFramework.xcworkspace/contents.xcworkspacedata b/ObjectiveGitFramework.xcworkspace/contents.xcworkspacedata

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+github "jspahrsummers/xcconfigs" >= 0.6`
	`2`	`+github "Quick/Quick" == 0.2.0`
	`3`	`+github "Quick/Nimble"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+github "Quick/Nimble" "v0.1.0"`
	`2`	`+github "Quick/Quick" "v0.2.0"`
	`3`	`+github "jspahrsummers/xcconfigs" "carthage-0.6"`