Merge pull request #110 from ReactiveCocoa/cartfile

Use Carthage for managing submodules
ReactiveCocoa · Nov 21, 2014 · dc49cd3 · dc49cd3
2 parents c0459b1 + 3a0d7e0
commit dc49cd3
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 14 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,15 @@
-[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/Archimedes"]
+	path = Carthage.checkout/Archimedes
+	url = https://github.com/github/Archimedes.git
+[submodule "Carthage.checkout/ReactiveCocoa"]
+	path = Carthage.checkout/ReactiveCocoa
 	url = https://github.com/ReactiveCocoa/ReactiveCocoa.git
-[submodule "External/Archimedes"]
-	path = External/Archimedes
-	url = https://github.com/github/Archimedes
+[submodule "Carthage.checkout/xcconfigs"]
+	path = Carthage.checkout/xcconfigs
+	url = https://github.com/jspahrsummers/xcconfigs.git
diff --git a/Cartfile b/Cartfile
@@ -0,0 +1,5 @@
+github "ReactiveCocoa/ReactiveCocoa" ~> 2.4.1
+github "github/Archimedes" ~> 1.1.2
+github "jspahrsummers/xcconfigs" >= 0.6
+github "Quick/Quick" == 0.2.0
+github "Quick/Nimble"
diff --git a/Cartfile.lock b/Cartfile.lock
@@ -0,0 +1,5 @@
+github "Quick/Nimble" "v0.1.0"
+github "Quick/Quick" "v0.2.0"
+github "ReactiveCocoa/ReactiveCocoa" "v2.4.1"
+github "github/Archimedes" "1.1.2"
+github "jspahrsummers/xcconfigs" "carthage-0.6"
diff --git a/Carthage.checkout/Archimedes b/Carthage.checkout/Archimedes
diff --git a/Carthage.checkout/Nimble b/Carthage.checkout/Nimble
diff --git a/Carthage.checkout/Quick b/Carthage.checkout/Quick
diff --git a/Carthage.checkout/ReactiveCocoa b/Carthage.checkout/ReactiveCocoa
diff --git a/Carthage.checkout/xcconfigs b/Carthage.checkout/xcconfigs
diff --git a/External/Archimedes b/External/Archimedes
diff --git a/External/ReactiveCocoa b/External/ReactiveCocoa
diff --git a/ReactiveCocoaLayout.xcodeproj/project.pbxproj b/ReactiveCocoaLayout.xcodeproj/project.pbxproj
@@ -128,8 +128,8 @@
 		D06C9E52167D896000276090 /* RACSignalRCLGeometryAdditionsSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RACSignalRCLGeometryAdditionsSpec.m; sourceTree = "<group>"; };
 		D06C9E5A167D8A9A00276090 /* NSViewRCLGeometryAdditionsSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSViewRCLGeometryAdditionsSpec.m; sourceTree = "<group>"; };
 		D06C9E5D167D8BD900276090 /* UIViewRCLGeometryAdditionsSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIViewRCLGeometryAdditionsSpec.m; sourceTree = "<group>"; };
-		D0731B7519FF01B700C01E16 /* Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Framework.xcconfig; path = External/ReactiveCocoa/External/xcconfigs/Base/Targets/Framework.xcconfig; sourceTree = SOURCE_ROOT; };
-		D0731B7619FF01BC00C01E16 /* iOS-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "iOS-Framework.xcconfig"; path = "External/ReactiveCocoa/External/xcconfigs/iOS/iOS-Framework.xcconfig"; sourceTree = SOURCE_ROOT; };
+		D0731B7519FF01B700C01E16 /* Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Framework.xcconfig; path = Carthage.checkout/xcconfigs/Base/Targets/Framework.xcconfig; sourceTree = SOURCE_ROOT; };
+		D0731B7619FF01BC00C01E16 /* iOS-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "iOS-Framework.xcconfig"; path = "Carthage.checkout/xcconfigs/iOS/iOS-Framework.xcconfig"; sourceTree = SOURCE_ROOT; };
 		D0731B7C19FF028F00C01E16 /* ReactiveCocoaLayout.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ReactiveCocoaLayout.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		D0731B8619FF028F00C01E16 /* ReactiveCocoaLayout iOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ReactiveCocoaLayout iOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		D0731BAA19FF04B300C01E16 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.1.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
@@ -265,7 +265,7 @@
 				D094E4C31777661600906BF7 /* README.md */,
 			);
 			name = Configuration;
-			path = External/ReactiveCocoa/external/xcconfigs;
+			path = Carthage.checkout/xcconfigs;
 			sourceTree = "<group>";
 		};
 		D094E4AF1777661600906BF7 /* Base */ = {

diff --git a/ReactiveCocoaLayout.xcworkspace/contents.xcworkspacedata b/ReactiveCocoaLayout.xcworkspace/contents.xcworkspacedata