Merge pull request #8 from alexsteinerde/update-swift-version

Update Swift version to 5.4

.github/workflows/build.yml

@@ -1,27 +1,17 @@
 name: build
 on: [push, pull_request]
 jobs:
-  xenial:
-    container: 
-      image: swift:xenial
+  tests:
     runs-on: ubuntu-latest
+    container: swift:5.7-jammy
     steps:
     - uses: actions/checkout@v1
     - run: apt-get -qq update && apt-get -q -y install libpq-dev libssl-dev zlib1g-dev
-    - run: swift test --enable-test-discovery --sanitize=thread
-  bionic:
-    container: 
-      image: swift:bionic
+    - run: swift test --sanitize=thread
+  tests-release:
     runs-on: ubuntu-latest
+    container: swift:5.7-jammy
     steps:
     - uses: actions/checkout@v1
     - run: apt-get -qq update && apt-get -q -y install libpq-dev libssl-dev zlib1g-dev
-    - run: swift test --enable-test-discovery --sanitize=thread
-  bionic-release:
-    container: 
-      image: swift:bionic
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - run: apt-get -qq update && apt-get -q -y install libpq-dev libssl-dev zlib1g-dev
-    - run: swift build -c release
+    - run: swift test -c release --sanitize=thread

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.4
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -9,10 +9,7 @@ let package = Package(
         .macOS(.v10_15)
     ],
     products: [
-        // Products define the executables and libraries produced by a package, and make them visible to other packages.
-        .library(
-            name: "GraphiQLVapor",
-            targets: ["GraphiQLVapor"]),
+        .library(name: "GraphiQLVapor", targets: ["GraphiQLVapor"]),
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
@@ -23,9 +20,12 @@ let package = Package(
         // Targets can depend on other targets in this package, and on products in packages which this package depends on.
         .target(
             name: "GraphiQLVapor",
-            dependencies: ["Vapor"]),
-        .testTarget(
-            name: "GraphiQLVaporTests",
-            dependencies: ["GraphiQLVapor", "Vapor", "XCTVapor"]),
+            dependencies: [
+                .product(name: "Vapor", package: "vapor"),
+            ]),
+        .testTarget(name: "GraphiQLVaporTests", dependencies: [
+            .target(name: "GraphiQLVapor"),
+            .product(name: "XCTVapor", package: "vapor"),
+        ]),
     ]
 )

README.md

@@ -1,5 +1,5 @@
 # GraphiQLVapor
-[![Language](https://img.shields.io/badge/Swift-5.1-brightgreen.svg)](http://swift.org)
+[![Language](https://img.shields.io/badge/Swift-5.4-brightgreen.svg)](http://swift.org)
 [![Vapor Version](https://img.shields.io/badge/Vapor-4-F6CBCA.svg)](http://vapor.codes)
 [![build](https://github.com/alexsteinerde/graphiql-vapor/workflows/build/badge.svg)](https://github.com/alexsteinerde/graphiql-vapor/actions)
 
@@ -11,10 +11,15 @@ import PackageDescription
 
 let package = Package(
     dependencies: [
-    .package(url: "https://github.com/alexsteinerde/graphiql-vapor.git", from: "2.0.0"),
+        .package(url: "https://github.com/alexsteinerde/graphiql-vapor.git", from: "2.2.0"),
     ],
     targets: [
-    .target(name: "App", dependencies: ["GraphiQLVapor"]),
+        .target(
+            name: "App",
+            dependencies: [
+                .product(name: "GraphiQLVapor", package: "graphiql-vapor"),
+            ]
+        ),
     ...
     ]
 )

Tests/GraphiQLVaporTests/GraphiQLVaporTests.swift

@@ -25,9 +25,4 @@ final class GraphiQLVaporTests: XCTestCase {
             XCTAssertEqual(res.status, HTTPResponseStatus.ok)
         }
     }
-
-    static var allTests = [
-        ("testRegistering", testRegistering),
-        ("testRegisterOnOtherRoute", testRegisterOnOtherRoute)
-    ]
 }