Merge pull request #17 from MFB-Technologies-Inc/swift-http-types

HTTPTypes
MFB-Technologies-Inc · Apr 19, 2024 · 9a0c6a0 · 9a0c6a0
2 parents 778c696 + 0125c10
commit 9a0c6a0
Show file tree

Hide file tree

Showing 32 changed files with 358 additions and 972 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,12 +24,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: macos-13
-            xcode: 14.2 # Swift 5.7
-          - os: macos-13
-            xcode: 14.3 # Swift 5.8
-          - os: macos-13
-            xcode: '15.0' # Swift 5.9
+          - os: macos-14
+            xcode: '15.3' # Swift 5.10
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3

diff --git a/.swiftformat b/.swiftformat
@@ -1,6 +1,6 @@
 --extensionacl on-declarations
 --redundanttype explicit
---swiftversion 5.5
+--swiftversion 5.10
 --maxwidth 120
 --header "{file}\nNetworkService\n\nCopyright © {year} MFB Technologies, Inc. All rights reserved.\n\nThis source code is licensed under the MIT license found in the\nLICENSE file in the root directory of this source tree."
 --allman false
diff --git a/Package.resolved b/Package.resolved
@@ -1,43 +1,59 @@
 {
-  "object": {
-    "pins": [
-      {
-        "package": "combine-schedulers",
-        "repositoryURL": "https://github.com/pointfreeco/combine-schedulers.git",
-        "state": {
-          "branch": null,
-          "revision": "9dc9cbe4bc45c65164fa653a563d8d8db61b09bb",
-          "version": "1.0.0"
-        }
-      },
-      {
-        "package": "OHHTTPStubs",
-        "repositoryURL": "https://github.com/AliSoftware/OHHTTPStubs.git",
-        "state": {
-          "branch": null,
-          "revision": "12f19662426d0434d6c330c6974d53e2eb10ecd9",
-          "version": "9.1.0"
-        }
-      },
-      {
-        "package": "swift-concurrency-extras",
-        "repositoryURL": "https://github.com/pointfreeco/swift-concurrency-extras",
-        "state": {
-          "branch": null,
-          "revision": "ea631ce892687f5432a833312292b80db238186a",
-          "version": "1.0.0"
-        }
-      },
-      {
-        "package": "xctest-dynamic-overlay",
-        "repositoryURL": "https://github.com/pointfreeco/xctest-dynamic-overlay",
-        "state": {
-          "branch": null,
-          "revision": "302891700c7fa3b92ebde9fe7b42933f8349f3c7",
-          "version": "1.0.0"
-        }
+  "pins" : [
+    {
+      "identity" : "combine-schedulers",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/combine-schedulers.git",
+      "state" : {
+        "revision" : "9dc9cbe4bc45c65164fa653a563d8d8db61b09bb",
+        "version" : "1.0.0"
       }
-    ]
-  },
-  "version": 1
+    },
+    {
+      "identity" : "ohhttpstubs",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/AliSoftware/OHHTTPStubs.git",
+      "state" : {
+        "revision" : "12f19662426d0434d6c330c6974d53e2eb10ecd9",
+        "version" : "9.1.0"
+      }
+    },
+    {
+      "identity" : "swift-concurrency-extras",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-concurrency-extras",
+      "state" : {
+        "revision" : "bb5059bde9022d69ac516803f4f227d8ac967f71",
+        "version" : "1.1.0"
+      }
+    },
+    {
+      "identity" : "swift-custom-dump",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-custom-dump.git",
+      "state" : {
+        "revision" : "f01efb26f3a192a0e88dcdb7c3c391ec2fc25d9c",
+        "version" : "1.3.0"
+      }
+    },
+    {
+      "identity" : "swift-http-types",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-http-types.git",
+      "state" : {
+        "revision" : "12358d55a3824bd5fed310b999ea8cf83a9a1a65",
+        "version" : "1.0.3"
+      }
+    },
+    {
+      "identity" : "xctest-dynamic-overlay",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
+      "state" : {
+        "revision" : "b13b1d1a8e787a5ffc71ac19dcaf52183ab27ba2",
+        "version" : "1.1.1"
+      }
+    }
+  ],
+  "version" : 2
 }
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.6
+// swift-tools-version:5.10
 
 import PackageDescription
 
@@ -25,38 +25,65 @@ extension Product {
 
 extension Target {
     static let targets: [Target] = [
-        .target(name: "NetworkService"),
+        .target(
+            name: "NetworkService",
+            dependencies: [
+                .product(name: "HTTPTypes", package: "swift-http-types"),
+                .product(name: "HTTPTypesFoundation", package: "swift-http-types"),
+            ],
+            swiftSettings: .shared
+        ),
         .testTarget(
             name: "NetworkServiceTests",
             dependencies: [
+                .product(name: "CustomDump", package: "swift-custom-dump"),
                 "NetworkService",
                 .product(name: "OHHTTPStubs", package: "OHHTTPStubs"),
                 .product(name: "OHHTTPStubsSwift", package: "OHHTTPStubs"),
-            ]
+            ],
+            swiftSettings: .shared
         ),
         .target(
             name: "NetworkServiceTestHelper",
             dependencies: [
                 "NetworkService",
                 .product(name: "CombineSchedulers", package: "combine-schedulers"),
-            ]
+            ],
+            swiftSettings: .shared
         ),
         .testTarget(
             name: "NetworkServiceTestHelperTests",
             dependencies: [
                 "NetworkServiceTestHelper",
                 .product(name: "CombineSchedulers", package: "combine-schedulers"),
-            ]
+                .product(name: "CustomDump", package: "swift-custom-dump"),
+            ],
+            swiftSettings: .shared
         ),
     ]
 }
 
+extension [SwiftSetting] {
+    static let shared: [SwiftSetting] = [
+        .enableUpcomingFeature("ExistentialAny"),
+        .enableExperimentalFeature("StrictConcurrency"),
+    ]
+}
+
 extension Package.Dependency {
     static let dependencies: [Package.Dependency] = [
-        .package(url: "https://github.com/AliSoftware/OHHTTPStubs.git", from: "9.1.0"),
+        .package(
+            url: "https://github.com/AliSoftware/OHHTTPStubs.git",
+            from: "9.1.0"
+        ),
         .package(
             url: "https://github.com/pointfreeco/combine-schedulers.git",
             from: "1.0.0"
         ),
+        .package(
+            url: "https://github.com/apple/swift-http-types.git",
+            from: "1.0.0"
+        ),
+        .package(url: "https://github.com/pointfreeco/swift-custom-dump.git", from: "1.0.0"),
     ]
 }
diff --git a/[email protected] b/[email protected]