Skip to content

Bump to 6.0 #1107

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

Open
bnbarham wants to merge 2 commits into
base: main
Choose a base branch
from
+14 −8
Open

Bump to 6.0 #1107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c59487
Disable Swift 5.9 CI job on Windows
kkebo Nov 24, 2025
f0589d3
Bump to Swift 6.0
bnbarham Dec 5, 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
2 changes: 2 additions & 0 deletions .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ jobs:
uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
with:
enable_cross_pr_testing: true
linux_exclude_swift_versions: "[{\"swift_version\": \"5.9\"}, {\"swift_version\": \"5.10\"}]"
windows_exclude_swift_versions: "[{\"swift_version\": \"5.9\"}]"
soundness:
name: Soundness
uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main
Expand Down
6 changes: 4 additions & 2 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.9
// swift-tools-version: 6.0
//===----------------------------------------------------------------------===//
//
// This source file is part of the Swift.org open source project
Expand Down Expand Up @@ -146,9 +146,11 @@ let package = Package(
],
products: products,
dependencies: dependencies,
targets: targets
targets: targets,
swiftLanguageModes: [.v5]
)

@MainActor
func swiftSyntaxDependencies(_ names: [String]) -> [Target.Dependency] {
if buildDynamicSwiftSyntaxLibrary {
return [.product(name: "_SwiftSyntaxDynamic", package: "swift-syntax")]
Expand Down
7 changes: 4 additions & 3 deletions Plugins/FormatPlugin/plugin.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import PackagePlugin
@main
struct FormatPlugin {
func format(tool: PluginContext.Tool, targetDirectories: [String], configurationFilePath: String?) throws {
let swiftFormatExec = URL(fileURLWithPath: tool.path.string)
let swiftFormatExec = tool.url

var arguments: [String] = ["format"]

Expand Down Expand Up @@ -58,7 +58,8 @@ extension FormatPlugin: CommandPlugin {

try format(
tool: swiftFormatTool,
targetDirectories: sourceCodeTargets.map(\.directory.string),
// This should be `directoryURL`, but it's only available in 6.1+
targetDirectories: sourceCodeTargets.map { String(describing: $0.directory) },
configurationFilePath: configurationFilePath
)
}
Expand All @@ -76,7 +77,7 @@ extension FormatPlugin: XcodeCommandPlugin {

try format(
tool: swiftFormatTool,
targetDirectories: [context.xcodeProject.directory.string],
targetDirectories: [context.xcodeProject.directoryURL.path()],
configurationFilePath: configurationFilePath
)
}
Expand Down
7 changes: 4 additions & 3 deletions Plugins/LintPlugin/plugin.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import PackagePlugin
@main
struct LintPlugin {
func lint(tool: PluginContext.Tool, targetDirectories: [String], configurationFilePath: String?) throws {
let swiftFormatExec = URL(fileURLWithPath: tool.path.string)
let swiftFormatExec = tool.url

var arguments: [String] = ["lint"]

Expand Down Expand Up @@ -59,7 +59,8 @@ extension LintPlugin: CommandPlugin {

try lint(
tool: swiftFormatTool,
targetDirectories: sourceCodeTargets.map(\.directory.string),
// This should be `directoryURL`, but it's only available in 6.1+
targetDirectories: sourceCodeTargets.map { String(describing: $0.directory) },
configurationFilePath: configurationFilePath
)
}
Expand All @@ -76,7 +77,7 @@ extension LintPlugin: XcodeCommandPlugin {

try lint(
tool: swiftFormatTool,
targetDirectories: [context.xcodeProject.directory.string],
targetDirectories: [context.xcodeProject.directoryURL.path()],
configurationFilePath: configurationFilePath
)
}
Expand Down