kylefang/ReactiveCocoa
1
0
Fork 0
mirror of https://github.com/zhigang1992/ReactiveCocoa.git synced 2026-01-12 17:43:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

update to carthage 0.4 directory structure

Browse Source
This commit is contained in:
Joseph Constantakis
2014-12-25 00:06:16 -05:00
parent e94a432e6c
commit 4875c6c51b
12 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -14,4 +14,4 @@ xcuserdata
profile
*.moved-aside
Carthage.build
Carthage/Build

8
.gitmodules vendored
View File

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

4
Cartfile.lock
View File

@@ -1,4 +0,0 @@
github "Carthage/LlamaKit" "carthage-0.1.1"
github "Quick/Nimble" "v0.1.0"
github "Quick/Quick" "v0.2.0"
github "jspahrsummers/xcconfigs" "carthage-0.6"

4
Cartfile.resolved Normal file
View File

@@ -0,0 +1,4 @@
github "Carthage/LlamaKit" "carthage-0.1.1"
github "Quick/Nimble" "v0.2.0"
github "Quick/Quick" "v0.2.0"
github "jspahrsummers/xcconfigs" "0.7"

1
Carthage.checkout/Nimble

Submodule Carthage.checkout/Nimble deleted from 81a2d8a630

1
Carthage.checkout/xcconfigs

Submodule Carthage.checkout/xcconfigs deleted from 6c7a02a439

0
Carthage.checkout/LlamaKit → Carthage/Checkouts/LlamaKit vendored
View File

1
Carthage/Checkouts/Nimble vendored Submodule

Submodule Carthage/Checkouts/Nimble added at 6f787eeb75

0
Carthage.checkout/Quick → Carthage/Checkouts/Quick vendored
View File

1
Carthage/Checkouts/xcconfigs vendored Submodule

Submodule Carthage/Checkouts/xcconfigs added at 6c64238566

2
ReactiveCocoa.xcodeproj/project.pbxproj
View File

@@ -1204,7 +1204,7 @@
D047263C19E49FE8006002AA /* README.md */,
);
name = Configuration;
path = Carthage.checkout/xcconfigs;
path = Carthage/Checkouts/xcconfigs;
sourceTree = "<group>";
};
D047262619E49FE8006002AA /* Base */ = {

6
ReactiveCocoa.xcworkspace/contents.xcworkspacedata generated
View File

@@ -5,12 +5,12 @@
location = "group:ReactiveCocoa.xcodeproj">
</FileRef>
<FileRef
location = "group:Carthage.checkout/Quick/Quick.xcodeproj">
location = "group:Carthage/Checkouts/Quick/Quick.xcodeproj">
</FileRef>
<FileRef
location = "group:Carthage.checkout/Nimble/Nimble.xcodeproj">
location = "group:Carthage/Checkouts/Nimble/Nimble.xcodeproj">
</FileRef>
<FileRef
location = "group:Carthage.checkout/LlamaKit/LlamaKit.xcodeproj">
location = "group:Carthage/Checkouts/LlamaKit/LlamaKit.xcodeproj">
</FileRef>
</Workspace>