Merge pull request #431 from libgit2/carthage-0.5

Migrate to Carthage 0.5

Author: robrix

.gitmodules

@@ -8,11 +8,15 @@
 	path = External/libssh2
 	url = git://git.libssh2.org/libssh2.git
 [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/Checkouts/Nimble"]
+	url = https://github.com/Quick/Nimble.git
+[submodule "Carthage/Checkouts/Quick"]
+	url = https://github.com/Quick/Quick.git

Cartfile

@@ -1,3 +0,0 @@
-github "jspahrsummers/xcconfigs" >= 0.7
-github "Quick/Quick" == 0.2.0
-github "Quick/Nimble"

Cartfile.private

@@ -0,0 +1,3 @@
+github "jspahrsummers/xcconfigs" >= 0.7
+github "Quick/Quick" ~> 0.2
+github "Quick/Nimble" ~> 0.2

Cartfile.lock renamed to Cartfile.resolved

@@ -1,3 +1,3 @@
 github "Quick/Nimble" "v0.2.0"
-github "Quick/Quick" "v0.2.0"
+github "Quick/Quick" "v0.2.2"
 github "jspahrsummers/xcconfigs" "0.7"

Carthage.checkout/Quick

@@ -905,7 +905,7 @@
 				D0D8186C174421EB00995A2E /* README.md */,
 			);
 			name = Configuration;
-			path = Carthage.checkout/xcconfigs;
+			path = Carthage/Checkouts/xcconfigs;
 			sourceTree = "<group>";
 		};
 		D0D81862174421EB00995A2E /* iOS */ = {