Update min Swift version to 5.6 and make platform versions consistent (…

…#217) Update minimum Swift version to 5.6 and make platform versions consistent.
vapor · Apr 14, 2023 · 829ae8f · 829ae8f
1 parent c5ca8e4
commit 829ae8f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -64,7 +64,7 @@ jobs:
   api-breakage:
     if: github.event_name == 'pull_request'
     runs-on: ubuntu-latest
-    container: swift:5.7-jammy
+    container: swift:5.8-jammy
     steps:
       - name: Check out package
         uses: actions/checkout@v3
@@ -78,20 +78,21 @@ jobs:
 
   # Unit tests (Linux)
   linux-unit:
-    if: github.event_name == 'pull_request'
+    if: ${{ github.event_name == 'pull_request' }}
     strategy:
       fail-fast: false
       matrix:
         dbimage:
           - mysql:5.7
           - mysql:8.0
-          - mariadb:10.3
-          - mariadb:10.7
+          - mariadb:10.4
+          - mariadb:10.11
           - percona:8.0
         runner:
-          - swift:5.5-bionic
           - swift:5.6-focal
           - swift:5.7-jammy
+          - swift:5.8-jammy
+          - swiftlang/swift:nightly-5.9-jammy
           - swiftlang/swift:nightly-main-jammy
     runs-on: ubuntu-latest
     container: ${{ matrix.runner }}
@@ -118,14 +119,13 @@ jobs:
 
   # Unit tests (macOS)
   macos-unit:
-    if: github.event_name == 'pull_request'
+    if: ${{ github.event_name == 'pull_request' }}
     strategy:
       fail-fast: false
       matrix:
         formula:
           - mysql@8.0
         macos:
-          - macos-11
           - macos-12
         xcode:
           - latest-stable
@@ -162,6 +162,7 @@ jobs:
   test-exports:
     name: Test exports
     runs-on: ubuntu-latest
+    container: swift:5.8-jammy
     steps:
       - name: Check out Vapor
         uses: actions/checkout@v3

diff --git a/Package.swift b/Package.swift
@@ -1,10 +1,13 @@
-// swift-tools-version:5.5
+// swift-tools-version:5.6
 import PackageDescription
 
 let package = Package(
     name: "fluent-mysql-driver",
     platforms: [
-       .macOS(.v10_15)
+        .macOS(.v10_15),
+        .iOS(.v13),
+        .watchOS(.v6),
+        .tvOS(.v13),
     ],
     products: [
         .library(name: "FluentMySQLDriver", targets: ["FluentMySQLDriver"]),