Merge branch 'cartfile' into swift-cartfile

Conflicts: Carthage.checkout/xcconfigs
il3n · Nov 21, 2014 · 3d5a41f · 3d5a41f
2 parents 02daaa8 + 8ef937e
commit 3d5a41f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,8 +4,8 @@
 [submodule "Carthage.checkout/Quick"]
 	path = Carthage.checkout/Quick
 	url = https://github.com/Quick/Quick.git
-[submodule "Configuration"]
-	path = Configuration
+[submodule "Carthage.checkout/xcconfigs"]
+	path = Carthage.checkout/xcconfigs
 	url = https://github.com/jspahrsummers/xcconfigs.git
 [submodule "Carthage.checkout/LlamaKit"]
 	path = Carthage.checkout/LlamaKit

diff --git a/Cartfile b/Cartfile
@@ -1,3 +1,4 @@
+github "jspahrsummers/xcconfigs" >= 0.6
 github "Quick/Quick" == 0.2.0
 github "Quick/Nimble"
 github "LlamaKit/LlamaKit" == 0.1
diff --git a/Cartfile.lock b/Cartfile.lock
@@ -1,3 +1,4 @@
 github "LlamaKit/LlamaKit" "v0.1.0"
 github "Quick/Nimble" "v0.1.0"
 github "Quick/Quick" "v0.2.0"
+github "jspahrsummers/xcconfigs" "0.6"
diff --git a/Configuration → Carthage.checkout/xcconfigs b/Configuration → Carthage.checkout/xcconfigs
diff --git a/ReactiveCocoa.xcodeproj/project.pbxproj b/ReactiveCocoa.xcodeproj/project.pbxproj
@@ -1191,7 +1191,7 @@
 				D047263C19E49FE8006002AA /* README.md */,
 			);
 			name = Configuration;
-			path = Configuration;
+			path = Carthage.checkout/xcconfigs;
 			sourceTree = "<group>";
 		};
 		D047262619E49FE8006002AA /* Base */ = {