Skip to content
This repository has been archived by the owner on Dec 5, 2019. It is now read-only.

Commit

Permalink
Merge pull request #33 from ReactiveCocoa/cartfile
Browse files Browse the repository at this point in the history
Use Carthage to manage submodules
  • Loading branch information
jspahrsummers committed Nov 21, 2014
2 parents 1219f90 + 78567af commit 1ee846b
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 9 deletions.
13 changes: 11 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
[submodule "External/ReactiveCocoa"]
path = External/ReactiveCocoa
[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
[submodule "Carthage.checkout/ReactiveCocoa"]
path = Carthage.checkout/ReactiveCocoa
url = https://github.com/ReactiveCocoa/ReactiveCocoa.git
4 changes: 4 additions & 0 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
github "ReactiveCocoa/ReactiveCocoa" ~> 2.4.1
github "jspahrsummers/xcconfigs" >= 0.6
github "Quick/Quick" == 0.2.0
github "Quick/Nimble"
4 changes: 4 additions & 0 deletions Cartfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
github "Quick/Nimble" "v0.1.0"
github "Quick/Quick" "v0.2.0"
github "jspahrsummers/xcconfigs" "carthage-0.6"
github "ReactiveCocoa/ReactiveCocoa" "v2.4.1"
1 change: 1 addition & 0 deletions Carthage.checkout/Nimble
Submodule Nimble added at 81a2d8
1 change: 1 addition & 0 deletions Carthage.checkout/Quick
Submodule Quick added at 315ae2
1 change: 1 addition & 0 deletions Carthage.checkout/ReactiveCocoa
Submodule ReactiveCocoa added at 93068e
1 change: 1 addition & 0 deletions Carthage.checkout/xcconfigs
Submodule xcconfigs added at 6c7a02
1 change: 0 additions & 1 deletion External/ReactiveCocoa
Submodule ReactiveCocoa deleted from 8d1177
6 changes: 3 additions & 3 deletions ReactiveViewModel.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@
D0948B591781618A00BA8F23 /* RVMViewModelSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RVMViewModelSpec.m; sourceTree = "<group>"; };
D0948B5C178161A800BA8F23 /* RVMTestViewModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RVMTestViewModel.h; sourceTree = "<group>"; };
D0948B5D178161A800BA8F23 /* RVMTestViewModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RVMTestViewModel.m; sourceTree = "<group>"; };
D0C7C39E19FEF8F60069B5C0 /* Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Framework.xcconfig; path = External/ReactiveCocoa/External/xcconfigs/Base/Targets/Framework.xcconfig; sourceTree = SOURCE_ROOT; };
D0C7C39F19FEF8FC0069B5C0 /* iOS-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "iOS-Framework.xcconfig"; path = "External/ReactiveCocoa/External/xcconfigs/iOS/iOS-Framework.xcconfig"; sourceTree = SOURCE_ROOT; };
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; };
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; };
Expand Down Expand Up @@ -237,7 +237,7 @@
D0948A88178159DA00BA8F23 /* README.md */,
);
name = Configuration;
path = External/ReactiveCocoa/external/xcconfigs;
path = Carthage.checkout/xcconfigs;
sourceTree = "<group>";
};
D0948A74178159DA00BA8F23 /* Base */ = {
Expand Down
6 changes: 3 additions & 3 deletions ReactiveViewModel.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 1ee846b

Please sign in to comment.