Skip to content

Commit 5fec64e

Browse files
author
Rob Rix
committed
Merge pull request #7 from Carthage/carthage-0.4
Update repository to Carthage 0.4
2 parents 33ac186 + 17739d6 commit 5fec64e

File tree

9 files changed

+11
-11
lines changed

9 files changed

+11
-11
lines changed

.gitmodules

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
[submodule "Carthage.checkout/LlamaKit"]
2-
path = Carthage.checkout/LlamaKit
2+
path = Carthage/Checkouts/LlamaKit
33
url = https://github.com/Carthage/LlamaKit.git
44
[submodule "Carthage.checkout/Nimble"]
5-
path = Carthage.checkout/Nimble
5+
path = Carthage/Checkouts/Nimble
66
url = https://github.com/Quick/Nimble.git
77
[submodule "Carthage.checkout/Quick"]
8-
path = Carthage.checkout/Quick
8+
path = Carthage/Checkouts/Quick
99
url = https://github.com/Quick/Quick.git
1010
[submodule "Carthage.checkout/xcconfigs"]
11-
path = Carthage.checkout/xcconfigs
11+
path = Carthage/Checkouts/xcconfigs
1212
url = https://github.com/jspahrsummers/xcconfigs.git
1313
[submodule "Carthage.checkout/ReactiveCocoa"]
14-
path = Carthage.checkout/ReactiveCocoa
14+
path = Carthage/Checkouts/ReactiveCocoa
1515
url = https://github.com/ReactiveCocoa/ReactiveCocoa.git

Cartfile.lock renamed to Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ github "Carthage/LlamaKit" "carthage-0.1.1"
22
github "Quick/Nimble" "v0.2.0"
33
github "Quick/Quick" "v0.2.0"
44
github "jspahrsummers/xcconfigs" "0.7"
5-
github "ReactiveCocoa/ReactiveCocoa" "7121cb395f610f2d017ee087df874209d8804242"
5+
github "ReactiveCocoa/ReactiveCocoa" "e94a432e6c47e03f47cb263225ceccffe9b7bea6"

ReactiveTask.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
D0BFEA8B1A2D1E7C00E23194 /* README.md */,
157157
);
158158
name = Configuration;
159-
path = Carthage.checkout/xcconfigs;
159+
path = Carthage/Checkouts/xcconfigs;
160160
sourceTree = "<group>";
161161
};
162162
D0BFEA751A2D1E7C00E23194 /* Base */ = {

ReactiveTask.xcworkspace/contents.xcworkspacedata

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

0 commit comments

Comments
 (0)