From 512b2220f11ab2af66bb2e8081f51a480339952e Mon Sep 17 00:00:00 2001 From: Justin Spahr-Summers Date: Mon, 29 Dec 2014 16:04:12 -0800 Subject: [PATCH 1/3] Update to Carthage 0.5 directory structure --- .gitmodules | 12 ++++++++---- Cartfile.lock => Cartfile.resolved | 0 {Carthage.checkout => Carthage/Checkouts}/Nimble | 0 {Carthage.checkout => Carthage/Checkouts}/Quick | 0 .../Checkouts}/ReactiveCocoa | 0 {Carthage.checkout => Carthage/Checkouts}/xcconfigs | 0 ReactiveViewModel.xcodeproj/project.pbxproj | 6 +++--- .../contents.xcworkspacedata | 6 +++--- 8 files changed, 14 insertions(+), 10 deletions(-) rename Cartfile.lock => Cartfile.resolved (100%) rename {Carthage.checkout => Carthage/Checkouts}/Nimble (100%) rename {Carthage.checkout => Carthage/Checkouts}/Quick (100%) rename {Carthage.checkout => Carthage/Checkouts}/ReactiveCocoa (100%) rename {Carthage.checkout => Carthage/Checkouts}/xcconfigs (100%) diff --git a/.gitmodules b/.gitmodules index a0a73cd..e394812 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,16 @@ [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/ReactiveCocoa"] - path = Carthage.checkout/ReactiveCocoa + path = Carthage/Checkouts/ReactiveCocoa url = https://github.com/ReactiveCocoa/ReactiveCocoa.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.lock b/Cartfile.resolved similarity index 100% rename from Cartfile.lock rename to Cartfile.resolved diff --git a/Carthage.checkout/Nimble b/Carthage/Checkouts/Nimble similarity index 100% rename from Carthage.checkout/Nimble rename to Carthage/Checkouts/Nimble 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.checkout/ReactiveCocoa b/Carthage/Checkouts/ReactiveCocoa similarity index 100% rename from Carthage.checkout/ReactiveCocoa rename to Carthage/Checkouts/ReactiveCocoa diff --git a/Carthage.checkout/xcconfigs b/Carthage/Checkouts/xcconfigs similarity index 100% rename from Carthage.checkout/xcconfigs rename to Carthage/Checkouts/xcconfigs diff --git a/ReactiveViewModel.xcodeproj/project.pbxproj b/ReactiveViewModel.xcodeproj/project.pbxproj index 1aaea1b..ed5e4ca 100644 --- a/ReactiveViewModel.xcodeproj/project.pbxproj +++ b/ReactiveViewModel.xcodeproj/project.pbxproj @@ -102,8 +102,8 @@ D0948B591781618A00BA8F23 /* RVMViewModelSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RVMViewModelSpec.m; sourceTree = ""; }; D0948B5C178161A800BA8F23 /* RVMTestViewModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RVMTestViewModel.h; sourceTree = ""; }; D0948B5D178161A800BA8F23 /* RVMTestViewModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RVMTestViewModel.m; sourceTree = ""; }; - D0C7C39E19FEF8F60069B5C0 /* Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Framework.xcconfig; path = Carthage.checkout/xcconfigs/Base/Targets/Framework.xcconfig; sourceTree = SOURCE_ROOT; }; - D0C7C39F19FEF8FC0069B5C0 /* iOS-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "iOS-Framework.xcconfig"; path = "Carthage.checkout/xcconfigs/iOS/iOS-Framework.xcconfig"; sourceTree = SOURCE_ROOT; }; + D0C7C39E19FEF8F60069B5C0 /* Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Framework.xcconfig; path = Carthage/Checkouts/xcconfigs/Base/Targets/Framework.xcconfig; sourceTree = SOURCE_ROOT; }; + D0C7C39F19FEF8FC0069B5C0 /* iOS-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "iOS-Framework.xcconfig"; path = "Carthage/Checkouts/xcconfigs/iOS/iOS-Framework.xcconfig"; sourceTree = SOURCE_ROOT; }; D0C7C3A719FEFB520069B5C0 /* ReactiveViewModel.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ReactiveViewModel.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C7C3B119FEFB520069B5C0 /* ReactiveViewModel iOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ReactiveViewModel iOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; D0C7C3C719FEFC7D0069B5C0 /* ReactiveCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ReactiveCocoa.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -237,7 +237,7 @@ D0948A88178159DA00BA8F23 /* README.md */, ); name = Configuration; - path = Carthage.checkout/xcconfigs; + path = Carthage/Checkouts/xcconfigs; sourceTree = ""; }; D0948A74178159DA00BA8F23 /* Base */ = { diff --git a/ReactiveViewModel.xcworkspace/contents.xcworkspacedata b/ReactiveViewModel.xcworkspace/contents.xcworkspacedata index f04181e..1078b6a 100644 --- a/ReactiveViewModel.xcworkspace/contents.xcworkspacedata +++ b/ReactiveViewModel.xcworkspace/contents.xcworkspacedata @@ -5,12 +5,12 @@ location = "group:ReactiveViewModel.xcodeproj"> + location = "group:Carthage/Checkouts/ReactiveCocoa/ReactiveCocoa.xcodeproj"> + location = "group:Carthage/Checkouts/Quick/Quick.xcodeproj"> + location = "group:Carthage/Checkouts/Nimble/Nimble.xcodeproj"> From d8572d256cd8a7dd662202c18ca5b9e736b4de64 Mon Sep 17 00:00:00 2001 From: Justin Spahr-Summers Date: Mon, 29 Dec 2014 16:04:53 -0800 Subject: [PATCH 2/3] Use a Cartfile.private, loosen version constraints --- Cartfile | 5 +---- Cartfile.private | 3 +++ Cartfile.resolved | 4 ++-- Carthage/Checkouts/Quick | 2 +- Carthage/Checkouts/ReactiveCocoa | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 Cartfile.private diff --git a/Cartfile b/Cartfile index c4c142f..80af9f1 100644 --- a/Cartfile +++ b/Cartfile @@ -1,4 +1 @@ -github "ReactiveCocoa/ReactiveCocoa" ~> 2.4.1 -github "jspahrsummers/xcconfigs" >= 0.6 -github "Quick/Quick" == 0.2.0 -github "Quick/Nimble" +github "ReactiveCocoa/ReactiveCocoa" "carthage-0.5" diff --git a/Cartfile.private b/Cartfile.private new file mode 100644 index 0000000..2aeb82b --- /dev/null +++ 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 index c061b25..64124bc 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,4 +1,4 @@ github "Quick/Nimble" "v0.2.0" -github "Quick/Quick" "v0.2.0" +github "Quick/Quick" "v0.2.2" +github "ReactiveCocoa/ReactiveCocoa" "b0f789ad14233e93b2f35a624d91f07326a2f719" github "jspahrsummers/xcconfigs" "0.7" -github "ReactiveCocoa/ReactiveCocoa" "v2.4.2" diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick index 315ae2a..b0e9828 160000 --- a/Carthage/Checkouts/Quick +++ b/Carthage/Checkouts/Quick @@ -1 +1 @@ -Subproject commit 315ae2a4a630156d5ac094ae1f107af60edce21d +Subproject commit b0e98286db7e9d1f1e73cd4e69eac2aae2a1e3f8 diff --git a/Carthage/Checkouts/ReactiveCocoa b/Carthage/Checkouts/ReactiveCocoa index 57181b2..b0f789a 160000 --- a/Carthage/Checkouts/ReactiveCocoa +++ b/Carthage/Checkouts/ReactiveCocoa @@ -1 +1 @@ -Subproject commit 57181b2bd4eea9dfc98a239cd475672d8e27525a +Subproject commit b0f789ad14233e93b2f35a624d91f07326a2f719 From dc1917afe7de5121f8f48074e4da5f9379f47d9c Mon Sep 17 00:00:00 2001 From: Justin Spahr-Summers Date: Mon, 29 Dec 2014 21:35:07 -0800 Subject: [PATCH 3/3] Bump Cartfile --- Cartfile | 2 +- Cartfile.resolved | 2 +- Carthage/Checkouts/ReactiveCocoa | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cartfile b/Cartfile index 80af9f1..8dfebe2 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "ReactiveCocoa/ReactiveCocoa" "carthage-0.5" +github "ReactiveCocoa/ReactiveCocoa" ~> 2.4.3 diff --git a/Cartfile.resolved b/Cartfile.resolved index 64124bc..faa9fb1 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,4 +1,4 @@ github "Quick/Nimble" "v0.2.0" github "Quick/Quick" "v0.2.2" -github "ReactiveCocoa/ReactiveCocoa" "b0f789ad14233e93b2f35a624d91f07326a2f719" +github "ReactiveCocoa/ReactiveCocoa" "v2.4.3" github "jspahrsummers/xcconfigs" "0.7" diff --git a/Carthage/Checkouts/ReactiveCocoa b/Carthage/Checkouts/ReactiveCocoa index b0f789a..a6bc3a9 160000 --- a/Carthage/Checkouts/ReactiveCocoa +++ b/Carthage/Checkouts/ReactiveCocoa @@ -1 +1 @@ -Subproject commit b0f789ad14233e93b2f35a624d91f07326a2f719 +Subproject commit a6bc3a918de10c0310f10185fd5eca72d285742c