Skip to content

Commit d410edd

Browse files
Econa77Econa77
committed
Fix Xcode build errors and warnings
1 parent 8679a3e commit d410edd

File tree

6 files changed

+48
-48
lines changed

6 files changed

+48
-48
lines changed

‎Sources/APIKit/Combine/Combine.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ public struct SessionTaskPublisher<Request: APIKit.Request>: Publisher {
4747
assert(demand > 0)
4848
guard let downstream = self.downstream else { return }
4949
self.downstream = nil
50-
task = session.send(request, callbackQueue: callbackQueue) { result in
50+
task = session.send(request, callbackQueue: callbackQueue, completionHandler: { result in
5151
switch result {
5252
case .success(let response):
5353
_ = downstream.receive(response)
5454
downstream.receive(completion: .finished)
5555
case .failure(let error):
5656
downstream.receive(completion: .failure(error))
5757
}
58-
}
58+
})
5959
}
6060

6161
func cancel() {

‎Sources/APIKit/Session.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ open class Session {
3636
/// - parameter handler: The closure that receives result of the request.
3737
/// - returns: The new session task.
3838
@discardableResult
39-
open class func send<Request: APIKit.Request>(_ request: Request, callbackQueue: CallbackQueue? = nil, progressHandler: @escaping (Int64, Int64, Int64) -> Void = { _ in }, completionHandler: @escaping (Result<Request.Response, SessionTaskError>) -> Void = { _ in }) -> SessionTask? {
39+
open class func send<Request: APIKit.Request>(_ request: Request, callbackQueue: CallbackQueue? = nil, progressHandler: @escaping (Int64, Int64, Int64) -> Void = { _, _, _ in }, completionHandler: @escaping (Result<Request.Response, SessionTaskError>) -> Void = { _ in }) -> SessionTask? {
4040
return shared.send(request, callbackQueue: callbackQueue, progressHandler: progressHandler, completionHandler: completionHandler)
4141
}
4242

@@ -54,7 +54,7 @@ open class Session {
5454
/// - parameter handler: The closure that receives result of the request.
5555
/// - returns: The new session task.
5656
@discardableResult
57-
open func send<Request: APIKit.Request>(_ request: Request, callbackQueue: CallbackQueue? = nil, progressHandler: @escaping (Int64, Int64, Int64) -> Void = { _ in }, completionHandler: @escaping (Result<Request.Response, SessionTaskError>) -> Void = { _ in }) -> SessionTask? {
57+
open func send<Request: APIKit.Request>(_ request: Request, callbackQueue: CallbackQueue? = nil, progressHandler: @escaping (Int64, Int64, Int64) -> Void = { _, _, _ in }, completionHandler: @escaping (Result<Request.Response, SessionTaskError>) -> Void = { _ in }) -> SessionTask? {
5858
let callbackQueue = callbackQueue ?? self.callbackQueue
5959

6060
let urlRequest: URLRequest

‎Tests/APIKitTests/SessionAdapterType/URLSessionAdapterSubclassTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ class URLSessionAdapterSubclassTests: XCTestCase {
4242
let expectation = self.expectation(description: "wait for response")
4343
let request = TestRequest()
4444

45-
session.send(request) { result in
45+
session.send(request, completionHandler: { result in
4646
if case .failure = result {
4747
XCTFail()
4848
}
4949

5050
expectation.fulfill()
51-
}
51+
})
5252

5353
waitForExpectations(timeout: 10.0, handler: nil)
5454

‎Tests/APIKitTests/SessionAdapterType/URLSessionAdapterTests.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ class URLSessionAdapterTests: XCTestCase {
2424
let expectation = self.expectation(description: "wait for response")
2525
let request = TestRequest()
2626

27-
session.send(request) { response in
27+
session.send(request, completionHandler: { response in
2828
switch response {
2929
case .success(let dictionary):
3030
XCTAssertEqual((dictionary as? [String: String])?["key"], "value")
3131

3232
case .failure:
3333
XCTFail()
3434
}
35-
35+
3636
expectation.fulfill()
37-
}
37+
})
3838

3939
waitForExpectations(timeout: 10.0, handler: nil)
4040
}
@@ -46,11 +46,11 @@ class URLSessionAdapterTests: XCTestCase {
4646
let expectation = self.expectation(description: "wait for response")
4747
let request = TestRequest()
4848

49-
session.send(request) { response in
49+
session.send(request, completionHandler: { response in
5050
switch response {
5151
case .success:
5252
XCTFail()
53-
53+
5454
case .failure(let error):
5555
switch error {
5656
case .connectionError(let error as NSError):
@@ -62,7 +62,7 @@ class URLSessionAdapterTests: XCTestCase {
6262
}
6363

6464
expectation.fulfill()
65-
}
65+
})
6666

6767
waitForExpectations(timeout: 10.0, handler: nil)
6868
}
@@ -74,7 +74,7 @@ class URLSessionAdapterTests: XCTestCase {
7474
let expectation = self.expectation(description: "wait for response")
7575
let request = TestRequest()
7676

77-
session.send(request) { result in
77+
session.send(request, completionHandler: { result in
7878
guard case .failure(let error) = result,
7979
case .connectionError(let connectionError as NSError) = error else {
8080
XCTFail()
@@ -84,7 +84,7 @@ class URLSessionAdapterTests: XCTestCase {
8484
XCTAssertEqual(connectionError.code, NSURLErrorCancelled)
8585

8686
expectation.fulfill()
87-
}
87+
})
8888

8989
DispatchQueue.main.async {
9090
self.session.cancelRequests(with: TestRequest.self)

‎Tests/APIKitTests/SessionCallbackQueueTests.swift

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ class SessionCallbackQueueTests: XCTestCase {
1919
let expectation = self.expectation(description: "wait for response")
2020
let request = TestRequest()
2121

22-
session.send(request, callbackQueue: .main) { result in
22+
session.send(request, callbackQueue: .main, completionHandler: { result in
2323
XCTAssert(Thread.isMainThread)
2424
expectation.fulfill()
25-
}
25+
})
2626

2727
waitForExpectations(timeout: 1.0, handler: nil)
2828
}
@@ -31,11 +31,11 @@ class SessionCallbackQueueTests: XCTestCase {
3131
let expectation = self.expectation(description: "wait for response")
3232
let request = TestRequest()
3333

34-
session.send(request, callbackQueue: .sessionQueue) { result in
34+
session.send(request, callbackQueue: .sessionQueue, completionHandler: { result in
3535
// This depends on implementation of TestSessionAdapter
3636
XCTAssertTrue(Thread.isMainThread)
3737
expectation.fulfill()
38-
}
38+
})
3939

4040
waitForExpectations(timeout: 1.0, handler: nil)
4141
}
@@ -45,10 +45,10 @@ class SessionCallbackQueueTests: XCTestCase {
4545
let expectation = self.expectation(description: "wait for response")
4646
let request = TestRequest()
4747

48-
session.send(request, callbackQueue: .operationQueue(operationQueue)) { result in
48+
session.send(request, callbackQueue: .operationQueue(operationQueue), completionHandler: { result in
4949
XCTAssertEqual(OperationQueue.current, operationQueue)
5050
expectation.fulfill()
51-
}
51+
})
5252

5353
waitForExpectations(timeout: 1.0, handler: nil)
5454
}
@@ -58,11 +58,11 @@ class SessionCallbackQueueTests: XCTestCase {
5858
let expectation = self.expectation(description: "wait for response")
5959
let request = TestRequest()
6060

61-
session.send(request, callbackQueue: .dispatchQueue(dispatchQueue)) { result in
61+
session.send(request, callbackQueue: .dispatchQueue(dispatchQueue), completionHandler: { result in
6262
// There is no way to test current dispatch queue.
6363
XCTAssertFalse(Thread.isMainThread)
6464
expectation.fulfill()
65-
}
65+
})
6666

6767
waitForExpectations(timeout: 1.0, handler: nil)
6868
}
@@ -75,10 +75,10 @@ class SessionCallbackQueueTests: XCTestCase {
7575
let expectation = self.expectation(description: "wait for response")
7676
let request = TestRequest()
7777

78-
session.send(request) { result in
78+
session.send(request, completionHandler: { result in
7979
XCTAssertEqual(OperationQueue.current, operationQueue)
8080
expectation.fulfill()
81-
}
81+
})
8282

8383
waitForExpectations(timeout: 1.0, handler: nil)
8484
}
@@ -90,10 +90,10 @@ class SessionCallbackQueueTests: XCTestCase {
9090
let expectation = self.expectation(description: "wait for response")
9191
let request = TestRequest()
9292

93-
session.send(request, callbackQueue: nil) { result in
93+
session.send(request, callbackQueue: nil, completionHandler: { result in
9494
XCTAssertEqual(OperationQueue.current, operationQueue)
9595
expectation.fulfill()
96-
}
96+
})
9797

9898
waitForExpectations(timeout: 1.0, handler: nil)
9999
}

‎Tests/APIKitTests/SessionTests.swift

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ class SessionTests: XCTestCase {
2020
let expectation = self.expectation(description: "wait for response")
2121
let request = TestRequest()
2222

23-
session.send(request) { response in
23+
session.send(request, completionHandler: { response in
2424
switch response {
2525
case .success(let dictionary):
2626
XCTAssertEqual((dictionary as? [String: String])?["key"], "value")
2727

2828
case .failure:
2929
XCTFail()
3030
}
31-
31+
3232
expectation.fulfill()
33-
}
33+
})
3434

3535
waitForExpectations(timeout: 1.0, handler: nil)
3636
}
@@ -42,17 +42,17 @@ class SessionTests: XCTestCase {
4242
let expectation = self.expectation(description: "wait for response")
4343
let request = TestRequest()
4444

45-
session.send(request) { result in
45+
session.send(request, completionHandler: { result in
4646
if case .failure(let error) = result,
4747
case .responseError(let responseError as NSError) = error {
4848
XCTAssertEqual(responseError.domain, NSCocoaErrorDomain)
4949
XCTAssertEqual(responseError.code, 3840)
5050
} else {
5151
XCTFail()
5252
}
53-
53+
5454
expectation.fulfill()
55-
}
55+
})
5656

5757
waitForExpectations(timeout: 1.0, handler: nil)
5858
}
@@ -63,7 +63,7 @@ class SessionTests: XCTestCase {
6363
let expectation = self.expectation(description: "wait for response")
6464
let request = TestRequest()
6565

66-
session.send(request) { result in
66+
session.send(request, completionHandler: { result in
6767
if case .failure(let error) = result,
6868
case .responseError(let responseError as ResponseError) = error,
6969
case .unacceptableStatusCode(let statusCode) = responseError {
@@ -73,7 +73,7 @@ class SessionTests: XCTestCase {
7373
}
7474

7575
expectation.fulfill()
76-
}
76+
})
7777

7878
waitForExpectations(timeout: 1.0, handler: nil)
7979
}
@@ -84,7 +84,7 @@ class SessionTests: XCTestCase {
8484
let expectation = self.expectation(description: "wait for response")
8585
let request = TestRequest()
8686

87-
session.send(request) { result in
87+
session.send(request, completionHandler: { result in
8888
if case .failure(let error) = result,
8989
case .responseError(let responseError as ResponseError) = error,
9090
case .nonHTTPURLResponse(let urlResponse) = responseError {
@@ -94,7 +94,7 @@ class SessionTests: XCTestCase {
9494
}
9595

9696
expectation.fulfill()
97-
}
97+
})
9898

9999
waitForExpectations(timeout: 1.0, handler: nil)
100100
}
@@ -108,7 +108,7 @@ class SessionTests: XCTestCase {
108108
throw Error()
109109
}
110110

111-
session.send(request) { result in
111+
session.send(request, completionHandler: { result in
112112
if case .failure(let error) = result,
113113
case .requestError(let requestError) = error {
114114
XCTAssert(requestError is Error)
@@ -117,7 +117,7 @@ class SessionTests: XCTestCase {
117117
}
118118

119119
expectation.fulfill()
120-
}
120+
})
121121

122122
waitForExpectations(timeout: 1.0, handler: nil)
123123

@@ -128,7 +128,7 @@ class SessionTests: XCTestCase {
128128
let expectation = self.expectation(description: "wait for response")
129129
let request = TestRequest()
130130

131-
session.send(request) { result in
131+
session.send(request, completionHandler: { result in
132132
if case .failure(let error) = result,
133133
case .connectionError(let connectionError as NSError) = error {
134134
XCTAssertEqual(connectionError.code, 0)
@@ -137,7 +137,7 @@ class SessionTests: XCTestCase {
137137
}
138138

139139
expectation.fulfill()
140-
}
140+
})
141141

142142
session.cancelRequests(with: TestRequest.self)
143143

@@ -148,24 +148,24 @@ class SessionTests: XCTestCase {
148148
let successExpectation = expectation(description: "wait for response")
149149
let successRequest = TestRequest(path: "/success")
150150

151-
session.send(successRequest) { result in
151+
session.send(successRequest, completionHandler: { result in
152152
if case .failure = result {
153153
XCTFail()
154154
}
155155

156156
successExpectation.fulfill()
157-
}
157+
})
158158

159159
let failureExpectation = expectation(description: "wait for response")
160160
let failureRequest = TestRequest(path: "/failure")
161161

162-
session.send(failureRequest) { result in
162+
session.send(failureRequest, completionHandler: { result in
163163
if case .success = result {
164164
XCTFail()
165165
}
166166

167167
failureExpectation.fulfill()
168-
}
168+
})
169169

170170
session.cancelRequests(with: TestRequest.self) { request in
171171
return request.path == failureRequest.path
@@ -194,24 +194,24 @@ class SessionTests: XCTestCase {
194194
let successExpectation = expectation(description: "wait for response")
195195
let successRequest = AnotherTestRequest()
196196

197-
session.send(successRequest) { result in
197+
session.send(successRequest, completionHandler: { result in
198198
if case .failure = result {
199199
XCTFail()
200200
}
201201

202202
successExpectation.fulfill()
203-
}
203+
})
204204

205205
let failureExpectation = expectation(description: "wait for response")
206206
let failureRequest = TestRequest()
207207

208-
session.send(failureRequest) { result in
208+
session.send(failureRequest, completionHandler: { result in
209209
if case .success = result {
210210
XCTFail()
211211
}
212212

213213
failureExpectation.fulfill()
214-
}
214+
})
215215

216216
session.cancelRequests(with: TestRequest.self)
217217

0 commit comments

Comments
 (0)