Skip to content

Update to Swift 6 #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gwynne merged 8 commits into from
Dec 11, 2025
Merged

Update to Swift 6 #196

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4dd5b93
Update to Swift 6
ptoffy Dec 2, 2025
eaf1c02
Add missing flags
ptoffy Dec 2, 2025
cf9f11c
Update api-docs.yml
gwynne Dec 2, 2025
d6c4db0
Update test.yml
gwynne Dec 2, 2025
79057d6
Address reviews
ptoffy Dec 2, 2025
44f8f5f
Nits
ptoffy Dec 2, 2025
404f516
Comment out breaking option
ptoffy Dec 2, 2025
63e2616
Update Package.swift
gwynne Dec 11, 2025
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
17 changes: 8 additions & 9 deletions Package.swift
View file
Open in desktop
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 @@ -31,7 +31,7 @@ let package = Package(
.target(
name: "SQLKitBenchmark",
dependencies: [
.target(name: "SQLKit"),
Comment thread
ptoffy marked this conversation as resolved.
.target(name: "SQLKit")
],
swiftSettings: swiftSettings
),
Expand All @@ -46,10 +46,9 @@ let package = Package(
]
)

var swiftSettings: [SwiftSetting] { [
.enableUpcomingFeature("ExistentialAny"),
.enableUpcomingFeature("ConciseMagicFile"),
.enableUpcomingFeature("ForwardTrailingClosures"),
.enableUpcomingFeature("DisableOutwardActorInference"),
.enableExperimentalFeature("StrictConcurrency=complete"),
] }
var swiftSettings: [SwiftSetting] {
[
.enableUpcomingFeature("ExistentialAny"),
.enableExperimentalFeature("StrictConcurrency=complete"),
Comment thread
ptoffy marked this conversation as resolved.
Outdated
]
}
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<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>
Comment thread
ptoffy marked this conversation as resolved.
Outdated
<a href="https://swift.org"><img src="https://design.vapor.codes/images/swift510up.svg" alt="Swift 5.10+"></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
View file
Open in desktop
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/apple/swift/blob/swift-6.0-RELEASE/stdlib/public/core/Codable.swift#L5509
Comment thread
ptoffy marked this conversation as resolved.
Outdated
/// [`CodingKeyRepresentable`]: https://developer.apple.com/documentation/swift/codingkeyrepresentable
public struct SomeCodingKey: CodingKey, Hashable, Sendable {
// See `CodingKey.stringValue`.
Expand Down
Loading