Async/Await iOS 13 Support

.github/workflows/release.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   release:
     name: Make CocoaPods release
-    runs-on: macOS-latest
+    runs-on: macos-11
     steps:
       - name: Checkout
         uses: actions/checkout@v2

.github/workflows/tests.yml

@@ -14,7 +14,7 @@ on:
 jobs:
   test:
     name: Run tests
-    runs-on: macOS-latest
+    runs-on: macos-11
     steps:
       - name: Checkout
         uses: actions/checkout@v2

Sources/Apexy/Client.swift

@@ -28,12 +28,12 @@ public protocol Client: AnyObject {
 
     /// Send request to specified endpoint.
     /// - Returns: response data from the server for the request.
-    @available(macOS 12, iOS 15, watchOS 8, tvOS 15, *)
+    @available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
     func request<T>(_ endpoint: T) async throws -> T.Content where T: Endpoint
 
     /// Upload data to specified endpoint.
     /// - Returns: response data from the server for the upload.
-    @available(macOS 12, iOS 15, watchOS 8, tvOS 15, *)
+    @available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
     func upload<T>(_ endpoint: T) async throws -> T.Content where T: UploadEndpoint
 
 }

Sources/ApexyAlamofire/AlamofireClient.swift

@@ -5,6 +5,7 @@
 //  Copyright © 2019 RedMadRobot. All rights reserved.
 //
 
+import Apexy
 import Foundation
 import Alamofire
 
@@ -179,7 +180,7 @@ open class AlamofireClient: Client {
         return progress
     }
 
-    @available(macOS 12, iOS 15, watchOS 8, tvOS 15, *)
+    @available(macOS 10.15, iOS 12, watchOS 6, tvOS 13, *)
     public func request<T>(_ endpoint: T) async throws -> T.Content where T : Endpoint {
         typealias ContentContinuation = CheckedContinuation<T.Content, Error>
         let progressWrapper = ProgressWrapper()
@@ -192,7 +193,7 @@ open class AlamofireClient: Client {
         })
     }
 
-    @available(macOS 12, iOS 15, watchOS 8, tvOS 15, *)
+    @available(macOS 10.15, iOS 12, watchOS 6, tvOS 13, *)
     public func upload<T>(_ endpoint: T) async throws -> T.Content where T : UploadEndpoint {
         typealias ContentContinuation = CheckedContinuation<T.Content, Error>
         let progressWrapper = ProgressWrapper()
@@ -247,7 +248,7 @@ public extension Error {
     }
 }
 
-@available(macOS 12, iOS 15, watchOS 8, tvOS 15, *)
+@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
 private final class ProgressWrapper {
 
     var progress: Progress? {

Sources/ApexyURLSession/URLSession+AsyncAwait13.swift

@@ -0,0 +1,73 @@
+//
+//  URLSession+AsyncAwait13.swift
+//  ApexyURLSession
+//
+//  Created by Aleksei Tiurnin on 20.01.2022.
+//
+
+import Foundation
+
+extension URLSession {
+    @available(macOS, introduced: 10.15, deprecated: 12, message: "Extension is no longer necessary. Use API built into SDK")
+    @available(iOS, introduced: 13, deprecated: 15, message: "Extension is no longer necessary. Use API built into SDK")
+    @available(watchOS, introduced: 6, deprecated: 8, message: "Extension is no longer necessary. Use API built into SDK")
+    @available(tvOS, introduced: 13, deprecated: 15, message: "Extension is no longer necessary. Use API built into SDK")
+    func data(
+        for request: URLRequest,
+        delegate: URLSessionTaskDelegate? = nil) async throws -> (Data, URLResponse) {
+        try await withCheckedThrowingContinuation { continuation in
+            let task = self.dataTask(with: request) { data, response, error in
+                guard let data = data, let response = response else {
+                    let error = error ?? URLError(.badServerResponse)
+                    return continuation.resume(throwing: error)
+                }
+
+                continuation.resume(returning: (data, response))
+            }
+
+            task.resume()
+        }
+    }
+
+    @available(macOS, introduced: 10.15, deprecated: 12, message: "Extension is no longer necessary. Use API built into SDK")
+    @available(iOS, introduced: 13, deprecated: 15, message: "Extension is no longer necessary. Use API built into SDK")
+    @available(watchOS, introduced: 6, deprecated: 8, message: "Extension is no longer necessary. Use API built into SDK")
+    @available(tvOS, introduced: 13, deprecated: 15, message: "Extension is no longer necessary. Use API built into SDK")
+    public func upload(
+        for request: URLRequest,
+        fromFile fileURL: URL,
+        delegate: URLSessionTaskDelegate? = nil) async throws -> (Data, URLResponse) {
+        try await withCheckedThrowingContinuation { continuation in
+            let task = self.uploadTask(with: request, fromFile: fileURL) { data, response, error in
+                guard let data = data, let response = response else {
+                    let error = error ?? URLError(.badServerResponse)
+                    return continuation.resume(throwing: error)
+                }
+
+                continuation.resume(returning: (data, response))
+            }
+            task.resume()
+        }
+    }
+
+    @available(macOS, introduced: 10.15, deprecated: 12, message: "Extension is no longer necessary. Use API built into SDK")
+    @available(iOS, introduced: 13, deprecated: 15, message: "Extension is no longer necessary. Use API built into SDK")
+    @available(watchOS, introduced: 6, deprecated: 8, message: "Extension is no longer necessary. Use API built into SDK")
+    @available(tvOS, introduced: 13, deprecated: 15, message: "Extension is no longer necessary. Use API built into SDK")
+    public func upload(
+        for request: URLRequest,
+        from bodyData: Data,
+        delegate: URLSessionTaskDelegate? = nil) async throws -> (Data, URLResponse) {
+        try await withCheckedThrowingContinuation { continuation in
+            let task = self.uploadTask(with: request, from: bodyData) { data, response, error in
+                guard let data = data, let response = response else {
+                    let error = error ?? URLError(.badServerResponse)
+                    return continuation.resume(throwing: error)
+                }
+
+                continuation.resume(returning: (data, response))
+            }
+            task.resume()
+        }
+    }
+}

Sources/ApexyURLSession/URLSessionClient.swift

@@ -1,3 +1,4 @@
+import Apexy
 import Foundation
 
 open class URLSessionClient: Client {
@@ -127,7 +128,7 @@ open class URLSessionClient: Client {
         return task.progress
     }
 
-    @available(macOS 12, iOS 15, watchOS 8, tvOS 15, *)
+    @available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
     open func request<T>(_ endpoint: T) async throws -> T.Content where T : Endpoint {
         var request = try endpoint.makeRequest()
         request = try requestAdapter.adapt(request)
@@ -156,7 +157,7 @@ open class URLSessionClient: Client {
         }
     }
 
-    @available(macOS 12, iOS 15, watchOS 8, tvOS 15, *)
+    @available(macOS 10.15, iOS 12, watchOS 6, tvOS 13, *)
     open func upload<T>(_ endpoint: T) async throws -> T.Content where T : UploadEndpoint {
         var request: (request: URLRequest, body: UploadEndpointBody) = try endpoint.makeRequest()
         request.request = try requestAdapter.adapt(request.request)

Tests/ApexyURLSessionTests/URLSessionClientTests.swift

@@ -119,6 +119,42 @@ final class URLSessionClientTests: XCTestCase {
 
         wait(for: [exp], timeout: 0.1)
     }
+
+    @available(iOS 13.0, *)
+    @available(macOS 10.15, *)
+    func testClientDataRequestUsingAsyncAwait() async throws {
+        let endpoint = EmptyEndpoint()
+        let data = "Test".data(using: .utf8)!
+        MockURLProtocol.requestHandler = { request in
+            let response = HTTPURLResponse(url: request.url!, statusCode: 200, httpVersion: "2.0", headerFields: nil)!
+            return (response, data)
+        }
+
+        do {
+            let content = try await client.request(endpoint)
+            XCTAssertEqual(content, data)
+        } catch {
+            XCTFail("Expected result: .success, actual result: .failure")
+        }
+    }
+
+    @available(iOS 13.0, *)
+    @available(macOS 10.15, *)
+    func testClientUploadUsingAsyncAwait() async throws {
+        let data = "apple".data(using: .utf8)!
+        let endpoint = SimpleUploadEndpoint(data: data)
+        MockURLProtocol.requestHandler = { request in
+            let response = HTTPURLResponse(url: request.url!, statusCode: 200, httpVersion: "2.0", headerFields: nil)!
+            return (response, data)
+        }
+
+        do {
+            let content = try await client.upload(endpoint)
+            XCTAssertEqual(content, data)
+        } catch {
+            XCTFail("Expected result: .success, actual result: .failure")
+        }
+    }
 }
 
 private final class MockURLProtocol: URLProtocol {