Skip to content

Commit 30014bf

Browse files
inamiyinamiy
committed
[Test] Update Alamofire & Async framworks.
1 parent 1979df7 commit 30014bf

File tree

11 files changed

+52
-49
lines changed

11 files changed

+52
-49
lines changed

‎Cartfile.private

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

‎Cartfile.resolved

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

‎Carthage/Checkouts/Alamofire

Submodule Alamofire updated 23 files

‎Carthage/Checkouts/Async

Submodule Async updated 99 files

‎SwiftTask.xcodeproj/project.pbxproj

Lines changed: 23 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,19 @@
1111
1F46DEDA199EDF1000F97868 /* SwiftTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F46DED9199EDF1000F97868 /* SwiftTask.h */; settings = {ATTRIBUTES = (Public, ); }; };
1212
1F46DEFB199EDF8100F97868 /* SwiftTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEFA199EDF8100F97868 /* SwiftTask.swift */; };
1313
1F46DEFD199EE2C200F97868 /* _TestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEFC199EE2C200F97868 /* _TestCase.swift */; };
14+
1F4C76A41AD8CF40004E47C1 /* AlamofireTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F5FA35619A374E600975FB9 /* AlamofireTests.swift */; };
15+
1F4C76A51AD8CF41004E47C1 /* AlamofireTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F5FA35619A374E600975FB9 /* AlamofireTests.swift */; };
1416
1F6A8CA319A4E4F200369A5D /* SwiftTaskTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEE3199EDF1000F97868 /* SwiftTaskTests.swift */; };
17+
1FCF71121AD8CD2B007079C2 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FCF71111AD8CD2B007079C2 /* Alamofire.framework */; };
18+
1FCF71141AD8CD2F007079C2 /* Async.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FCF71131AD8CD2F007079C2 /* Async.framework */; };
19+
1FCF71161AD8CD38007079C2 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FCF71151AD8CD38007079C2 /* Alamofire.framework */; };
20+
1FCF71181AD8CD3C007079C2 /* Async.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FCF71171AD8CD3C007079C2 /* Async.framework */; };
1521
1FF52EB41A4C395A00B4BA28 /* _InterruptableTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FF52EB31A4C395A00B4BA28 /* _InterruptableTask.swift */; };
1622
1FF52EB51A4C395A00B4BA28 /* _InterruptableTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FF52EB31A4C395A00B4BA28 /* _InterruptableTask.swift */; };
1723
4822F0DC19D00B2300F5F572 /* _TestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEFC199EE2C200F97868 /* _TestCase.swift */; };
1824
4822F0DD19D00B2300F5F572 /* BasicTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F20250119ADA8FD00DE0495 /* BasicTests.swift */; };
1925
4822F0DE19D00B2300F5F572 /* SwiftTaskTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEE3199EDF1000F97868 /* SwiftTaskTests.swift */; };
2026
4822F0E019D00B2300F5F572 /* RetainCycleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48511C5A19C17563002FE03C /* RetainCycleTests.swift */; };
21-
4845524A1A4CF37F007770CA /* Async.swift in Sources */ = {isa = PBXBuildFile; fileRef = 484551DC1A4CF37F007770CA /* Async.swift */; };
22-
4845524B1A4CF37F007770CA /* Async.swift in Sources */ = {isa = PBXBuildFile; fileRef = 484551DC1A4CF37F007770CA /* Async.swift */; };
2327
48511C5B19C17563002FE03C /* RetainCycleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48511C5A19C17563002FE03C /* RetainCycleTests.swift */; };
2428
485C31F11A1D619A00040DA3 /* TypeInferenceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 485C31F01A1D619A00040DA3 /* TypeInferenceTests.swift */; };
2529
485C31F21A1D619A00040DA3 /* TypeInferenceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 485C31F01A1D619A00040DA3 /* TypeInferenceTests.swift */; };
@@ -42,10 +46,12 @@
4246
1F46DEFA199EDF8100F97868 /* SwiftTask.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftTask.swift; sourceTree = "<group>"; };
4347
1F46DEFC199EE2C200F97868 /* _TestCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = _TestCase.swift; sourceTree = "<group>"; };
4448
1F5FA35619A374E600975FB9 /* AlamofireTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlamofireTests.swift; sourceTree = "<group>"; };
49+
1FCF71111AD8CD2B007079C2 /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Alamofire.framework; path = "../Carthage/Checkouts/Alamofire/build/Debug-iphoneos/Alamofire.framework"; sourceTree = "<group>"; };
50+
1FCF71131AD8CD2F007079C2 /* Async.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Async.framework; path = "../Carthage/Checkouts/Async/build/Debug-iphoneos/Async.framework"; sourceTree = "<group>"; };
51+
1FCF71151AD8CD38007079C2 /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Alamofire.framework; path = ../Carthage/Checkouts/Alamofire/build/Debug/Alamofire.framework; sourceTree = "<group>"; };
52+
1FCF71171AD8CD3C007079C2 /* Async.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Async.framework; path = ../Carthage/Checkouts/Async/build/Debug/Async.framework; sourceTree = "<group>"; };
4553
1FF52EB31A4C395A00B4BA28 /* _InterruptableTask.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = _InterruptableTask.swift; sourceTree = "<group>"; };
4654
4822F0D019D00ABF00F5F572 /* SwiftTask-iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SwiftTask-iOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
47-
484551CE1A4CF37F007770CA /* Alamofire.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Alamofire.swift; sourceTree = "<group>"; };
48-
484551DC1A4CF37F007770CA /* Async.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Async.swift; sourceTree = "<group>"; };
4955
48511C5A19C17563002FE03C /* RetainCycleTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RetainCycleTests.swift; sourceTree = "<group>"; };
5056
485C31F01A1D619A00040DA3 /* TypeInferenceTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TypeInferenceTests.swift; sourceTree = "<group>"; };
5157
48B58D7A1A6F255E0068E18C /* _StateMachine.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = _StateMachine.swift; sourceTree = "<group>"; };
@@ -64,6 +70,8 @@
6470
isa = PBXFrameworksBuildPhase;
6571
buildActionMask = 2147483647;
6672
files = (
73+
1FCF71181AD8CD3C007079C2 /* Async.framework in Frameworks */,
74+
1FCF71161AD8CD38007079C2 /* Alamofire.framework in Frameworks */,
6775
48A1E8221A366F9C007619EB /* SwiftTask.framework in Frameworks */,
6876
);
6977
runOnlyForDeploymentPostprocessing = 0;
@@ -72,6 +80,8 @@
7280
isa = PBXFrameworksBuildPhase;
7381
buildActionMask = 2147483647;
7482
files = (
83+
1FCF71141AD8CD2F007079C2 /* Async.framework in Frameworks */,
84+
1FCF71121AD8CD2B007079C2 /* Alamofire.framework in Frameworks */,
7585
48A1E8231A366FA8007619EB /* SwiftTask.framework in Frameworks */,
7686
);
7787
runOnlyForDeploymentPostprocessing = 0;
@@ -89,7 +99,6 @@
8999
1F46DECA199EDF1000F97868 = {
90100
isa = PBXGroup;
91101
children = (
92-
484551B31A4CF37F007770CA /* Checkouts */,
93102
1F46DED6199EDF1000F97868 /* SwiftTask */,
94103
1F46DEE0199EDF1000F97868 /* SwiftTaskTests */,
95104
1F46DED5199EDF1000F97868 /* Products */,
@@ -111,8 +120,8 @@
111120
isa = PBXGroup;
112121
children = (
113122
1F46DED9199EDF1000F97868 /* SwiftTask.h */,
114-
48B58D7A1A6F255E0068E18C /* _StateMachine.swift */,
115123
1F46DEFA199EDF8100F97868 /* SwiftTask.swift */,
124+
48B58D7A1A6F255E0068E18C /* _StateMachine.swift */,
116125
1F46DED7199EDF1000F97868 /* Supporting Files */,
117126
);
118127
path = SwiftTask;
@@ -144,45 +153,15 @@
144153
1F46DEE1199EDF1000F97868 /* Supporting Files */ = {
145154
isa = PBXGroup;
146155
children = (
156+
1FCF71171AD8CD3C007079C2 /* Async.framework */,
157+
1FCF71151AD8CD38007079C2 /* Alamofire.framework */,
158+
1FCF71131AD8CD2F007079C2 /* Async.framework */,
159+
1FCF71111AD8CD2B007079C2 /* Alamofire.framework */,
147160
1F46DEE2199EDF1000F97868 /* Info.plist */,
148161
);
149162
name = "Supporting Files";
150163
sourceTree = "<group>";
151164
};
152-
484551B31A4CF37F007770CA /* Checkouts */ = {
153-
isa = PBXGroup;
154-
children = (
155-
484551B41A4CF37F007770CA /* Alamofire */,
156-
484551DA1A4CF37F007770CA /* Async */,
157-
);
158-
name = Checkouts;
159-
path = Carthage/Checkouts;
160-
sourceTree = "<group>";
161-
};
162-
484551B41A4CF37F007770CA /* Alamofire */ = {
163-
isa = PBXGroup;
164-
children = (
165-
484551CC1A4CF37F007770CA /* Source */,
166-
);
167-
path = Alamofire;
168-
sourceTree = "<group>";
169-
};
170-
484551CC1A4CF37F007770CA /* Source */ = {
171-
isa = PBXGroup;
172-
children = (
173-
484551CE1A4CF37F007770CA /* Alamofire.swift */,
174-
);
175-
path = Source;
176-
sourceTree = "<group>";
177-
};
178-
484551DA1A4CF37F007770CA /* Async */ = {
179-
isa = PBXGroup;
180-
children = (
181-
484551DC1A4CF37F007770CA /* Async.swift */,
182-
);
183-
path = Async;
184-
sourceTree = "<group>";
185-
};
186165
/* End PBXGroup section */
187166

188167
/* Begin PBXHeadersBuildPhase section */
@@ -364,10 +343,10 @@
364343
isa = PBXSourcesBuildPhase;
365344
buildActionMask = 2147483647;
366345
files = (
367-
4845524A1A4CF37F007770CA /* Async.swift in Sources */,
368346
1F20250219ADA8FD00DE0495 /* BasicTests.swift in Sources */,
369347
1FF52EB41A4C395A00B4BA28 /* _InterruptableTask.swift in Sources */,
370348
1F6A8CA319A4E4F200369A5D /* SwiftTaskTests.swift in Sources */,
349+
1F4C76A41AD8CF40004E47C1 /* AlamofireTests.swift in Sources */,
371350
485C31F11A1D619A00040DA3 /* TypeInferenceTests.swift in Sources */,
372351
48511C5B19C17563002FE03C /* RetainCycleTests.swift in Sources */,
373352
1F46DEFD199EE2C200F97868 /* _TestCase.swift in Sources */,
@@ -378,10 +357,10 @@
378357
isa = PBXSourcesBuildPhase;
379358
buildActionMask = 2147483647;
380359
files = (
381-
4845524B1A4CF37F007770CA /* Async.swift in Sources */,
382360
4822F0DE19D00B2300F5F572 /* SwiftTaskTests.swift in Sources */,
383361
4822F0DD19D00B2300F5F572 /* BasicTests.swift in Sources */,
384362
1FF52EB51A4C395A00B4BA28 /* _InterruptableTask.swift in Sources */,
363+
1F4C76A51AD8CF41004E47C1 /* AlamofireTests.swift in Sources */,
385364
485C31F21A1D619A00040DA3 /* TypeInferenceTests.swift in Sources */,
386365
4822F0DC19D00B2300F5F572 /* _TestCase.swift in Sources */,
387366
4822F0E019D00B2300F5F572 /* RetainCycleTests.swift in Sources */,
@@ -545,6 +524,7 @@
545524
);
546525
INFOPLIST_FILE = SwiftTaskTests/Info.plist;
547526
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
527+
MACOSX_DEPLOYMENT_TARGET = 10.10;
548528
PRODUCT_NAME = "$(TARGET_NAME)";
549529
SDKROOT = macosx;
550530
};
@@ -560,6 +540,7 @@
560540
);
561541
INFOPLIST_FILE = SwiftTaskTests/Info.plist;
562542
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
543+
MACOSX_DEPLOYMENT_TARGET = 10.10;
563544
PRODUCT_NAME = "$(TARGET_NAME)";
564545
SDKROOT = macosx;
565546
};

‎SwiftTask.xcworkspace/contents.xcworkspacedata

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

‎SwiftTaskTests/AlamofireTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88

99
import SwiftTask
10-
//import Alamofire // comment-out: include source code for OSX test as well
10+
import Alamofire
1111
import XCTest
1212

1313
class AlamofireTests: _TestCase

‎SwiftTaskTests/BasicTests.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//
88

99
import SwiftTask
10+
import Async
1011
import XCTest
1112

1213
class BasicTests: _TestCase

‎SwiftTaskTests/SwiftTaskTests.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//
88

99
import SwiftTask
10+
import Async
1011
import XCTest
1112

1213
/// Safe background flag checking delay to not conflict with main-dispatch_after.

‎SwiftTaskTests/_InterruptableTask.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//
88

99
import SwiftTask
10+
import Async
1011

1112
typealias _InterruptableTask = Task<Int, String, String>
1213

‎SwiftTaskTests/_TestCase.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//
88

99
import SwiftTask
10+
import Async
1011
import XCTest
1112

1213
typealias ErrorString = String

0 commit comments

Comments
 (0)