Merge pull request #25 from mattpolzin/openapikit-3

Switch to OpenAPIKit 3.0.0

Author: mattpolzin

.github/workflows/tests.yml

@@ -13,24 +13,23 @@ jobs:
       fail-fast: false
       matrix:
         image:
-          - swift:5.3-xenial
-          - swift:5.3-bionic
-          - swift:5.3-focal
-          - swift:5.3-centos8
-          - swift:5.3-amazonlinux2
+          - swift:5.9-focal
+          - swift:5.9-jammy
+          - swift:5.9-amazonlinux2
     container: ${{ matrix.image }}
     steps:
     - name: Checkout code
       uses: actions/checkout@v3
     - name: Run tests
-      run: swift test --enable-test-discovery
+      run: swift test
   osx:
-    runs-on: macOS-latest
+    runs-on: macOS-13
     steps:
       - name: Select latest available Xcode
         uses: maxim-lobanov/setup-xcode@v1
-        with: { 'xcode-version': 'latest' }
+        with: 
+          xcode-version: latest
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Run tests
-        run: swift test --enable-test-discovery
+        run: swift test

Package.resolved

@@ -1,11 +1,11 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.8
 
 import PackageDescription
 
 let package = Package(
     name: "JSONAPI-OpenAPI",
     platforms: [
-        .macOS(.v10_11),
+        .macOS(.v12),
     ],
     products: [
         .library(
@@ -21,20 +21,20 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/mattpolzin/Sampleable.git", from: "2.0.0"),
         .package(url: "https://github.com/mattpolzin/JSONAPI.git", from: "5.0.0"),
-        .package(url: "https://github.com/mattpolzin/OpenAPIKit.git", from: "2.0.0"),
-        .package(url: "https://github.com/mattpolzin/OpenAPIReflection.git", from: "1.0.0"),
+        .package(url: "https://github.com/mattpolzin/OpenAPIKit.git", from: "3.0.0"),
+        .package(url: "https://github.com/mattpolzin/OpenAPIReflection.git", from: "2.0.0"),
         .package(url: "https://github.com/typelift/SwiftCheck.git", .upToNextMinor(from: "0.12.0")),
-        .package(url: "https://github.com/apple/swift-format.git", from: "0.50300.0"),
-        .package(name: "NonEmpty", url: "https://github.com/pointfreeco/swift-nonempty.git", .upToNextMinor(from: "0.2.0")),
-        .package(url: "https://github.com/mattpolzin/JSONAPIViz.git", .exact("0.0.6"))
+        .package(url: "https://github.com/apple/swift-format.git", from: "509.0.0"),
+        .package(url: "https://github.com/pointfreeco/swift-nonempty.git", .upToNextMinor(from: "0.2.0")),
+        .package(url: "https://github.com/mattpolzin/JSONAPIViz.git", exact: "0.0.6")
     ],
     targets: [
         .target(
             name: "JSONAPIOpenAPI",
             dependencies: [
                 "JSONAPI",
-                "OpenAPIKit",
-                "OpenAPIReflection",
+                .product(name: "OpenAPIKit30", package: "OpenAPIKit"),
+                .product(name: "OpenAPIReflection30", package: "OpenAPIReflection"),
                 "Sampleable"
             ]
         ),
@@ -51,10 +51,10 @@ let package = Package(
             name: "JSONAPISwiftGen",
             dependencies: [
                 "JSONAPI",
-                "OpenAPIKit",
+                .product(name: "OpenAPIKit30", package: "OpenAPIKit"),
                 .product(name: "SwiftFormat", package: "swift-format"),
                 .product(name: "SwiftFormatConfiguration", package: "swift-format"),
-                .product(name: "NonEmpty", package: "NonEmpty")
+                .product(name: "NonEmpty", package: "swift-nonempty")
             ]
         ),
         .testTarget(