From f4b00a5350238fe896d865d96d64f12fcbbeda95 Mon Sep 17 00:00:00 2001 From: Tim Condon <0xTim@users.noreply.github.com> Date: Tue, 11 Apr 2023 14:27:45 +0100 Subject: [PATCH] Update Minimum Swift Version to 5.6 (#2996) * Bump manifest to Swift 5.6 * Update README * Remove old version check * Trigger new CI --- .github/workflows/test.yml | 2 +- Package.swift | 2 +- README.md | 2 +- Sources/Vapor/Utilities/BasicCodingKey.swift | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 64d80298e6..9fb859f4b5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,7 @@ jobs: - provider: vapor/apns ref: 3.0.0 runs-on: ubuntu-latest - container: swift:5.7-jammy + container: swift:5.8 steps: - name: Check out Vapor uses: actions/checkout@v3 diff --git a/Package.swift b/Package.swift index 52cc804960..0eeca9b2f6 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.5.2 +// swift-tools-version:5.6 import PackageDescription let package = Package( diff --git a/README.md b/README.md index f77b616511..bfc60d393d 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Continuous Integration - Swift 5.5 + Swift 5.6 Twitter diff --git a/Sources/Vapor/Utilities/BasicCodingKey.swift b/Sources/Vapor/Utilities/BasicCodingKey.swift index b77fd73c19..a25271718e 100644 --- a/Sources/Vapor/Utilities/BasicCodingKey.swift +++ b/Sources/Vapor/Utilities/BasicCodingKey.swift @@ -1,4 +1,4 @@ -#if swift(>=5.6) && os(Linux) +#if os(Linux) public typealias CodingKeyRepresentable = Swift.CodingKeyRepresentable #else /// This is an unwelcome stand-in for the ``Swift/CodingKeyRepresentable`` protocol that appeared in Swift 5.6.