Merge pull request #152 from github/carthagize

Use Carthage and move to Xcode 6.3+
This commit is contained in:
Josh Abernathy 2015-09-22 15:00:03 -04:00
Родитель 2bfd99e4d3 645e9cee65
Коммит 6981c5bbfb
10 изменённых файлов: 20 добавлений и 10 удалений

13
.gitmodules поставляемый
Просмотреть файл

@ -1,6 +1,9 @@
[submodule "External/xcconfigs"]
path = External/xcconfigs
[submodule "Carthage/Checkouts/Nimble"]
path = Carthage/Checkouts/Nimble
url = https://github.com/Quick/Nimble.git
[submodule "Carthage/Checkouts/Quick"]
path = Carthage/Checkouts/Quick
url = https://github.com/Quick/Quick.git
[submodule "Carthage/Checkouts/xcconfigs"]
url = https://github.com/jspahrsummers/xcconfigs.git
[submodule "External/Quick"]
path = External/Quick
url = https://github.com/github/Quick.git
path = Carthage/Checkouts/xcconfigs

3
Cartfile.private Normal file
Просмотреть файл

@ -0,0 +1,3 @@
github "jspahrsummers/xcconfigs" ~> 0.8
github "Quick/Quick" ~> 0.3
github "Quick/Nimble" ~> 1.0

3
Cartfile.resolved Normal file
Просмотреть файл

@ -0,0 +1,3 @@
github "Quick/Nimble" "v1.0.0"
github "Quick/Quick" "v0.3.1"
github "jspahrsummers/xcconfigs" "0.8.1"

1
Carthage/Checkouts/Nimble поставляемый Submodule

@ -0,0 +1 @@
Subproject commit 61697d0b11bc5160fd620737365dcdd31cd5cf86

1
Carthage/Checkouts/Quick поставляемый Submodule

@ -0,0 +1 @@
Subproject commit 8bf96f708924d728dab5f0cf7543b6f1b896a209

1
Carthage/Checkouts/xcconfigs поставляемый Submodule

@ -0,0 +1 @@
Subproject commit 99624a6af366c015b678a1135e4c558776a59be6

1
External/Quick поставляемый

@ -1 +0,0 @@
Subproject commit 30395c676b9a7e4688160fd2af4c46a382149bef

1
External/xcconfigs поставляемый

@ -1 +0,0 @@
Subproject commit b09b4b63235b760a3a48a8dd19c0415aaaa8f269

Просмотреть файл

@ -282,7 +282,7 @@
D08BB2ED15CB307200CC9868 /* README.md */,
);
name = Configuration;
path = External/xcconfigs;
path = Carthage/Checkouts/xcconfigs;
sourceTree = "<group>";
};
D08BB2DA15CB307200CC9868 /* Base */ = {

4
Rebel.xcworkspace/contents.xcworkspacedata сгенерированный
Просмотреть файл

@ -5,9 +5,9 @@
location = "group:Rebel.xcodeproj">
</FileRef>
<FileRef
location = "group:External/Quick/Quick/Quick.xcodeproj">
location = "group:Carthage/Checkouts/Quick/Quick.xcodeproj">
</FileRef>
<FileRef
location = "group:External/Quick/Externals/Nimble/Nimble.xcodeproj">
location = "group:Carthage/Checkouts/Nimble/Nimble.xcodeproj">
</FileRef>
</Workspace>