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

Commit 78567af

Browse files
committed
Use Carthage to manage submodules
1 parent 1219f90 commit 78567af

File tree

10 files changed

+29
-9
lines changed

10 files changed

+29
-9
lines changed

.gitmodules

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1-
[submodule "External/ReactiveCocoa"]
2-
path = External/ReactiveCocoa
1+
[submodule "Carthage.checkout/Nimble"]
2+
path = Carthage.checkout/Nimble
3+
url = https://github.com/Quick/Nimble.git
4+
[submodule "Carthage.checkout/Quick"]
5+
path = Carthage.checkout/Quick
6+
url = https://github.com/Quick/Quick.git
7+
[submodule "Carthage.checkout/xcconfigs"]
8+
path = Carthage.checkout/xcconfigs
9+
url = https://github.com/jspahrsummers/xcconfigs.git
10+
[submodule "Carthage.checkout/ReactiveCocoa"]
11+
path = Carthage.checkout/ReactiveCocoa
312
url = https://github.com/ReactiveCocoa/ReactiveCocoa.git

Cartfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
github "ReactiveCocoa/ReactiveCocoa" ~> 2.4.1
2+
github "jspahrsummers/xcconfigs" >= 0.6
3+
github "Quick/Quick" == 0.2.0
4+
github "Quick/Nimble"

Cartfile.lock

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
github "Quick/Nimble" "v0.1.0"
2+
github "Quick/Quick" "v0.2.0"
3+
github "jspahrsummers/xcconfigs" "carthage-0.6"
4+
github "ReactiveCocoa/ReactiveCocoa" "v2.4.1"

Carthage.checkout/Nimble

Submodule Nimble added at 81a2d8a

Carthage.checkout/Quick

Submodule Quick added at 315ae2a

Carthage.checkout/ReactiveCocoa

Submodule ReactiveCocoa added at 93068e3

Carthage.checkout/xcconfigs

Submodule xcconfigs added at 6c7a02a

External/ReactiveCocoa

Lines changed: 0 additions & 1 deletion
This file was deleted.

ReactiveViewModel.xcodeproj/project.pbxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@
102102
D0948B591781618A00BA8F23 /* RVMViewModelSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RVMViewModelSpec.m; sourceTree = "<group>"; };
103103
D0948B5C178161A800BA8F23 /* RVMTestViewModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RVMTestViewModel.h; sourceTree = "<group>"; };
104104
D0948B5D178161A800BA8F23 /* RVMTestViewModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RVMTestViewModel.m; sourceTree = "<group>"; };
105-
D0C7C39E19FEF8F60069B5C0 /* Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Framework.xcconfig; path = External/ReactiveCocoa/External/xcconfigs/Base/Targets/Framework.xcconfig; sourceTree = SOURCE_ROOT; };
106-
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; };
105+
D0C7C39E19FEF8F60069B5C0 /* Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Framework.xcconfig; path = Carthage.checkout/xcconfigs/Base/Targets/Framework.xcconfig; sourceTree = SOURCE_ROOT; };
106+
D0C7C39F19FEF8FC0069B5C0 /* iOS-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "iOS-Framework.xcconfig"; path = "Carthage.checkout/xcconfigs/iOS/iOS-Framework.xcconfig"; sourceTree = SOURCE_ROOT; };
107107
D0C7C3A719FEFB520069B5C0 /* ReactiveViewModel.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ReactiveViewModel.framework; sourceTree = BUILT_PRODUCTS_DIR; };
108108
D0C7C3B119FEFB520069B5C0 /* ReactiveViewModel iOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ReactiveViewModel iOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
109109
D0C7C3C719FEFC7D0069B5C0 /* ReactiveCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ReactiveCocoa.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -237,7 +237,7 @@
237237
D0948A88178159DA00BA8F23 /* README.md */,
238238
);
239239
name = Configuration;
240-
path = External/ReactiveCocoa/external/xcconfigs;
240+
path = Carthage.checkout/xcconfigs;
241241
sourceTree = "<group>";
242242
};
243243
D0948A74178159DA00BA8F23 /* Base */ = {

ReactiveViewModel.xcworkspace/contents.xcworkspacedata

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)