Skip to content

Commit 3b5c2cb

Browse files
inamiyinamiy
committed
Update for Xcode7-beta5.
1 parent 3c3a4bb commit 3b5c2cb

File tree

12 files changed

+30
-35
lines changed

12 files changed

+30
-35
lines changed

‎Cartfile.resolved

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "Alamofire/Alamofire" "fd71afb3a0af2042b9f05a6b9f29317ad4903703"
2-
github "duemunk/Async" "23aaf8d7f2e4dc593e87db739b68c58ecb9d19ac"
1+
github "Alamofire/Alamofire" "9a1e321cf0a345b32142394446fa1a7e08cf6942"
2+
github "duemunk/Async" "abe23c18d8d3a708a325b5db10231388e1ca5b88"

‎Carthage/Checkouts/Alamofire

Submodule Alamofire updated 65 files

‎Carthage/Checkouts/Async

Submodule Async updated 57 files

‎SwiftTask.xcodeproj/project.pbxproj

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
1F46DEFD199EE2C200F97868 /* _TestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEFC199EE2C200F97868 /* _TestCase.swift */; };
1818
1F4C76A41AD8CF40004E47C1 /* AlamofireTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F5FA35619A374E600975FB9 /* AlamofireTests.swift */; };
1919
1F4C76A51AD8CF41004E47C1 /* AlamofireTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F5FA35619A374E600975FB9 /* AlamofireTests.swift */; };
20+
1F4C7AD71B7CD27200DEB1AE /* Async.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F4C7AD61B7CD27100DEB1AE /* Async.framework */; };
21+
1F4C7AD91B7CD27600DEB1AE /* Async.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F4C7AD81B7CD27600DEB1AE /* Async.framework */; };
2022
1F6A8CA319A4E4F200369A5D /* SwiftTaskTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEE3199EDF1000F97868 /* SwiftTaskTests.swift */; };
2123
1FB3B8F31B0A194F00F78900 /* _Atomic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FB3B8F21B0A194F00F78900 /* _Atomic.swift */; };
2224
1FB3B8F41B0A194F00F78900 /* _Atomic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FB3B8F21B0A194F00F78900 /* _Atomic.swift */; };
2325
1FCF71121AD8CD2B007079C2 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FCF71111AD8CD2B007079C2 /* Alamofire.framework */; };
2426
1FCF71161AD8CD38007079C2 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FCF71151AD8CD38007079C2 /* Alamofire.framework */; };
2527
1FD7197B1AFE387C00BC38C4 /* Cancellable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FD7197A1AFE387C00BC38C4 /* Cancellable.swift */; };
2628
1FD7197C1AFE387C00BC38C4 /* Cancellable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FD7197A1AFE387C00BC38C4 /* Cancellable.swift */; };
27-
1FE79EDB1B36F329008569AA /* Async.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FE79E561B36F329008569AA /* Async.swift */; };
28-
1FE79EDC1B36F329008569AA /* Async.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FE79E561B36F329008569AA /* Async.swift */; };
2929
1FF52EB41A4C395A00B4BA28 /* _InterruptableTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FF52EB31A4C395A00B4BA28 /* _InterruptableTask.swift */; };
3030
1FF52EB51A4C395A00B4BA28 /* _InterruptableTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FF52EB31A4C395A00B4BA28 /* _InterruptableTask.swift */; };
3131
4822F0DC19D00B2300F5F572 /* _TestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEFC199EE2C200F97868 /* _TestCase.swift */; };
@@ -57,14 +57,13 @@
5757
1F46DEE3199EDF1000F97868 /* SwiftTaskTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftTaskTests.swift; sourceTree = "<group>"; };
5858
1F46DEFA199EDF8100F97868 /* SwiftTask.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftTask.swift; sourceTree = "<group>"; };
5959
1F46DEFC199EE2C200F97868 /* _TestCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = _TestCase.swift; sourceTree = "<group>"; };
60+
1F4C7AD61B7CD27100DEB1AE /* Async.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Async.framework; path = ../Carthage/Checkouts/Async/build/Debug/Async.framework; sourceTree = "<group>"; };
61+
1F4C7AD81B7CD27600DEB1AE /* Async.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Async.framework; path = "../Carthage/Checkouts/Async/build/Debug-iphoneos/Async.framework"; sourceTree = "<group>"; };
6062
1F5FA35619A374E600975FB9 /* AlamofireTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlamofireTests.swift; sourceTree = "<group>"; };
6163
1FB3B8F21B0A194F00F78900 /* _Atomic.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = _Atomic.swift; sourceTree = "<group>"; };
6264
1FCF71111AD8CD2B007079C2 /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Alamofire.framework; path = "../Carthage/Checkouts/Alamofire/build/Debug-iphoneos/Alamofire.framework"; sourceTree = "<group>"; };
63-
1FCF71131AD8CD2F007079C2 /* Async.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Async.framework; path = "../Carthage/Checkouts/Async/build/Debug-iphoneos/Async.framework"; sourceTree = "<group>"; };
6465
1FCF71151AD8CD38007079C2 /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Alamofire.framework; path = ../Carthage/Checkouts/Alamofire/build/Debug/Alamofire.framework; sourceTree = "<group>"; };
65-
1FCF71171AD8CD3C007079C2 /* Async.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Async.framework; path = ../Carthage/Checkouts/Async/build/Debug/Async.framework; sourceTree = "<group>"; };
6666
1FD7197A1AFE387C00BC38C4 /* Cancellable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Cancellable.swift; sourceTree = "<group>"; };
67-
1FE79E561B36F329008569AA /* Async.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Async.swift; sourceTree = "<group>"; };
6867
1FF52EB31A4C395A00B4BA28 /* _InterruptableTask.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = _InterruptableTask.swift; sourceTree = "<group>"; };
6968
4822F0D019D00ABF00F5F572 /* SwiftTask-iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SwiftTask-iOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
7069
48511C5A19C17563002FE03C /* RetainCycleTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RetainCycleTests.swift; sourceTree = "<group>"; };
@@ -86,6 +85,7 @@
8685
isa = PBXFrameworksBuildPhase;
8786
buildActionMask = 2147483647;
8887
files = (
88+
1F4C7AD71B7CD27200DEB1AE /* Async.framework in Frameworks */,
8989
1FCF71161AD8CD38007079C2 /* Alamofire.framework in Frameworks */,
9090
48A1E8221A366F9C007619EB /* SwiftTask.framework in Frameworks */,
9191
);
@@ -95,6 +95,7 @@
9595
isa = PBXFrameworksBuildPhase;
9696
buildActionMask = 2147483647;
9797
files = (
98+
1F4C7AD91B7CD27600DEB1AE /* Async.framework in Frameworks */,
9899
1FCF71121AD8CD2B007079C2 /* Alamofire.framework in Frameworks */,
99100
48A1E8231A366FA8007619EB /* SwiftTask.framework in Frameworks */,
100101
);
@@ -155,7 +156,6 @@
155156
1F46DEE0199EDF1000F97868 /* SwiftTaskTests */ = {
156157
isa = PBXGroup;
157158
children = (
158-
1FE79E521B36F329008569AA /* Async */,
159159
1FF52EB31A4C395A00B4BA28 /* _InterruptableTask.swift */,
160160
1F46DEFC199EE2C200F97868 /* _TestCase.swift */,
161161
1F20250119ADA8FD00DE0495 /* BasicTests.swift */,
@@ -173,24 +173,15 @@
173173
1F46DEE1199EDF1000F97868 /* Supporting Files */ = {
174174
isa = PBXGroup;
175175
children = (
176-
1FCF71171AD8CD3C007079C2 /* Async.framework */,
176+
1F4C7AD81B7CD27600DEB1AE /* Async.framework */,
177+
1F4C7AD61B7CD27100DEB1AE /* Async.framework */,
177178
1FCF71151AD8CD38007079C2 /* Alamofire.framework */,
178-
1FCF71131AD8CD2F007079C2 /* Async.framework */,
179179
1FCF71111AD8CD2B007079C2 /* Alamofire.framework */,
180180
1F46DEE2199EDF1000F97868 /* Info.plist */,
181181
);
182182
name = "Supporting Files";
183183
sourceTree = "<group>";
184184
};
185-
1FE79E521B36F329008569AA /* Async */ = {
186-
isa = PBXGroup;
187-
children = (
188-
1FE79E561B36F329008569AA /* Async.swift */,
189-
);
190-
name = Async;
191-
path = Carthage/Checkouts/Async;
192-
sourceTree = SOURCE_ROOT;
193-
};
194185
/* End PBXGroup section */
195186

196187
/* Begin PBXHeadersBuildPhase section */
@@ -378,7 +369,6 @@
378369
files = (
379370
1F20250219ADA8FD00DE0495 /* BasicTests.swift in Sources */,
380371
1FF52EB41A4C395A00B4BA28 /* _InterruptableTask.swift in Sources */,
381-
1FE79EDB1B36F329008569AA /* Async.swift in Sources */,
382372
1F218D5B1AFC3FFD00C849FF /* RemoveHandlerTests.swift in Sources */,
383373
1F6A8CA319A4E4F200369A5D /* SwiftTaskTests.swift in Sources */,
384374
1F29F6421B115EF500F476AF /* MultipleErrorTypesTests.swift in Sources */,
@@ -395,7 +385,6 @@
395385
files = (
396386
4822F0DE19D00B2300F5F572 /* SwiftTaskTests.swift in Sources */,
397387
4822F0DD19D00B2300F5F572 /* BasicTests.swift in Sources */,
398-
1FE79EDC1B36F329008569AA /* Async.swift in Sources */,
399388
1F218D5C1AFC3FFD00C849FF /* RemoveHandlerTests.swift in Sources */,
400389
1FF52EB51A4C395A00B4BA28 /* _InterruptableTask.swift in Sources */,
401390
1F29F6431B115EF500F476AF /* MultipleErrorTypesTests.swift in Sources */,

‎SwiftTask.xcworkspace/contents.xcworkspacedata

Lines changed: 7 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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class AlamofireTests: _TestCase
2020

2121
let task = Task<Progress, String, NSError> { progress, fulfill, reject, configure in
2222

23-
request(.GET, URLString: "http://httpbin.org/get", parameters: ["foo": "bar"])
23+
request(.GET, "http://httpbin.org/get", parameters: ["foo": "bar"])
2424
.response { (request, response, data, error) in
2525

2626
if let error = error {
@@ -52,7 +52,7 @@ class AlamofireTests: _TestCase
5252

5353
let dummyURLString = "http://xxx-swift-task.org/get"
5454

55-
request(.GET, URLString: dummyURLString, parameters: ["foo": "bar"])
55+
request(.GET, dummyURLString, parameters: ["foo": "bar"])
5656
.response { (request, response, data, error) in
5757

5858
if let error = error {
@@ -91,7 +91,7 @@ class AlamofireTests: _TestCase
9191
// define task
9292
let task = Task<Progress, String, NSError> { progress, fulfill, reject, configure in
9393

94-
download(.GET, URLString: "http://httpbin.org/stream/100", destination: Request.suggestedDownloadDestination(directory: .DocumentDirectory, domain: .UserDomainMask))
94+
download(.GET, "http://httpbin.org/stream/100", destination: Request.suggestedDownloadDestination(directory: .DocumentDirectory, domain: .UserDomainMask))
9595

9696
.progress { (bytesWritten, totalBytesWritten, totalBytesExpectedToWrite) in
9797

@@ -138,7 +138,7 @@ class AlamofireTests: _TestCase
138138
nsProgress.becomeCurrentWithPendingUnitCount(50)
139139

140140
// NOTE: test with url which returns totalBytesExpectedToWrite != -1
141-
download(.GET, URLString: "http://httpbin.org/bytes/1024", destination: Request.suggestedDownloadDestination(directory: .DocumentDirectory, domain: .UserDomainMask))
141+
download(.GET, "http://httpbin.org/bytes/1024", destination: Request.suggestedDownloadDestination(directory: .DocumentDirectory, domain: .UserDomainMask))
142142

143143
.response { (request, response, data, error) in
144144

@@ -180,7 +180,7 @@ class AlamofireTests: _TestCase
180180

181181
let task = Task<Progress, String?, NSError> { progress, fulfill, reject, configure in
182182

183-
let downloadRequst = download(.GET, URLString: "http://httpbin.org/stream/100", destination: Request.suggestedDownloadDestination(directory: .DocumentDirectory, domain: .UserDomainMask))
183+
let downloadRequst = download(.GET, "http://httpbin.org/stream/100", destination: Request.suggestedDownloadDestination(directory: .DocumentDirectory, domain: .UserDomainMask))
184184

185185
.response { (request, response, data, error) in
186186

‎SwiftTaskTests/BasicTests.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 Async
10+
import Async
1111
import XCTest
1212

1313
class BasicTests: _TestCase

‎SwiftTaskTests/MultipleErrorTypesTests.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 Async
10+
import Async
1111
import XCTest
1212

1313
class MultipleErrorTypesTests: _TestCase

‎SwiftTaskTests/RemoveHandlerTests.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 Async
10+
import Async
1111
import XCTest
1212

1313
class RemoveHandlerTests: _TestCase

‎SwiftTaskTests/SwiftTaskTests.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 Async
10+
import Async
1111
import XCTest
1212

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

‎SwiftTaskTests/_InterruptableTask.swift

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

99
import SwiftTask
10-
//import Async
11-
10+
import Async
1211
typealias _InterruptableTask = Task<Int, String, String>
1312

1413
/// 1. Invokes `progressCount/2` progresses at t=0.2

‎SwiftTaskTests/_TestCase.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 Async
10+
import Async
1111
import XCTest
1212

1313
typealias ErrorString = String

0 commit comments

Comments
 (0)