Skip to content

Commit 5eb2408

Browse files
inamiyinamiy
committed
Merge pull request #11 from ReactKit/carthage
Add Carthage 0.3 support.
2 parents 12989b8 + cf78ad5 commit 5eb2408

File tree

6 files changed

+59
-49
lines changed

6 files changed

+59
-49
lines changed

‎.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
[submodule "Vendor/SwiftState"]
2-
path = Vendor/SwiftState
3-
url = https://github.com/ReactKit/SwiftState.git
41
[submodule "Vendor/Alamofire"]
52
path = Vendor/Alamofire
63
url = https://github.com/Alamofire/Alamofire.git
74
[submodule "Vendor/Async"]
85
path = Vendor/Async
96
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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github "ReactKit/SwiftState" ~> 1.1.0

‎Cartfile.lock

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github "ReactKit/SwiftState" "1.1.0"

‎Carthage.checkout/SwiftState

Submodule SwiftState added at 740a2a7

‎SwiftTask.xcodeproj/project.pbxproj

Lines changed: 53 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,13 @@
99
/* Begin PBXBuildFile section */
1010
1F0E284019C1DEA0005EF467 /* Async.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F0E282319C1DEA0005EF467 /* Async.swift */; };
1111
1F20250219ADA8FD00DE0495 /* BasicTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F20250119ADA8FD00DE0495 /* BasicTests.swift */; };
12-
1F24C72B19D0688800C2FDC7 /* SwiftTask.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48CD5A0C19AEE3570042B9F1 /* SwiftTask.framework */; };
1312
1F2C0C1C1A32A15300CFBB47 /* AlamofireTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F5FA35619A374E600975FB9 /* AlamofireTests.swift */; };
1413
1F2C0C1D1A32A15300CFBB47 /* AlamofireTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F5FA35619A374E600975FB9 /* AlamofireTests.swift */; };
1514
1F2C0C1E1A32A19300CFBB47 /* Alamofire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FA4631719A8D70A00DD8729 /* Alamofire.swift */; };
1615
1F2C0C1F1A32A19300CFBB47 /* Alamofire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FA4631719A8D70A00DD8729 /* Alamofire.swift */; };
1716
1F46DEDA199EDF1000F97868 /* SwiftTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F46DED9199EDF1000F97868 /* SwiftTask.h */; settings = {ATTRIBUTES = (Public, ); }; };
1817
1F46DEFB199EDF8100F97868 /* SwiftTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEFA199EDF8100F97868 /* SwiftTask.swift */; };
1918
1F46DEFD199EE2C200F97868 /* _TestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEFC199EE2C200F97868 /* _TestCase.swift */; };
20-
1F53421819B4998A00CB93D9 /* SwiftTask.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F46DED4199EDF1000F97868 /* SwiftTask.framework */; };
2119
1F6A8CA319A4E4F200369A5D /* SwiftTaskTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEE3199EDF1000F97868 /* SwiftTaskTests.swift */; };
2220
4822F0DC19D00B2300F5F572 /* _TestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEFC199EE2C200F97868 /* _TestCase.swift */; };
2321
4822F0DD19D00B2300F5F572 /* BasicTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F20250119ADA8FD00DE0495 /* BasicTests.swift */; };
@@ -27,40 +25,42 @@
2725
48511C5B19C17563002FE03C /* RetainCycleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48511C5A19C17563002FE03C /* RetainCycleTests.swift */; };
2826
485C31F11A1D619A00040DA3 /* TypeInferenceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 485C31F01A1D619A00040DA3 /* TypeInferenceTests.swift */; };
2927
485C31F21A1D619A00040DA3 /* TypeInferenceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 485C31F01A1D619A00040DA3 /* TypeInferenceTests.swift */; };
30-
48797D6619B42CEF0085D80F /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FA4634319A8D70A00DD8729 /* SwiftState.framework */; };
31-
48797D6719B42CF30085D80F /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FA4634319A8D70A00DD8729 /* SwiftState.framework */; };
28+
48A1E8201A366F8C007619EB /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48A1E8191A366F52007619EB /* SwiftState.framework */; };
29+
48A1E8211A366F91007619EB /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48A1E8191A366F52007619EB /* SwiftState.framework */; };
30+
48A1E8221A366F9C007619EB /* SwiftTask.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F46DED4199EDF1000F97868 /* SwiftTask.framework */; };
31+
48A1E8231A366FA8007619EB /* SwiftTask.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48CD5A0C19AEE3570042B9F1 /* SwiftTask.framework */; };
3232
48CD5A3C19AEEBDF0042B9F1 /* SwiftTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEFA199EDF8100F97868 /* SwiftTask.swift */; };
3333
48CD5A4619AEEC2E0042B9F1 /* SwiftTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F46DED9199EDF1000F97868 /* SwiftTask.h */; settings = {ATTRIBUTES = (Public, ); }; };
3434
/* End PBXBuildFile section */
3535

3636
/* Begin PBXContainerItemProxy section */
37-
1FA4634219A8D70A00DD8729 /* PBXContainerItemProxy */ = {
37+
48A1E8181A366F52007619EB /* PBXContainerItemProxy */ = {
3838
isa = PBXContainerItemProxy;
39-
containerPortal = 1FA4633019A8D70A00DD8729 /* SwiftState.xcodeproj */;
39+
containerPortal = 48A1E8031A366F52007619EB /* SwiftState.xcodeproj */;
4040
proxyType = 2;
4141
remoteGlobalIDString = 1FA620001996601000460108;
42-
remoteInfo = SwiftState;
42+
remoteInfo = "SwiftState-OSX";
4343
};
44-
1FA4634419A8D70A00DD8729 /* PBXContainerItemProxy */ = {
44+
48A1E81A1A366F52007619EB /* PBXContainerItemProxy */ = {
4545
isa = PBXContainerItemProxy;
46-
containerPortal = 1FA4633019A8D70A00DD8729 /* SwiftState.xcodeproj */;
46+
containerPortal = 48A1E8031A366F52007619EB /* SwiftState.xcodeproj */;
4747
proxyType = 2;
4848
remoteGlobalIDString = 1FA6200B1996601000460108;
49-
remoteInfo = SwiftStateTests;
49+
remoteInfo = "SwiftState-OSXTests";
5050
};
51-
4822F0BF19D00A7800F5F572 /* PBXContainerItemProxy */ = {
51+
48A1E81C1A366F52007619EB /* PBXContainerItemProxy */ = {
5252
isa = PBXContainerItemProxy;
53-
containerPortal = 1FA4633019A8D70A00DD8729 /* SwiftState.xcodeproj */;
53+
containerPortal = 48A1E8031A366F52007619EB /* SwiftState.xcodeproj */;
5454
proxyType = 2;
55-
remoteGlobalIDString = 4822F0A619D0085E00F5F572;
56-
remoteInfo = "SwiftState-iOSTests";
55+
remoteGlobalIDString = 4872D5AC19B4211900F326B5;
56+
remoteInfo = "SwiftState-iOS";
5757
};
58-
4872D5C719B423D600F326B5 /* PBXContainerItemProxy */ = {
58+
48A1E81E1A366F52007619EB /* PBXContainerItemProxy */ = {
5959
isa = PBXContainerItemProxy;
60-
containerPortal = 1FA4633019A8D70A00DD8729 /* SwiftState.xcodeproj */;
60+
containerPortal = 48A1E8031A366F52007619EB /* SwiftState.xcodeproj */;
6161
proxyType = 2;
62-
remoteGlobalIDString = 4872D5AC19B4211900F326B5;
63-
remoteInfo = "SwiftState-iOS";
62+
remoteGlobalIDString = 4822F0A619D0085E00F5F572;
63+
remoteInfo = "SwiftState-iOSTests";
6464
};
6565
/* End PBXContainerItemProxy section */
6666

@@ -77,10 +77,10 @@
7777
1F46DEFC199EE2C200F97868 /* _TestCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = _TestCase.swift; sourceTree = "<group>"; };
7878
1F5FA35619A374E600975FB9 /* AlamofireTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlamofireTests.swift; sourceTree = "<group>"; };
7979
1FA4631719A8D70A00DD8729 /* Alamofire.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Alamofire.swift; sourceTree = "<group>"; };
80-
1FA4633019A8D70A00DD8729 /* SwiftState.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = SwiftState.xcodeproj; sourceTree = "<group>"; };
8180
4822F0D019D00ABF00F5F572 /* SwiftTask-iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SwiftTask-iOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
8281
48511C5A19C17563002FE03C /* RetainCycleTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RetainCycleTests.swift; sourceTree = "<group>"; };
8382
485C31F01A1D619A00040DA3 /* TypeInferenceTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TypeInferenceTests.swift; sourceTree = "<group>"; };
83+
48A1E8031A366F52007619EB /* SwiftState.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = SwiftState.xcodeproj; sourceTree = "<group>"; };
8484
48CD5A0C19AEE3570042B9F1 /* SwiftTask.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftTask.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8585
/* End PBXFileReference section */
8686

@@ -89,31 +89,31 @@
8989
isa = PBXFrameworksBuildPhase;
9090
buildActionMask = 2147483647;
9191
files = (
92-
48797D6719B42CF30085D80F /* SwiftState.framework in Frameworks */,
92+
48A1E8201A366F8C007619EB /* SwiftState.framework in Frameworks */,
9393
);
9494
runOnlyForDeploymentPostprocessing = 0;
9595
};
9696
1F46DEDC199EDF1000F97868 /* Frameworks */ = {
9797
isa = PBXFrameworksBuildPhase;
9898
buildActionMask = 2147483647;
9999
files = (
100-
1F53421819B4998A00CB93D9 /* SwiftTask.framework in Frameworks */,
100+
48A1E8221A366F9C007619EB /* SwiftTask.framework in Frameworks */,
101101
);
102102
runOnlyForDeploymentPostprocessing = 0;
103103
};
104104
4822F0CD19D00ABF00F5F572 /* Frameworks */ = {
105105
isa = PBXFrameworksBuildPhase;
106106
buildActionMask = 2147483647;
107107
files = (
108-
1F24C72B19D0688800C2FDC7 /* SwiftTask.framework in Frameworks */,
108+
48A1E8231A366FA8007619EB /* SwiftTask.framework in Frameworks */,
109109
);
110110
runOnlyForDeploymentPostprocessing = 0;
111111
};
112112
48CD5A0819AEE3570042B9F1 /* Frameworks */ = {
113113
isa = PBXFrameworksBuildPhase;
114114
buildActionMask = 2147483647;
115115
files = (
116-
48797D6619B42CEF0085D80F /* SwiftState.framework in Frameworks */,
116+
48A1E8211A366F91007619EB /* SwiftState.framework in Frameworks */,
117117
);
118118
runOnlyForDeploymentPostprocessing = 0;
119119
};
@@ -131,6 +131,7 @@
131131
1F46DECA199EDF1000F97868 = {
132132
isa = PBXGroup;
133133
children = (
134+
48A1E7EA1A366F52007619EB /* Carthage.checkout */,
134135
1FA4631219A8D70A00DD8729 /* Vendor */,
135136
1F46DED6199EDF1000F97868 /* SwiftTask */,
136137
1F46DEE0199EDF1000F97868 /* SwiftTaskTests */,
@@ -192,7 +193,6 @@
192193
1FA4631219A8D70A00DD8729 /* Vendor */ = {
193194
isa = PBXGroup;
194195
children = (
195-
1FA4631E19A8D70A00DD8729 /* SwiftState */,
196196
1FA4631319A8D70A00DD8729 /* Alamofire */,
197197
1F0E282119C1DEA0005EF467 /* Async */,
198198
);
@@ -215,21 +215,29 @@
215215
path = Source;
216216
sourceTree = "<group>";
217217
};
218-
1FA4631E19A8D70A00DD8729 /* SwiftState */ = {
218+
48A1E7EA1A366F52007619EB /* Carthage.checkout */ = {
219219
isa = PBXGroup;
220220
children = (
221-
1FA4633019A8D70A00DD8729 /* SwiftState.xcodeproj */,
221+
48A1E7EB1A366F52007619EB /* SwiftState */,
222+
);
223+
path = Carthage.checkout;
224+
sourceTree = "<group>";
225+
};
226+
48A1E7EB1A366F52007619EB /* SwiftState */ = {
227+
isa = PBXGroup;
228+
children = (
229+
48A1E8031A366F52007619EB /* SwiftState.xcodeproj */,
222230
);
223231
path = SwiftState;
224232
sourceTree = "<group>";
225233
};
226-
1FA4633119A8D70A00DD8729 /* Products */ = {
234+
48A1E8041A366F52007619EB /* Products */ = {
227235
isa = PBXGroup;
228236
children = (
229-
1FA4634319A8D70A00DD8729 /* SwiftState.framework */,
230-
1FA4634519A8D70A00DD8729 /* SwiftState-OSXTests.xctest */,
231-
4872D5C819B423D600F326B5 /* SwiftState.framework */,
232-
4822F0C019D00A7800F5F572 /* SwiftStateTests-iOS.xctest */,
237+
48A1E8191A366F52007619EB /* SwiftState.framework */,
238+
48A1E81B1A366F52007619EB /* SwiftState-OSXTests.xctest */,
239+
48A1E81D1A366F52007619EB /* SwiftState.framework */,
240+
48A1E81F1A366F52007619EB /* SwiftStateTests-iOS.xctest */,
233241
);
234242
name = Products;
235243
sourceTree = "<group>";
@@ -362,8 +370,8 @@
362370
projectDirPath = "";
363371
projectReferences = (
364372
{
365-
ProductGroup = 1FA4633119A8D70A00DD8729 /* Products */;
366-
ProjectRef = 1FA4633019A8D70A00DD8729 /* SwiftState.xcodeproj */;
373+
ProductGroup = 48A1E8041A366F52007619EB /* Products */;
374+
ProjectRef = 48A1E8031A366F52007619EB /* SwiftState.xcodeproj */;
367375
},
368376
);
369377
projectRoot = "";
@@ -377,32 +385,32 @@
377385
/* End PBXProject section */
378386

379387
/* Begin PBXReferenceProxy section */
380-
1FA4634319A8D70A00DD8729 /* SwiftState.framework */ = {
388+
48A1E8191A366F52007619EB /* SwiftState.framework */ = {
381389
isa = PBXReferenceProxy;
382390
fileType = wrapper.framework;
383391
path = SwiftState.framework;
384-
remoteRef = 1FA4634219A8D70A00DD8729 /* PBXContainerItemProxy */;
392+
remoteRef = 48A1E8181A366F52007619EB /* PBXContainerItemProxy */;
385393
sourceTree = BUILT_PRODUCTS_DIR;
386394
};
387-
1FA4634519A8D70A00DD8729 /* SwiftState-OSXTests.xctest */ = {
395+
48A1E81B1A366F52007619EB /* SwiftState-OSXTests.xctest */ = {
388396
isa = PBXReferenceProxy;
389397
fileType = wrapper.cfbundle;
390398
path = "SwiftState-OSXTests.xctest";
391-
remoteRef = 1FA4634419A8D70A00DD8729 /* PBXContainerItemProxy */;
399+
remoteRef = 48A1E81A1A366F52007619EB /* PBXContainerItemProxy */;
392400
sourceTree = BUILT_PRODUCTS_DIR;
393401
};
394-
4822F0C019D00A7800F5F572 /* SwiftStateTests-iOS.xctest */ = {
402+
48A1E81D1A366F52007619EB /* SwiftState.framework */ = {
395403
isa = PBXReferenceProxy;
396-
fileType = wrapper.cfbundle;
397-
path = "SwiftStateTests-iOS.xctest";
398-
remoteRef = 4822F0BF19D00A7800F5F572 /* PBXContainerItemProxy */;
404+
fileType = wrapper.framework;
405+
path = SwiftState.framework;
406+
remoteRef = 48A1E81C1A366F52007619EB /* PBXContainerItemProxy */;
399407
sourceTree = BUILT_PRODUCTS_DIR;
400408
};
401-
4872D5C819B423D600F326B5 /* SwiftState.framework */ = {
409+
48A1E81F1A366F52007619EB /* SwiftStateTests-iOS.xctest */ = {
402410
isa = PBXReferenceProxy;
403-
fileType = wrapper.framework;
404-
path = SwiftState.framework;
405-
remoteRef = 4872D5C719B423D600F326B5 /* PBXContainerItemProxy */;
411+
fileType = wrapper.cfbundle;
412+
path = "SwiftStateTests-iOS.xctest";
413+
remoteRef = 48A1E81E1A366F52007619EB /* PBXContainerItemProxy */;
406414
sourceTree = BUILT_PRODUCTS_DIR;
407415
};
408416
/* End PBXReferenceProxy section */

‎Vendor/SwiftState

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

0 commit comments

Comments
 (0)