Merge pull request #6 from MFB-Technologies-Inc/bugfix/async-beta-doe…

…s-not-support-urlsessiondelegate
MFB-Technologies-Inc · Feb 8, 2023 · 71806bf · 71806bf
2 parents c8ffdc2 + 39a21c9
commit 71806bf
Show file tree

Hide file tree

Showing 56 changed files with 90 additions and 88 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,14 +21,20 @@ jobs:
           - '12.5.1'
           - '13.2'
           - '13.4'
-          - '14.0'
+          - '14.0.1'
+          - '14.1'
+          - '14.2'
         exclude:
           - os: macos-11
             xcode: '13.2'
           - os: macos-11
             xcode: '13.4'
           - os: macos-11
-            xcode: '14.0'
+            xcode: '14.0.1'
+          - os: macos-11
+            xcode: '14.1'
+          - os: macos-11
+            xcode: '14.2'
           - os: macos-12
             xcode: '12.4'
           - os: macos-12

diff --git a/Package.resolved b/Package.resolved
@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/pointfreeco/combine-schedulers.git",
         "state": {
           "branch": null,
-          "revision": "aa3e575929f2bcc5bad012bd2575eae716cbcdf7",
-          "version": "0.8.0"
+          "revision": "882ac01eb7ef9e36d4467eb4b1151e74fcef85ab",
+          "version": "0.9.1"
         }
       },
       {
@@ -24,8 +24,8 @@
         "repositoryURL": "https://github.com/pointfreeco/xctest-dynamic-overlay",
         "state": {
           "branch": null,
-          "revision": "30314f1ece684dd60679d598a9b89107557b67d9",
-          "version": "0.4.1"
+          "revision": "ace21305e0dd3a9e749aef79fef14be79a3b4669",
+          "version": "0.8.2"
         }
       }
     ]

diff --git a/Sources/NetworkService/HTTPURLResponse+StatusCode.swift b/Sources/NetworkService/HTTPURLResponse+StatusCode.swift
@@ -1,7 +1,7 @@
 // HTTPURLResponse+StatusCode.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/Sources/NetworkService/NetworkService.swift b/Sources/NetworkService/NetworkService.swift
@@ -1,7 +1,7 @@
 // NetworkService.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/Sources/NetworkService/NetworkServiceClient+Delete.swift b/Sources/NetworkService/NetworkServiceClient+Delete.swift
@@ -1,7 +1,7 @@
 // NetworkServiceClient+Delete.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/Sources/NetworkService/NetworkServiceClient+Get.swift b/Sources/NetworkService/NetworkServiceClient+Get.swift
@@ -1,7 +1,7 @@
 // NetworkServiceClient+Get.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/Sources/NetworkService/NetworkServiceClient+GetSession.swift b/Sources/NetworkService/NetworkServiceClient+GetSession.swift
@@ -1,7 +1,7 @@
 // NetworkServiceClient+GetSession.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/Sources/NetworkService/NetworkServiceClient+Post.swift b/Sources/NetworkService/NetworkServiceClient+Post.swift
@@ -1,7 +1,7 @@
 // NetworkServiceClient+Post.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/Sources/NetworkService/NetworkServiceClient+Put.swift b/Sources/NetworkService/NetworkServiceClient+Put.swift
@@ -1,7 +1,7 @@
 // NetworkServiceClient+Put.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/Sources/NetworkService/NetworkServiceClient+Start.swift b/Sources/NetworkService/NetworkServiceClient+Start.swift
@@ -1,7 +1,7 @@
 // NetworkServiceClient+Start.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/Sources/NetworkService/NetworkServiceClient+URLSessionDelegate.swift b/Sources/NetworkService/NetworkServiceClient+URLSessionDelegate.swift
@@ -1,7 +1,7 @@
 // NetworkServiceClient+URLSessionDelegate.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/Sources/NetworkService/NetworkServiceClient.swift b/Sources/NetworkService/NetworkServiceClient.swift
@@ -1,7 +1,7 @@
 // NetworkServiceClient.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/Sources/NetworkService/Publisher+NetworkService.swift b/Sources/NetworkService/Publisher+NetworkService.swift
@@ -1,7 +1,7 @@
 // Publisher+NetworkService.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/Sources/NetworkService/TopLevelCodable.swift b/Sources/NetworkService/TopLevelCodable.swift
@@ -1,7 +1,7 @@
 // TopLevelCodable.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/Sources/NetworkService/URLRequest+HTTPHeader.swift b/Sources/NetworkService/URLRequest+HTTPHeader.swift
@@ -1,7 +1,7 @@
 // URLRequest+HTTPHeader.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/Sources/NetworkService/URLRequest+HTTPMethod.swift b/Sources/NetworkService/URLRequest+HTTPMethod.swift
@@ -1,7 +1,7 @@
 // URLRequest+HTTPMethod.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/Sources/NetworkServiceAsyncBeta/HTTPURLResponse+StatusCode.swift b/Sources/NetworkServiceAsyncBeta/HTTPURLResponse+StatusCode.swift
@@ -1,7 +1,7 @@
 // HTTPURLResponse+StatusCode.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/Sources/NetworkServiceAsyncBeta/NetworkService.swift b/Sources/NetworkServiceAsyncBeta/NetworkService.swift
@@ -1,7 +1,7 @@
 // NetworkService.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/Sources/NetworkServiceAsyncBeta/NetworkServiceClient+Delete.swift b/Sources/NetworkServiceAsyncBeta/NetworkServiceClient+Delete.swift
@@ -1,7 +1,7 @@
 // NetworkServiceClient+Delete.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/Sources/NetworkServiceAsyncBeta/NetworkServiceClient+Get.swift b/Sources/NetworkServiceAsyncBeta/NetworkServiceClient+Get.swift
@@ -1,7 +1,7 @@
 // NetworkServiceClient+Get.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/Sources/NetworkServiceAsyncBeta/NetworkServiceClient+GetSession.swift b/Sources/NetworkServiceAsyncBeta/NetworkServiceClient+GetSession.swift
@@ -1,7 +1,7 @@
 // NetworkServiceClient+GetSession.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/Sources/NetworkServiceAsyncBeta/NetworkServiceClient+Post.swift b/Sources/NetworkServiceAsyncBeta/NetworkServiceClient+Post.swift
@@ -1,7 +1,7 @@
 // NetworkServiceClient+Post.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/Sources/NetworkServiceAsyncBeta/NetworkServiceClient+Put.swift b/Sources/NetworkServiceAsyncBeta/NetworkServiceClient+Put.swift
@@ -1,7 +1,7 @@
 // NetworkServiceClient+Put.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/Sources/NetworkServiceAsyncBeta/NetworkServiceClient+Start.swift b/Sources/NetworkServiceAsyncBeta/NetworkServiceClient+Start.swift
@@ -1,7 +1,7 @@
 // NetworkServiceClient+Start.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -28,38 +28,34 @@ extension NetworkServiceClient {
 
     private func response(_ request: URLRequest) async throws -> (Data, URLResponse) {
         let session = getSession()
-        if #available(iOS 15, watchOS 8, macOS 12, macCatalyst 15, tvOS 15, *) {
-            return try await session.data(for: request)
-        } else {
-            var task: URLSessionDataTask?
-            var shouldCancel: Bool = false
-            let onCancel = {
-                if let task = task {
-                    task.cancel()
-                } else {
-                    shouldCancel = true
-                }
+        var task: URLSessionDataTask?
+        var shouldCancel: Bool = false
+        let onCancel = {
+            if let task = task {
+                task.cancel()
+            } else {
+                shouldCancel = true
             }
-            return try await withTaskCancellationHandler(
-                handler: { onCancel() },
-                operation: {
-                    try await withCheckedThrowingContinuation { continuation in
-                        task = session.dataTask(with: request, completionHandler: { _data, _urlResponse, _error in
-                            guard let data = _data, let urlResponse = _urlResponse else {
-                                return continuation.resume(throwing: _error ?? URLError(.badServerResponse))
-                            }
-                            continuation.resume(returning: (data, urlResponse))
-                        })
-
-                        if shouldCancel {
-                            task?.cancel()
-                        } else {
-                            task?.resume()
+        }
+        return try await withTaskCancellationHandler(
+            handler: { onCancel() },
+            operation: {
+                try await withCheckedThrowingContinuation { continuation in
+                    task = session.dataTask(with: request, completionHandler: { _data, _urlResponse, _error in
+                        guard let data = _data, let urlResponse = _urlResponse else {
+                            return continuation.resume(throwing: _error ?? URLError(.badServerResponse))
                         }
+                        continuation.resume(returning: (data, urlResponse))
+                    })
+
+                    if shouldCancel {
+                        task?.cancel()
+                    } else {
+                        task?.resume()
                     }
                 }
-            )
-        }
+            }
+        )
     }
 }
 

diff --git a/Sources/NetworkServiceAsyncBeta/NetworkServiceClient.swift b/Sources/NetworkServiceAsyncBeta/NetworkServiceClient.swift
@@ -1,7 +1,7 @@
 // NetworkServiceClient.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/Sources/NetworkServiceAsyncBeta/Result+NetworkService.swift b/Sources/NetworkServiceAsyncBeta/Result+NetworkService.swift
@@ -1,7 +1,7 @@
 // Result+NetworkService.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/Sources/NetworkServiceAsyncBeta/TopLevelCodable.swift b/Sources/NetworkServiceAsyncBeta/TopLevelCodable.swift
@@ -1,7 +1,7 @@
 // TopLevelCodable.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/Sources/NetworkServiceAsyncBeta/URLRequest+HTTPHeader.swift b/Sources/NetworkServiceAsyncBeta/URLRequest+HTTPHeader.swift
@@ -1,7 +1,7 @@
 // URLRequest+HTTPHeader.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/Sources/NetworkServiceAsyncBeta/URLRequest+HTTPMethod.swift b/Sources/NetworkServiceAsyncBeta/URLRequest+HTTPMethod.swift
@@ -1,7 +1,7 @@
 // URLRequest+HTTPMethod.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/Sources/NetworkServiceAsyncBeta/URLRequest+build.swift b/Sources/NetworkServiceAsyncBeta/URLRequest+build.swift
@@ -1,7 +1,7 @@
 // URLRequest+build.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/Sources/NetworkServiceTestHelper/MockNetworkService.swift b/Sources/NetworkServiceTestHelper/MockNetworkService.swift
@@ -1,7 +1,7 @@
 // MockNetworkService.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/Sources/NetworkServiceTestHelperAsyncBeta/CodableOutput.swift b/Sources/NetworkServiceTestHelperAsyncBeta/CodableOutput.swift
@@ -1,7 +1,7 @@
 // CodableOutput.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/Sources/NetworkServiceTestHelperAsyncBeta/Delay.swift b/Sources/NetworkServiceTestHelperAsyncBeta/Delay.swift
@@ -1,7 +1,7 @@
 // Delay.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/Sources/NetworkServiceTestHelperAsyncBeta/FailureOutput.swift b/Sources/NetworkServiceTestHelperAsyncBeta/FailureOutput.swift
@@ -1,7 +1,7 @@
 // FailureOutput.swift
 // NetworkService
 //
-// Copyright © 2022 MFB Technologies, Inc. All rights reserved.
+// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.