From be8b1f1fd8eee90ab82ad74fc0a2963360703a80 Mon Sep 17 00:00:00 2001 From: Justin Spahr-Summers Date: Fri, 21 Nov 2014 14:29:24 -0800 Subject: [PATCH] Use Carthage to manage submodules --- .gitmodules | 15 +++++++++------ Cartfile | 3 +++ Cartfile.lock | 3 +++ Carthage.checkout/Nimble | 1 + Carthage.checkout/Quick | 1 + .../Configuration => Carthage.checkout/xcconfigs | 0 External/Quick | 1 - ObjectiveGitFramework.xcodeproj/project.pbxproj | 2 +- .../contents.xcworkspacedata | 4 ++-- 9 files changed, 20 insertions(+), 10 deletions(-) create mode 100644 Cartfile create mode 100644 Cartfile.lock create mode 160000 Carthage.checkout/Nimble create mode 160000 Carthage.checkout/Quick rename External/Configuration => Carthage.checkout/xcconfigs (100%) delete mode 160000 External/Quick diff --git a/.gitmodules b/.gitmodules index 9248e633f..68290399e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,15 +1,18 @@ [submodule "libgit2"] path = External/libgit2 url = https://github.com/libgit2/libgit2.git -[submodule "Configuration"] - path = External/Configuration - url = https://github.com/jspahrsummers/xcconfigs.git [submodule "openssl"] path = External/openssl url = https://github.com/openssl/openssl.git [submodule "libssh2"] path = External/libssh2 url = git://git.libssh2.org/libssh2.git -[submodule "External/Quick"] - path = External/Quick - url = https://github.com/github/Quick.git +[submodule "Carthage.checkout/Nimble"] + path = Carthage.checkout/Nimble + url = https://github.com/Quick/Nimble.git +[submodule "Carthage.checkout/Quick"] + path = Carthage.checkout/Quick + url = https://github.com/Quick/Quick.git +[submodule "Carthage.checkout/xcconfigs"] + path = Carthage.checkout/xcconfigs + url = https://github.com/jspahrsummers/xcconfigs.git diff --git a/Cartfile b/Cartfile new file mode 100644 index 000000000..f01db9aa2 --- /dev/null +++ b/Cartfile @@ -0,0 +1,3 @@ +github "jspahrsummers/xcconfigs" >= 0.6 +github "Quick/Quick" == 0.2.0 +github "Quick/Nimble" diff --git a/Cartfile.lock b/Cartfile.lock new file mode 100644 index 000000000..35d60e7c9 --- /dev/null +++ b/Cartfile.lock @@ -0,0 +1,3 @@ +github "Quick/Nimble" "v0.1.0" +github "Quick/Quick" "v0.2.0" +github "jspahrsummers/xcconfigs" "carthage-0.6" diff --git a/Carthage.checkout/Nimble b/Carthage.checkout/Nimble new file mode 160000 index 000000000..81a2d8a63 --- /dev/null +++ b/Carthage.checkout/Nimble @@ -0,0 +1 @@ +Subproject commit 81a2d8a63083ae6512d40f7a02d5e075e57be317 diff --git a/Carthage.checkout/Quick b/Carthage.checkout/Quick new file mode 160000 index 000000000..315ae2a4a --- /dev/null +++ b/Carthage.checkout/Quick @@ -0,0 +1 @@ +Subproject commit 315ae2a4a630156d5ac094ae1f107af60edce21d diff --git a/External/Configuration b/Carthage.checkout/xcconfigs similarity index 100% rename from External/Configuration rename to Carthage.checkout/xcconfigs diff --git a/External/Quick b/External/Quick deleted file mode 160000 index ec6d0deaf..000000000 --- a/External/Quick +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ec6d0deaf8b22efa7c6f97d42d1994b57eb871a0 diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj index a726d3e6a..354bd7a79 100644 --- a/ObjectiveGitFramework.xcodeproj/project.pbxproj +++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj @@ -888,7 +888,7 @@ D0D8186C174421EB00995A2E /* README.md */, ); name = Configuration; - path = External/Configuration; + path = Carthage.checkout/xcconfigs; sourceTree = ""; }; D0D81862174421EB00995A2E /* iOS */ = { diff --git a/ObjectiveGitFramework.xcworkspace/contents.xcworkspacedata b/ObjectiveGitFramework.xcworkspace/contents.xcworkspacedata index 0b4bdfa05..644a59f34 100644 --- a/ObjectiveGitFramework.xcworkspace/contents.xcworkspacedata +++ b/ObjectiveGitFramework.xcworkspace/contents.xcworkspacedata @@ -5,9 +5,9 @@ location = "group:ObjectiveGitFramework.xcodeproj"> + location = "group:Carthage.checkout/Quick/Quick.xcodeproj"> + location = "group:Carthage.checkout/Nimble/Nimble.xcodeproj">