From 4875c6c51b80cc93029debb3b96939dc107f71eb Mon Sep 17 00:00:00 2001 From: Joseph Constantakis Date: Thu, 25 Dec 2014 00:06:16 -0500 Subject: [PATCH] update to carthage 0.4 directory structure --- .gitignore | 2 +- .gitmodules | 8 ++++---- Cartfile.lock | 4 ---- Cartfile.resolved | 4 ++++ Carthage.checkout/Nimble | 1 - Carthage.checkout/xcconfigs | 1 - {Carthage.checkout => Carthage/Checkouts}/LlamaKit | 0 Carthage/Checkouts/Nimble | 1 + {Carthage.checkout => Carthage/Checkouts}/Quick | 0 Carthage/Checkouts/xcconfigs | 1 + ReactiveCocoa.xcodeproj/project.pbxproj | 2 +- ReactiveCocoa.xcworkspace/contents.xcworkspacedata | 6 +++--- 12 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 Cartfile.lock create mode 100644 Cartfile.resolved delete mode 160000 Carthage.checkout/Nimble delete mode 160000 Carthage.checkout/xcconfigs rename {Carthage.checkout => Carthage/Checkouts}/LlamaKit (100%) create mode 160000 Carthage/Checkouts/Nimble rename {Carthage.checkout => Carthage/Checkouts}/Quick (100%) create mode 160000 Carthage/Checkouts/xcconfigs diff --git a/.gitignore b/.gitignore index 5b5635c9..42d7709a 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,4 @@ xcuserdata profile *.moved-aside -Carthage.build +Carthage/Build diff --git a/.gitmodules b/.gitmodules index 27caac3b..0d98d975 100644 --- 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 deleted file mode 100644 index bd500ae1..00000000 --- a/Cartfile.lock +++ /dev/null @@ -1,4 +0,0 @@ -github "Carthage/LlamaKit" "carthage-0.1.1" -github "Quick/Nimble" "v0.1.0" -github "Quick/Quick" "v0.2.0" -github "jspahrsummers/xcconfigs" "carthage-0.6" diff --git a/Cartfile.resolved b/Cartfile.resolved new file mode 100644 index 00000000..82c826b7 --- /dev/null +++ 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 deleted file mode 160000 index 81a2d8a6..00000000 --- a/Carthage.checkout/Nimble +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 81a2d8a63083ae6512d40f7a02d5e075e57be317 diff --git a/Carthage.checkout/xcconfigs b/Carthage.checkout/xcconfigs deleted file mode 160000 index 6c7a02a4..00000000 --- a/Carthage.checkout/xcconfigs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6c7a02a43954c74d2be1d2fcf7bfd65a263e7c52 diff --git a/Carthage.checkout/LlamaKit b/Carthage/Checkouts/LlamaKit similarity index 100% rename from Carthage.checkout/LlamaKit rename to Carthage/Checkouts/LlamaKit diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble new file mode 160000 index 00000000..6f787eeb --- /dev/null +++ b/Carthage/Checkouts/Nimble @@ -0,0 +1 @@ +Subproject commit 6f787eeb75b2fa71464981f28b3dc8d7bd532e69 diff --git a/Carthage.checkout/Quick b/Carthage/Checkouts/Quick similarity index 100% rename from Carthage.checkout/Quick rename to Carthage/Checkouts/Quick diff --git a/Carthage/Checkouts/xcconfigs b/Carthage/Checkouts/xcconfigs new file mode 160000 index 00000000..6c642385 --- /dev/null +++ b/Carthage/Checkouts/xcconfigs @@ -0,0 +1 @@ +Subproject commit 6c64238566ef1126f1b7994aa9e6719229c50451 diff --git a/ReactiveCocoa.xcodeproj/project.pbxproj b/ReactiveCocoa.xcodeproj/project.pbxproj index ec1c3ce4..39cddb3b 100644 --- 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 = ""; }; D047262619E49FE8006002AA /* Base */ = { diff --git a/ReactiveCocoa.xcworkspace/contents.xcworkspacedata b/ReactiveCocoa.xcworkspace/contents.xcworkspacedata index 42f1f902..5bd6b8cd 100644 --- a/ReactiveCocoa.xcworkspace/contents.xcworkspacedata +++ b/ReactiveCocoa.xcworkspace/contents.xcworkspacedata @@ -5,12 +5,12 @@ location = "group:ReactiveCocoa.xcodeproj"> + location = "group:Carthage/Checkouts/Quick/Quick.xcodeproj"> + location = "group:Carthage/Checkouts/Nimble/Nimble.xcodeproj"> + location = "group:Carthage/Checkouts/LlamaKit/LlamaKit.xcodeproj">