Merge pull request #431 from Mantle/carthage-0.5

Migrate to Carthage 0.5
Mantle · Dec 30, 2014 · f797bd4 · f797bd4
2 parents ad7fb69 + 2b4c868
commit f797bd4
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 15 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,13 @@
 [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
diff --git a/Cartfile b/Cartfile
@@ -1,3 +0,0 @@
-github "jspahrsummers/xcconfigs" >= 0.6
-github "Quick/Quick" == 0.2.0
-github "Quick/Nimble"

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,3 @@
+github "Quick/Nimble" "v0.2.0"
+github "Quick/Quick" "v0.2.2"
+github "jspahrsummers/xcconfigs" "0.7"
diff --git a/Carthage.checkout/Nimble b/Carthage.checkout/Nimble
diff --git a/Carthage.checkout/Quick b/Carthage.checkout/Quick
diff --git a/Carthage.checkout/xcconfigs b/Carthage.checkout/xcconfigs
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick
diff --git a/Carthage/Checkouts/xcconfigs b/Carthage/Checkouts/xcconfigs
diff --git a/Mantle.xcodeproj/project.pbxproj b/Mantle.xcodeproj/project.pbxproj
@@ -450,7 +450,7 @@
 				D094E4941777619600906BF7 /* README.md */,
 			);
 			name = Configuration;
-			path = Carthage.checkout/xcconfigs;
+			path = Carthage/Checkouts/xcconfigs;
 			sourceTree = "<group>";
 		};
 		D094E4801777619600906BF7 /* Base */ = {

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