Move LlamaKit to Cartfile as well

il3n · Nov 20, 2014 · 4d8f1ba · 4d8f1ba
1 parent df6b588
commit 4d8f1ba
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -7,6 +7,6 @@
 [submodule "Carthage.checkout/xcconfigs"]
 	path = Carthage.checkout/xcconfigs
 	url = https://github.com/jspahrsummers/xcconfigs.git
-[submodule "External/LlamaKit"]
-	path = External/LlamaKit
-	url = https://github.com/ReactiveCocoa/LlamaKit.git
+[submodule "Carthage.checkout/LlamaKit"]
+	path = Carthage.checkout/LlamaKit
+	url = https://github.com/LlamaKit/LlamaKit.git
diff --git a/Cartfile b/Cartfile
@@ -1,3 +1,4 @@
 github "jspahrsummers/xcconfigs" >= 0.6
 github "Quick/Quick" == 0.2.0
 github "Quick/Nimble"
+github "LlamaKit/LlamaKit" == 0.1
diff --git a/Cartfile.lock b/Cartfile.lock
@@ -1,3 +1,4 @@
+github "LlamaKit/LlamaKit" "v0.1.0"
 github "Quick/Nimble" "v0.1.0"
 github "Quick/Quick" "v0.2.0"
 github "jspahrsummers/xcconfigs" "0.6"
diff --git a/Carthage.checkout/LlamaKit b/Carthage.checkout/LlamaKit
diff --git a/External/LlamaKit b/External/LlamaKit
diff --git a/ReactiveCocoa.xcworkspace/contents.xcworkspacedata b/ReactiveCocoa.xcworkspace/contents.xcworkspacedata