Updates Package (#15)

* Updates Package

* Updates availability of Cached

Co-authored-by: danthorpe <danthorpe@users.noreply.github.com>

Author: danthorpe

Package.resolved

@@ -1,37 +1,87 @@
 // swift-tools-version: 5.7
-
 import PackageDescription
 
-let package = Package(
-    name: "danthorpe-networking",
-    platforms: [
-        .macOS(.v12),
-        .iOS(.v15),
-        .tvOS(.v15),
-        .watchOS(.v8)
-    ],
-    products: [
-        .library(name: "Networking", targets: ["Networking"]),
-    ],
-    dependencies: [
-        .package(url: "https://github.com/pointfreeco/swift-tagged", from: "0.7.0"),
-        .package(url: "https://github.com/pointfreeco/swift-url-routing", branch: "main"),
-        .package(url: "https://github.com/danthorpe/danthorpe-utilities", branch: "main"),
-        .package(url: "https://github.com/danthorpe/danthorpe-plugins", branch: "main"),
-    ],
-    targets: [
-        .target(
-            name: "Networking",
-            dependencies: [
-                .product(name: "Cache", package: "danthorpe-utilities"),
-                .product(name: "ShortID", package: "danthorpe-utilities"),
-                .product(name: "Tagged", package: "swift-tagged"),
-                .product(name: "URLRouting", package: "swift-url-routing")
-            ],
-            plugins: [
-                .plugin(name: "SwiftLintPlugin", package: "danthorpe-plugins")
-            ]
-        ),
-        .testTarget(name: "NetworkingTests", dependencies: ["Networking"]),
-      ]
-)
+var package = Package(name: "danthorpe-networking")
+
+// MARK: - Platforms
+
+package.platforms = [
+    .macOS(.v12),
+    .iOS(.v14),
+    .tvOS(.v14),
+    .watchOS(.v7)
+]
+
+package.dependencies = [
+    .package(url: "https://github.com/pointfreeco/swift-tagged", from: "0.7.0"),
+    .package(url: "https://github.com/pointfreeco/swift-url-routing", branch: "main"),
+    .package(url: "https://github.com/danthorpe/danthorpe-utilities", from: "0.2.0"),
+    .package(url: "https://github.com/danthorpe/danthorpe-plugins", from: "0.2.0"),
+]
+
+// MARK: - Names
+
+let Networking = "Networking"
+
+extension String {
+    var tests: String { "\(self)Tests" }
+}
+
+// MARK: - Products
+
+package.products = [
+    .library(name: Networking, targets: [Networking])
+]
+
+// MARK: Targets
+
+extension Target {
+    static let networking: Target = .target(
+        name: Networking,
+        dependencies: [
+            .cache, .shortID, .tagged, .URLRouting
+        ],
+        plugins: [
+            .swiftLint
+        ]
+    )
+    static let networkingTests: Target = .testTarget(
+        name: Networking.tests,
+        dependencies: [
+            .networking
+        ]
+    )
+}
+
+package.targets = [
+    .networking,
+    .networkingTests
+]
+
+// MARK: - Dependencies
+
+extension Target.Dependency {
+    static let networking: Target.Dependency = .target(
+        name: Networking
+    )
+    static let cache: Target.Dependency = .product(
+        name: "Cache", package: "danthorpe-utilities"
+    )
+    static let shortID: Target.Dependency = .product(
+        name: "ShortID", package: "danthorpe-utilities"
+    )
+    static let tagged: Target.Dependency = .product(
+        name: "Tagged", package: "swift-tagged"
+    )
+    static let URLRouting: Target.Dependency = .product(
+        name: "URLRouting", package: "swift-url-routing"
+    )
+}
+
+// MARK: - Plugins
+
+extension Target.PluginUsage {
+    static let swiftLint: Target.PluginUsage = .plugin(
+        name: "SwiftLint", package: "danthorpe-plugins"
+    )
+}

Package.swift

@@ -20,7 +20,6 @@ extension NetworkStack {
                 let cancel: () -> Void = { dataTask?.cancel() }
 
                 return try await withTaskCancellationHandler(
-                    handler: { cancel() },
                     operation: {
                         try await withCheckedThrowingContinuation { continuation in
                             dataTask = session.dataTask(with: request) { data, response, error in
@@ -40,6 +39,8 @@ extension NetworkStack {
                             // Resume the data task
                             dataTask?.resume()
                         }
+                    }, onCancel: {
+                        cancel()
                     }
                 )
             }

Sources/Networking/NetworkStack.swift

@@ -15,8 +15,10 @@ public enum CacheOption {
 
 // MARK: - Cached Network Stack
 
+@available(iOS 15.0, *)
 public typealias NetworkCache = Cache<URLRequestData, URLResponseData>
 
+@available(iOS 15.0, *)
 public struct Cached<Upstream: NetworkStackable>: NetworkStackable {
     private(set) var cache: NetworkCache
     public let upstream: Upstream
@@ -58,6 +60,7 @@ public struct Cached<Upstream: NetworkStackable>: NetworkStackable {
     }
 }
 
+@available(iOS 15.0, *)
 public extension NetworkStackable {
 
     func cached(size: Int = 100, fileName: String) -> Cached<Self> {

Sources/Networking/Stack Components/Cached.swift

@@ -1,4 +1,3 @@
-import Concurrency
 import Foundation
 import os.log
 import URLRouting