From 8806d6b8781b68d696edcdf14b0edae170d5efe6 Mon Sep 17 00:00:00 2001
From: Justin Spahr-Summers <Justin.SpahrSummers@gmail.com>
Date: Fri, 21 Nov 2014 11:40:14 -0800
Subject: [PATCH] Don't use Carthage for xcconfigs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We always want this to be present, so we don’t want Carthage to
skip it because of its path.
---
 .gitmodules                                  | 4 ++--
 Cartfile                                     | 1 -
 Cartfile.lock                                | 1 -
 Carthage.checkout/xcconfigs => Configuration | 0
 ReactiveCocoa.xcodeproj/project.pbxproj      | 2 +-
 5 files changed, 3 insertions(+), 5 deletions(-)
 rename Carthage.checkout/xcconfigs => Configuration (100%)

diff --git a/.gitmodules b/.gitmodules
index 7e37d220c8..316f24b8ee 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,6 +4,6 @@
 [submodule "Carthage.checkout/Quick"]
 	path = Carthage.checkout/Quick
 	url = https://github.com/Quick/Quick.git
-[submodule "Carthage.checkout/xcconfigs"]
-	path = Carthage.checkout/xcconfigs
+[submodule "Configuration"]
+	path = Configuration
 	url = https://github.com/jspahrsummers/xcconfigs.git
diff --git a/Cartfile b/Cartfile
index f01db9aa21..cf5b66310c 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,3 +1,2 @@
-github "jspahrsummers/xcconfigs" >= 0.6
 github "Quick/Quick" == 0.2.0
 github "Quick/Nimble"
diff --git a/Cartfile.lock b/Cartfile.lock
index c2e004afcd..02daa479cb 100644
--- a/Cartfile.lock
+++ b/Cartfile.lock
@@ -1,3 +1,2 @@
 github "Quick/Nimble" "v0.1.0"
 github "Quick/Quick" "v0.2.0"
-github "jspahrsummers/xcconfigs" "0.6"
diff --git a/Carthage.checkout/xcconfigs b/Configuration
similarity index 100%
rename from Carthage.checkout/xcconfigs
rename to Configuration
diff --git a/ReactiveCocoa.xcodeproj/project.pbxproj b/ReactiveCocoa.xcodeproj/project.pbxproj
index 879e771401..721e773cd6 100644
--- a/ReactiveCocoa.xcodeproj/project.pbxproj
+++ b/ReactiveCocoa.xcodeproj/project.pbxproj
@@ -1101,7 +1101,7 @@
 				D047263C19E49FE8006002AA /* README.md */,
 			);
 			name = Configuration;
-			path = Carthage.checkout/xcconfigs;
+			path = Configuration;
 			sourceTree = "<group>";
 		};
 		D047262619E49FE8006002AA /* Base */ = {