update to carthage 0.4 directory structure

il3n · Dec 25, 2014 · 4875c6c · 4875c6c
1 parent e94a432
commit 4875c6c
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,4 +14,4 @@ xcuserdata
 profile
 *.moved-aside
 
-Carthage.build
+Carthage/Build
diff --git a/.gitmodules b/.gitmodules
@@ -1,12 +1,12 @@
 [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.checkout/LlamaKit"]
-	path = Carthage.checkout/LlamaKit
+	path = Carthage/Checkouts/LlamaKit
 	url = https://github.com/Carthage/LlamaKit.git
diff --git a/Cartfile.lock b/Cartfile.lock
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -0,0 +1,4 @@
+github "Carthage/LlamaKit" "carthage-0.1.1"
+github "Quick/Nimble" "v0.2.0"
+github "Quick/Quick" "v0.2.0"
+github "jspahrsummers/xcconfigs" "0.7"
diff --git a/Carthage.checkout/Nimble b/Carthage.checkout/Nimble
diff --git a/Carthage.checkout/xcconfigs b/Carthage.checkout/xcconfigs
diff --git a/Carthage.checkout/LlamaKit → Carthage/Checkouts/LlamaKit b/Carthage.checkout/LlamaKit → Carthage/Checkouts/LlamaKit
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
diff --git a/Carthage.checkout/Quick → Carthage/Checkouts/Quick b/Carthage.checkout/Quick → Carthage/Checkouts/Quick
diff --git a/Carthage/Checkouts/xcconfigs b/Carthage/Checkouts/xcconfigs
diff --git a/ReactiveCocoa.xcodeproj/project.pbxproj b/ReactiveCocoa.xcodeproj/project.pbxproj
@@ -1204,7 +1204,7 @@
 				D047263C19E49FE8006002AA /* README.md */,
 			);
 			name = Configuration;
-			path = Carthage.checkout/xcconfigs;
+			path = Carthage/Checkouts/xcconfigs;
 			sourceTree = "<group>";
 		};
 		D047262619E49FE8006002AA /* Base */ = {

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