Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/api-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ on:
push:
branches:
- main
permissions:
contents: read
id-token: write

jobs:
build-and-deploy:
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ on:
push: { branches: [ main ] }
env:
LOG_LEVEL: info
SWIFT_DETERMINISTIC_HASHING: 1
permissions:
contents: read

jobs:
unit-tests:
Expand All @@ -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
Expand Down Expand Up @@ -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' }
Expand Down
11 changes: 6 additions & 5 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.10
// swift-tools-version:6.0
import PackageDescription

let package = Package(
Expand Down Expand Up @@ -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"),
] }
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<a href="https://discord.gg/vapor"><img src="https://design.vapor.codes/images/discordchat.svg" alt="Team Chat"></a>
<a href="LICENSE"><img src="https://design.vapor.codes/images/mitlicense.svg" alt="MIT License"></a>
<a href="https://github.com/vapor/sql-kit/actions/workflows/test.yml"><img src="https://img.shields.io/github/actions/workflow/status/vapor/sql-kit/test.yml?event=push&style=plastic&logo=github&label=tests&logoColor=%23ccc" alt="Continuous Integration"></a>
<a href="https://codecov.io/github/vapor/sql-kit"><img src="https://img.shields.io/codecov/c/github/vapor/sql-kit?style=plastic&logo=codecov&label=codecov"></a>
<a href="https://swift.org"><img src="https://design.vapor.codes/images/swift510up.svg" alt="Swift 5.10+"></a>
<a href="https://codecov.io/github/vapor/sql-kit"><img src="https://img.shields.io/codecov/c/github/vapor/sql-kit?style=plastic&logo=codecov&label=codecov" alt="Code Coverage"></a>
<a href="https://swift.org"><img src="https://design.vapor.codes/images/swift60up.svg" alt="Swift 6.0+"></a>
</p>

<br>
Expand Down
2 changes: 1 addition & 1 deletion Sources/SQLKit/Utilities/SomeCodingKey.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
2 changes: 2 additions & 0 deletions Sources/SQLKitBenchmark/SQLBenchmarker.swift
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import Logging
import NIOCore
import SQLKit
import XCTest

Expand Down
2 changes: 2 additions & 0 deletions Tests/SQLKitTests/AsyncTests.swift
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import NIOCore
import OrderedCollections
import SQLKit
import XCTest

Expand Down
1 change: 1 addition & 0 deletions Tests/SQLKitTests/SQLCodingTests.swift
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import OrderedCollections
@testable @_spi(CodableUtilities) import SQLKit
import XCTest

Expand Down
1 change: 1 addition & 0 deletions Tests/SQLKitTests/SQLRowDecoderTests.swift
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import OrderedCollections
@testable @_spi(CodableUtilities) import SQLKit
import XCTest

Expand Down
Loading