Skip to content

Commit 8a27f1a

Browse files
authored
Update swift-tools-version to 6.0 (#8404)
Because SwiftPM now relies on both `swift-build` and `swift-testing` and these both require Swift 6.0 to build, the swift-tools-version in SwiftPM's Package.swift should reflect this requirement and be updated to 6.0.
1 parent bf362e6 commit 8a27f1a

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

Package.swift

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.9
1+
// swift-tools-version:6.0
22

33
//===----------------------------------------------------------------------===//
44
//
@@ -970,16 +970,14 @@ if ProcessInfo.processInfo.environment["SWIFTCI_DISABLE_SDK_DEPENDENT_TESTS"] ==
970970
}
971971
#endif
972972

973-
/// Whether swift-syntax is being built as a single dynamic library instead of as a separate library per module.
974-
///
975-
/// This means that the swift-syntax symbols don't need to be statically linked, which allows us to stay below the
976-
/// maximum number of exported symbols on Windows, in turn allowing us to build sourcekit-lsp using SwiftPM on Windows
977-
/// and run its tests.
978-
var buildDynamicSwiftSyntaxLibrary: Bool {
979-
ProcessInfo.processInfo.environment["SWIFTSYNTAX_BUILD_DYNAMIC_LIBRARY"] != nil
980-
}
981973

982974
func swiftSyntaxDependencies(_ names: [String]) -> [Target.Dependency] {
975+
/// Whether swift-syntax is being built as a single dynamic library instead of as a separate library per module.
976+
///
977+
/// This means that the swift-syntax symbols don't need to be statically linked, which allows us to stay below the
978+
/// maximum number of exported symbols on Windows, in turn allowing us to build sourcekit-lsp using SwiftPM on Windows
979+
/// and run its tests.
980+
let buildDynamicSwiftSyntaxLibrary = ProcessInfo.processInfo.environment["SWIFTSYNTAX_BUILD_DYNAMIC_LIBRARY"] != nil
983981
if buildDynamicSwiftSyntaxLibrary {
984982
return [.product(name: "_SwiftSyntaxDynamic", package: "swift-syntax")]
985983
} else {

0 commit comments

Comments
 (0)