Skip to content
This repository was archived by the owner on Dec 5, 2019. It is now read-only.

Commit f813ffb

Browse files
committed
Merge pull request #35 from ReactiveCocoa/carthage-0.5
Migrate to Carthage 0.5
2 parents c5d24ab + dc1917a commit f813ffb

File tree

13 files changed

+24
-20
lines changed

13 files changed

+24
-20
lines changed

.gitmodules

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

Cartfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
github "ReactiveCocoa/ReactiveCocoa" ~> 2.4.1
2-
github "jspahrsummers/xcconfigs" >= 0.6
3-
github "Quick/Quick" == 0.2.0
4-
github "Quick/Nimble"
1+
github "ReactiveCocoa/ReactiveCocoa" ~> 2.4.3

Cartfile.lock

Lines changed: 0 additions & 4 deletions
This file was deleted.

Cartfile.private

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
github "jspahrsummers/xcconfigs" >= 0.7
2+
github "Quick/Quick" ~> 0.2
3+
github "Quick/Nimble" ~> 0.2

Cartfile.resolved

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
github "Quick/Nimble" "v0.2.0"
2+
github "Quick/Quick" "v0.2.2"
3+
github "ReactiveCocoa/ReactiveCocoa" "v2.4.3"
4+
github "jspahrsummers/xcconfigs" "0.7"

Carthage.checkout/Quick

Lines changed: 0 additions & 1 deletion
This file was deleted.

Carthage.checkout/ReactiveCocoa

Lines changed: 0 additions & 1 deletion
This file was deleted.

Carthage/Checkouts/Quick

Submodule Quick added at b0e9828

Carthage/Checkouts/ReactiveCocoa

Submodule ReactiveCocoa added at a6bc3a9

0 commit comments

Comments
 (0)