Merge pull request #431 from libgit2/carthage-0.5

Migrate to Carthage 0.5
libgit2 · Dec 30, 2014 · 492c6be · 492c6be
2 parents 5021887 + 8e54413
commit 492c6be
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 13 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -8,11 +8,15 @@
 	path = External/libssh2
 	url = git://git.libssh2.org/libssh2.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/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.7
-github "Quick/Quick" == 0.2.0
-github "Quick/Nimble"

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.lock → Cartfile.resolved b/Cartfile.lock → Cartfile.resolved
@@ -1,3 +1,3 @@
 github "Quick/Nimble" "v0.2.0"
-github "Quick/Quick" "v0.2.0"
+github "Quick/Quick" "v0.2.2"
 github "jspahrsummers/xcconfigs" "0.7"
diff --git a/Carthage.checkout/Quick b/Carthage.checkout/Quick
diff --git a/Carthage.checkout/Nimble → Carthage/Checkouts/Nimble b/Carthage.checkout/Nimble → Carthage/Checkouts/Nimble
diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick
diff --git a/Carthage.checkout/xcconfigs → Carthage/Checkouts/xcconfigs b/Carthage.checkout/xcconfigs → Carthage/Checkouts/xcconfigs
diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj
@@ -905,7 +905,7 @@
 				D0D8186C174421EB00995A2E /* README.md */,
 			);
 			name = Configuration;
-			path = Carthage.checkout/xcconfigs;
+			path = Carthage/Checkouts/xcconfigs;
 			sourceTree = "<group>";
 		};
 		D0D81862174421EB00995A2E /* iOS */ = {

diff --git a/ObjectiveGitFramework.xcworkspace/contents.xcworkspacedata b/ObjectiveGitFramework.xcworkspace/contents.xcworkspacedata
diff --git a/ObjectiveGitTests/GTRemotePushSpec.m b/ObjectiveGitTests/GTRemotePushSpec.m
@@ -164,7 +164,7 @@
 			BOOL success = NO;
 			GTBranch *localTrackingBranch = [masterBranch trackingBranchWithError:&error success:&success];
 			expect(error).to(beNil());
-			expect(@(success)).to(beTrue());
+			expect(@(success)).to(beTruthy());
 			expect(@([localTrackingBranch numberOfCommitsWithError:NULL])).to(equal(@3));
 
 			// Number of commits on remote before push
@@ -183,7 +183,7 @@
 			// Number of commits on tracking branch after push
 			localTrackingBranch = [masterBranch trackingBranchWithError:&error success:&success];
 			expect(error).to(beNil());
-			expect(@(success)).to(beTrue());
+			expect(@(success)).to(beTruthy());
 			expect(@([localTrackingBranch numberOfCommitsWithError:NULL])).to(equal(@4));
 
 			// Refresh remote master branch to ensure the commit count is accurate