Skip to content

Commit 9288c2a

Browse files
inamiyinamiy
committed
Merge pull request #19 from ReactKit/carthage-0.5
Add Carthage 0.5 support.
2 parents 533a38a + d939521 commit 9288c2a

File tree

10 files changed

+56
-47
lines changed

10 files changed

+56
-47
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ DerivedData
1616
*.ipa
1717
*.xcuserstate
1818

19-
Carthage.build
19+
Carthage/Build

‎.gitmodules

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
[submodule "Vendor/Alamofire"]
2-
path = Vendor/Alamofire
1+
[submodule "Carthage/Checkouts/SwiftState"]
2+
path = Carthage/Checkouts/SwiftState
3+
url = https://github.com/ReactKit/SwiftState.git
4+
[submodule "Carthage/Checkouts/Alamofire"]
5+
path = Carthage/Checkouts/Alamofire
36
url = https://github.com/Alamofire/Alamofire.git
4-
[submodule "Vendor/Async"]
5-
path = Vendor/Async
7+
[submodule "Carthage/Checkouts/Async"]
8+
path = Carthage/Checkouts/Async
69
url = https://github.com/duemunk/Async.git
7-
[submodule "Carthage.checkout/SwiftState"]
8-
path = Carthage.checkout/SwiftState
9-
url = https://github.com/ReactKit/SwiftState.git

‎Cartfile.lock

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

‎Cartfile.private

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
github "Alamofire/Alamofire" "2dd2f6f6186b98f27b75479b15c109ebd4dd8b52"
2+
github "duemunk/Async" "32cec7ee89d6f1a39b10f2f69d91640ba3416eca"

‎Cartfile.resolved

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
github "Alamofire/Alamofire" "2dd2f6f6186b98f27b75479b15c109ebd4dd8b52"
2+
github "duemunk/Async" "32cec7ee89d6f1a39b10f2f69d91640ba3416eca"
3+
github "ReactKit/SwiftState" "1.1.1"

‎Vendor/Alamofire renamed to ‎Carthage/Checkouts/Alamofire

‎Vendor/Async renamed to ‎Carthage/Checkouts/Async

Submodule Async updated from 0000000 to 32cec7e

‎Carthage.checkout/SwiftState renamed to ‎Carthage/Checkouts/SwiftState

‎SwiftTask.xcodeproj/project.pbxproj

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,9 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
1F0E284019C1DEA0005EF467 /* Async.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F0E282319C1DEA0005EF467 /* Async.swift */; };
11-
1F1C2D061A3D265400944BCA /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F1C2D051A3D265400944BCA /* SwiftState.framework */; };
12-
1F1C2D071A3D268E00944BCA /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F1C2D051A3D265400944BCA /* SwiftState.framework */; };
1310
1F20250219ADA8FD00DE0495 /* BasicTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F20250119ADA8FD00DE0495 /* BasicTests.swift */; };
1411
1F2C0C1C1A32A15300CFBB47 /* AlamofireTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F5FA35619A374E600975FB9 /* AlamofireTests.swift */; };
1512
1F2C0C1D1A32A15300CFBB47 /* AlamofireTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F5FA35619A374E600975FB9 /* AlamofireTests.swift */; };
16-
1F2C0C1E1A32A19300CFBB47 /* Alamofire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FA4631719A8D70A00DD8729 /* Alamofire.swift */; };
17-
1F2C0C1F1A32A19300CFBB47 /* Alamofire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FA4631719A8D70A00DD8729 /* Alamofire.swift */; };
1813
1F46DEDA199EDF1000F97868 /* SwiftTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F46DED9199EDF1000F97868 /* SwiftTask.h */; settings = {ATTRIBUTES = (Public, ); }; };
1914
1F46DEFB199EDF8100F97868 /* SwiftTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEFA199EDF8100F97868 /* SwiftTask.swift */; };
2015
1F46DEFD199EE2C200F97868 /* _TestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEFC199EE2C200F97868 /* _TestCase.swift */; };
@@ -25,7 +20,12 @@
2520
4822F0DD19D00B2300F5F572 /* BasicTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F20250119ADA8FD00DE0495 /* BasicTests.swift */; };
2621
4822F0DE19D00B2300F5F572 /* SwiftTaskTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEE3199EDF1000F97868 /* SwiftTaskTests.swift */; };
2722
4822F0E019D00B2300F5F572 /* RetainCycleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48511C5A19C17563002FE03C /* RetainCycleTests.swift */; };
28-
4822F0E319D00B3100F5F572 /* Async.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F0E282319C1DEA0005EF467 /* Async.swift */; };
23+
484552321A4CF37F007770CA /* Alamofire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 484551CE1A4CF37F007770CA /* Alamofire.swift */; };
24+
484552331A4CF37F007770CA /* Alamofire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 484551CE1A4CF37F007770CA /* Alamofire.swift */; };
25+
4845524A1A4CF37F007770CA /* Async.swift in Sources */ = {isa = PBXBuildFile; fileRef = 484551DC1A4CF37F007770CA /* Async.swift */; };
26+
4845524B1A4CF37F007770CA /* Async.swift in Sources */ = {isa = PBXBuildFile; fileRef = 484551DC1A4CF37F007770CA /* Async.swift */; };
27+
484552CA1A4CF48A007770CA /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 484552C91A4CF48A007770CA /* SwiftState.framework */; };
28+
484552CB1A4CF48D007770CA /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 484552C91A4CF48A007770CA /* SwiftState.framework */; };
2929
48511C5B19C17563002FE03C /* RetainCycleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48511C5A19C17563002FE03C /* RetainCycleTests.swift */; };
3030
485C31F11A1D619A00040DA3 /* TypeInferenceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 485C31F01A1D619A00040DA3 /* TypeInferenceTests.swift */; };
3131
485C31F21A1D619A00040DA3 /* TypeInferenceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 485C31F01A1D619A00040DA3 /* TypeInferenceTests.swift */; };
@@ -36,8 +36,6 @@
3636
/* End PBXBuildFile section */
3737

3838
/* Begin PBXFileReference section */
39-
1F0E282319C1DEA0005EF467 /* Async.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Async.swift; sourceTree = "<group>"; };
40-
1F1C2D051A3D265400944BCA /* SwiftState.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftState.framework; path = Carthage.checkout/SwiftState/build/Debug/SwiftState.framework; sourceTree = "<group>"; };
4139
1F20250119ADA8FD00DE0495 /* BasicTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BasicTests.swift; sourceTree = "<group>"; };
4240
1F46DED4199EDF1000F97868 /* SwiftTask.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftTask.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4341
1F46DED8199EDF1000F97868 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -48,9 +46,11 @@
4846
1F46DEFA199EDF8100F97868 /* SwiftTask.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftTask.swift; sourceTree = "<group>"; };
4947
1F46DEFC199EE2C200F97868 /* _TestCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = _TestCase.swift; sourceTree = "<group>"; };
5048
1F5FA35619A374E600975FB9 /* AlamofireTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlamofireTests.swift; sourceTree = "<group>"; };
51-
1FA4631719A8D70A00DD8729 /* Alamofire.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Alamofire.swift; sourceTree = "<group>"; };
5249
1FF52EB31A4C395A00B4BA28 /* _InterruptableTask.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = _InterruptableTask.swift; sourceTree = "<group>"; };
5350
4822F0D019D00ABF00F5F572 /* SwiftTask-iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SwiftTask-iOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
51+
484551CE1A4CF37F007770CA /* Alamofire.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Alamofire.swift; sourceTree = "<group>"; };
52+
484551DC1A4CF37F007770CA /* Async.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Async.swift; sourceTree = "<group>"; };
53+
484552C91A4CF48A007770CA /* SwiftState.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftState.framework; path = Carthage/Checkouts/SwiftState/build/Debug/SwiftState.framework; sourceTree = "<group>"; };
5454
48511C5A19C17563002FE03C /* RetainCycleTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RetainCycleTests.swift; sourceTree = "<group>"; };
5555
485C31F01A1D619A00040DA3 /* TypeInferenceTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TypeInferenceTests.swift; sourceTree = "<group>"; };
5656
48CD5A0C19AEE3570042B9F1 /* SwiftTask.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftTask.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -61,7 +61,7 @@
6161
isa = PBXFrameworksBuildPhase;
6262
buildActionMask = 2147483647;
6363
files = (
64-
1F1C2D061A3D265400944BCA /* SwiftState.framework in Frameworks */,
64+
484552CA1A4CF48A007770CA /* SwiftState.framework in Frameworks */,
6565
);
6666
runOnlyForDeploymentPostprocessing = 0;
6767
};
@@ -85,26 +85,18 @@
8585
isa = PBXFrameworksBuildPhase;
8686
buildActionMask = 2147483647;
8787
files = (
88-
1F1C2D071A3D268E00944BCA /* SwiftState.framework in Frameworks */,
88+
484552CB1A4CF48D007770CA /* SwiftState.framework in Frameworks */,
8989
);
9090
runOnlyForDeploymentPostprocessing = 0;
9191
};
9292
/* End PBXFrameworksBuildPhase section */
9393

9494
/* Begin PBXGroup section */
95-
1F0E282119C1DEA0005EF467 /* Async */ = {
96-
isa = PBXGroup;
97-
children = (
98-
1F0E282319C1DEA0005EF467 /* Async.swift */,
99-
);
100-
path = Async;
101-
sourceTree = "<group>";
102-
};
10395
1F46DECA199EDF1000F97868 = {
10496
isa = PBXGroup;
10597
children = (
106-
1F1C2D051A3D265400944BCA /* SwiftState.framework */,
107-
1FA4631219A8D70A00DD8729 /* Vendor */,
98+
484552C91A4CF48A007770CA /* SwiftState.framework */,
99+
484551B31A4CF37F007770CA /* Checkouts */,
108100
1F46DED6199EDF1000F97868 /* SwiftTask */,
109101
1F46DEE0199EDF1000F97868 /* SwiftTaskTests */,
110102
1F46DED5199EDF1000F97868 /* Products */,
@@ -163,31 +155,40 @@
163155
name = "Supporting Files";
164156
sourceTree = "<group>";
165157
};
166-
1FA4631219A8D70A00DD8729 /* Vendor */ = {
158+
484551B31A4CF37F007770CA /* Checkouts */ = {
167159
isa = PBXGroup;
168160
children = (
169-
1FA4631319A8D70A00DD8729 /* Alamofire */,
170-
1F0E282119C1DEA0005EF467 /* Async */,
161+
484551B41A4CF37F007770CA /* Alamofire */,
162+
484551DA1A4CF37F007770CA /* Async */,
171163
);
172-
path = Vendor;
164+
name = Checkouts;
165+
path = Carthage/Checkouts;
173166
sourceTree = "<group>";
174167
};
175-
1FA4631319A8D70A00DD8729 /* Alamofire */ = {
168+
484551B41A4CF37F007770CA /* Alamofire */ = {
176169
isa = PBXGroup;
177170
children = (
178-
1FA4631619A8D70A00DD8729 /* Source */,
171+
484551CC1A4CF37F007770CA /* Source */,
179172
);
180173
path = Alamofire;
181174
sourceTree = "<group>";
182175
};
183-
1FA4631619A8D70A00DD8729 /* Source */ = {
176+
484551CC1A4CF37F007770CA /* Source */ = {
184177
isa = PBXGroup;
185178
children = (
186-
1FA4631719A8D70A00DD8729 /* Alamofire.swift */,
179+
484551CE1A4CF37F007770CA /* Alamofire.swift */,
187180
);
188181
path = Source;
189182
sourceTree = "<group>";
190183
};
184+
484551DA1A4CF37F007770CA /* Async */ = {
185+
isa = PBXGroup;
186+
children = (
187+
484551DC1A4CF37F007770CA /* Async.swift */,
188+
);
189+
path = Async;
190+
sourceTree = "<group>";
191+
};
191192
/* End PBXGroup section */
192193

193194
/* Begin PBXHeadersBuildPhase section */
@@ -368,10 +369,10 @@
368369
isa = PBXSourcesBuildPhase;
369370
buildActionMask = 2147483647;
370371
files = (
372+
4845524A1A4CF37F007770CA /* Async.swift in Sources */,
373+
484552321A4CF37F007770CA /* Alamofire.swift in Sources */,
371374
1F20250219ADA8FD00DE0495 /* BasicTests.swift in Sources */,
372-
1F0E284019C1DEA0005EF467 /* Async.swift in Sources */,
373375
1FF52EB41A4C395A00B4BA28 /* _InterruptableTask.swift in Sources */,
374-
1F2C0C1E1A32A19300CFBB47 /* Alamofire.swift in Sources */,
375376
1F6A8CA319A4E4F200369A5D /* SwiftTaskTests.swift in Sources */,
376377
1F2C0C1C1A32A15300CFBB47 /* AlamofireTests.swift in Sources */,
377378
485C31F11A1D619A00040DA3 /* TypeInferenceTests.swift in Sources */,
@@ -384,11 +385,11 @@
384385
isa = PBXSourcesBuildPhase;
385386
buildActionMask = 2147483647;
386387
files = (
388+
4845524B1A4CF37F007770CA /* Async.swift in Sources */,
389+
484552331A4CF37F007770CA /* Alamofire.swift in Sources */,
387390
4822F0DE19D00B2300F5F572 /* SwiftTaskTests.swift in Sources */,
388391
4822F0DD19D00B2300F5F572 /* BasicTests.swift in Sources */,
389392
1FF52EB51A4C395A00B4BA28 /* _InterruptableTask.swift in Sources */,
390-
1F2C0C1F1A32A19300CFBB47 /* Alamofire.swift in Sources */,
391-
4822F0E319D00B3100F5F572 /* Async.swift in Sources */,
392393
1F2C0C1D1A32A15300CFBB47 /* AlamofireTests.swift in Sources */,
393394
485C31F21A1D619A00040DA3 /* TypeInferenceTests.swift in Sources */,
394395
4822F0DC19D00B2300F5F572 /* _TestCase.swift in Sources */,

‎SwiftTask.xcworkspace/contents.xcworkspacedata

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

0 commit comments

Comments
 (0)