diff --git a/.github/workflows/api-docs.yml b/.github/workflows/api-docs.yml index 652112e8..9fedefdc 100644 --- a/.github/workflows/api-docs.yml +++ b/.github/workflows/api-docs.yml @@ -3,6 +3,9 @@ on: push: branches: - main +permissions: + contents: read + id-token: write jobs: build-and-deploy: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e3cc1e5d..334a2f5c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,7 +7,8 @@ on: push: { branches: [ main ] } env: LOG_LEVEL: info - SWIFT_DETERMINISTIC_HASHING: 1 +permissions: + contents: read jobs: unit-tests: @@ -20,7 +21,7 @@ jobs: pure-fluent-integration-test: if: ${{ !(github.event.pull_request.draft || false) }} runs-on: ubuntu-latest - container: swift:6.1-noble + container: swift:6.2-noble steps: - name: Check out sql-kit uses: actions/checkout@v6 @@ -51,7 +52,7 @@ jobs: strategy: fail-fast: false matrix: - swift-image: ['swift:6.1-noble'] + swift-image: ['swift:6.2-noble'] driver: - { sqlkit: 'sqlite-kit', fluent: 'fluent-sqlite-driver' } - { sqlkit: 'mysql-kit', fluent: 'fluent-mysql-driver' } diff --git a/Package.swift b/Package.swift index 0812b450..661348ec 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.10 +// swift-tools-version:6.0 import PackageDescription let package = Package( @@ -48,8 +48,9 @@ let package = Package( var swiftSettings: [SwiftSetting] { [ .enableUpcomingFeature("ExistentialAny"), - .enableUpcomingFeature("ConciseMagicFile"), - .enableUpcomingFeature("ForwardTrailingClosures"), - .enableUpcomingFeature("DisableOutwardActorInference"), - .enableExperimentalFeature("StrictConcurrency=complete"), + // .enableUpcomingFeature("InternalImportsByDefault"), + .enableUpcomingFeature("MemberImportVisibility"), + .enableUpcomingFeature("InferIsolatedConformances"), + // .enableUpcomingFeature("NonisolatedNonsendingByDefault"), + .enableUpcomingFeature("ImmutableWeakCaptures"), ] } diff --git a/README.md b/README.md index 76c8187e..9d994894 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,8 @@ Team Chat MIT License Continuous Integration - -Swift 5.10+ +Code Coverage +Swift 6.0+


diff --git a/Sources/SQLKit/Utilities/SomeCodingKey.swift b/Sources/SQLKit/Utilities/SomeCodingKey.swift index 2865d696..c87b4708 100644 --- a/Sources/SQLKit/Utilities/SomeCodingKey.swift +++ b/Sources/SQLKit/Utilities/SomeCodingKey.swift @@ -9,7 +9,7 @@ /// /// ![Quotation](codingkey-quotation) /// -/// [`_DictionaryCodingKey`]: https://github.com/apple/swift/blob/swift-5.10-RELEASE/stdlib/public/core/Codable.swift#L5509 +/// [`_DictionaryCodingKey`]: https://github.com/swiftlang/swift/blob/swift-6.0-RELEASE/stdlib/public/core/Codable.swift#L6124 /// [`CodingKeyRepresentable`]: https://developer.apple.com/documentation/swift/codingkeyrepresentable public struct SomeCodingKey: CodingKey, Hashable, Sendable { // See `CodingKey.stringValue`. diff --git a/Sources/SQLKitBenchmark/SQLBenchmarker.swift b/Sources/SQLKitBenchmark/SQLBenchmarker.swift index 5f999561..aa01fd5f 100644 --- a/Sources/SQLKitBenchmark/SQLBenchmarker.swift +++ b/Sources/SQLKitBenchmark/SQLBenchmarker.swift @@ -1,3 +1,5 @@ +import Logging +import NIOCore import SQLKit import XCTest diff --git a/Tests/SQLKitTests/AsyncTests.swift b/Tests/SQLKitTests/AsyncTests.swift index e52f92f3..4837e41a 100644 --- a/Tests/SQLKitTests/AsyncTests.swift +++ b/Tests/SQLKitTests/AsyncTests.swift @@ -1,3 +1,5 @@ +import NIOCore +import OrderedCollections import SQLKit import XCTest diff --git a/Tests/SQLKitTests/SQLCodingTests.swift b/Tests/SQLKitTests/SQLCodingTests.swift index 1058d149..d9de8252 100644 --- a/Tests/SQLKitTests/SQLCodingTests.swift +++ b/Tests/SQLKitTests/SQLCodingTests.swift @@ -1,3 +1,4 @@ +import OrderedCollections @testable @_spi(CodableUtilities) import SQLKit import XCTest diff --git a/Tests/SQLKitTests/SQLRowDecoderTests.swift b/Tests/SQLKitTests/SQLRowDecoderTests.swift index 55ed7a82..df1fdc99 100644 --- a/Tests/SQLKitTests/SQLRowDecoderTests.swift +++ b/Tests/SQLKitTests/SQLRowDecoderTests.swift @@ -1,3 +1,4 @@ +import OrderedCollections @testable @_spi(CodableUtilities) import SQLKit import XCTest