Merge pull request #223 from octokit/carthage-0.5

Migrate to Carthage 0.5
octokit · Dec 30, 2014 · be3b448 · be3b448
2 parents f0b00b8 + 56c5297
commit be3b448
Show file tree

Hide file tree

Showing 19 changed files with 31 additions and 27 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -8,17 +8,21 @@
 	path = External/OHHTTPStubs
 	url = https://github.com/github/OHHTTPStubs.git
 [submodule "Carthage.checkout/Mantle"]
-	path = Carthage.checkout/Mantle
+	path = Carthage/Checkouts/Mantle
 	url = https://github.com/Mantle/Mantle.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/ReactiveCocoa"]
-	path = Carthage.checkout/ReactiveCocoa
+	path = Carthage/Checkouts/ReactiveCocoa
 	url = https://github.com/ReactiveCocoa/ReactiveCocoa.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,5 +1,2 @@
-github "Mantle/Mantle" ~> 1.5.2
-github "ReactiveCocoa/ReactiveCocoa" ~> 2.4.1
-github "jspahrsummers/xcconfigs" >= 0.6
-github "Quick/Quick" == 0.2.0
-github "Quick/Nimble"
+github "Mantle/Mantle" ~> 1.5.3
+github "ReactiveCocoa/ReactiveCocoa" ~> 2.4.3
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,5 @@
+github "Mantle/Mantle" "1.5.3"
+github "Quick/Nimble" "v0.2.0"
+github "Quick/Quick" "v0.2.2"
+github "ReactiveCocoa/ReactiveCocoa" "v2.4.3"
+github "jspahrsummers/xcconfigs" "0.7"
diff --git a/Carthage.checkout/Mantle b/Carthage.checkout/Mantle
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/ReactiveCocoa b/Carthage.checkout/ReactiveCocoa
diff --git a/Carthage.checkout/xcconfigs b/Carthage.checkout/xcconfigs
diff --git a/Carthage/Checkouts/Mantle b/Carthage/Checkouts/Mantle
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/ReactiveCocoa b/Carthage/Checkouts/ReactiveCocoa
diff --git a/Carthage/Checkouts/xcconfigs b/Carthage/Checkouts/xcconfigs
diff --git a/External/OctoKitDependencies/OctoKitDependencies.xcodeproj/project.pbxproj b/External/OctoKitDependencies/OctoKitDependencies.xcodeproj/project.pbxproj
@@ -156,7 +156,7 @@
 				D0040C7519FEBF49002869A6 /* README.md */,
 			);
 			name = Configuration;
-			path = ../../Carthage.checkout/xcconfigs;
+			path = ../../Carthage/Checkouts/xcconfigs;
 			sourceTree = "<group>";
 		};
 		D0040C5F19FEBF49002869A6 /* Base */ = {

diff --git a/OctoKit.xcodeproj/project.pbxproj b/OctoKit.xcodeproj/project.pbxproj
@@ -766,7 +766,7 @@
 				D0040C8D19FEBF53002869A6 /* README.md */,
 			);
 			name = Configuration;
-			path = Carthage.checkout/xcconfigs;
+			path = Carthage/Checkouts/xcconfigs;
 			sourceTree = "<group>";
 		};
 		D0040C7719FEBF53002869A6 /* Base */ = {

diff --git a/OctoKit.xcworkspace/contents.xcworkspacedata b/OctoKit.xcworkspace/contents.xcworkspacedata
diff --git a/OctoKit/OCTResponse.m b/OctoKit/OCTResponse.m
@@ -7,7 +7,7 @@
 //
 
 #import "OCTResponse.h"
-#import "EXTKeyPathCoding.h"
+#import <ReactiveCocoa/EXTKeyPathCoding.h>
 
 @interface OCTResponse ()