From da4e248f25a4cb216cf82f765b0fba7642c7d9e8 Mon Sep 17 00:00:00 2001 From: Mathew Polzin Date: Tue, 27 Jan 2026 10:30:22 -0600 Subject: [PATCH] bump swift requirement to 6.0 --- .github/workflows/codecov.yml | 2 +- .github/workflows/documentation.yml | 2 +- .github/workflows/tests.yml | 2 -- Package.resolved | 11 ++++++----- Package.swift | 4 ++-- README.md | 4 ++-- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index f64ad6f3bc..7094255548 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -5,7 +5,7 @@ on: [pull_request] jobs: codecov: container: - image: swift:5.10 + image: swift:6.2 runs-on: ubuntu-latest steps: - uses: actions/checkout@v5 diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index fbaa14e3f1..63c93712af 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -9,7 +9,7 @@ jobs: build: runs-on: ubuntu-latest container: - image: swift:5.10 + image: swift:6.2 steps: - uses: actions/checkout@v5 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7fb41677ca..1f9091a791 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,8 +13,6 @@ jobs: fail-fast: false matrix: image: - - swift:5.10-focal - - swift:5.10-jammy - swift:6.0-focal - swift:6.0-jammy - swift:6.0-noble diff --git a/Package.resolved b/Package.resolved index ae810d9d41..3db2c1c9d4 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,12 +1,13 @@ { + "originHash" : "d58c23e2c67ae9230867c187ecf81cf84ffc23bf6ad149e798bcba5fb52c7574", "pins" : [ { "identity" : "swift-docc-plugin", "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-docc-plugin", "state" : { - "revision" : "85e4bb4e1cd62cec64a4b8e769dcefdf0c5b9d64", - "version" : "1.4.3" + "revision" : "3e4f133a77e644a5812911a0513aeb7288b07d06", + "version" : "1.4.5" } }, { @@ -23,10 +24,10 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/jpsim/Yams.git", "state" : { - "revision" : "9281f8c99aff4f4a55dce22ae29b1181c935caa5", - "version" : "6.0.0" + "revision" : "51b5127c7fb6ffac106ad6d199aaa33c5024895f", + "version" : "6.2.0" } } ], - "version" : 2 + "version" : 3 } diff --git a/Package.swift b/Package.swift index ce22f3cc3c..d20d10dc0a 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version: 5.10 +// swift-tools-version: 6.0 import PackageDescription @@ -74,5 +74,5 @@ let package = Package( name: "OpenAPIKitCompatTests", dependencies: ["OpenAPIKitCompat"]) ], - swiftLanguageVersions: [ .v5 ] + swiftLanguageModes: [ .v5, .v6 ] ) diff --git a/README.md b/README.md index 65c358cb9b..135e2ab4f9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![sswg:sandbox|94x20](https://img.shields.io/badge/sswg-sandbox-lightgrey.svg)](https://github.com/swift-server/sswg/blob/master/process/incubation.md#sandbox-level) [![Swift 5.10+](http://img.shields.io/badge/Swift-5.10+-blue.svg)](https://swift.org) +[![sswg:sandbox|94x20](https://img.shields.io/badge/sswg-sandbox-lightgrey.svg)](https://github.com/swift-server/sswg/blob/master/process/incubation.md#sandbox-level) [![Swift 6.0+](http://img.shields.io/badge/Swift-6.0+-blue.svg)](https://swift.org) [![MIT license](http://img.shields.io/badge/license-MIT-lightgrey.svg)](http://opensource.org/licenses/MIT) ![Tests](https://github.com/mattpolzin/OpenAPIKit/actions/workflows/tests.yml/badge.svg?branch=main) @@ -16,9 +16,9 @@ versions and key features are supported by which OpenAPIKit versions. | OpenAPIKit | Swift | OpenAPI v3.0, v3.1 | External Dereferencing & Sendable | OpenAPI v3.2 | |------------|-------|--------------------|-----------------------------------|--------------| -| v3.x | 5.1+ | ✅ | | | | v4.x | 5.8+ | ✅ | ✅ | | | v5.x | 5.10+ | ✅ | ✅ | ✅ | +| v6.x | 6.0+ | ✅ | ✅ | ✅ | - [Usage](#usage) - [Migration](#migration)