Merge pull request #2044 from ahoppen/require-swift-6

Require Swift 6 to build SourceKit-LSP

Author: ahoppen

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.10
+// swift-tools-version: 6.0
 
 import Foundation
 import PackageDescription
@@ -699,9 +699,10 @@ let package = Package(
   products: products,
   dependencies: dependencies,
   targets: targets,
-  swiftLanguageVersions: [.v5, .version("6")]
+  swiftLanguageModes: [.v6]
 )
 
+@MainActor
 func swiftSyntaxDependencies(_ names: [String]) -> [Target.Dependency] {
   if buildDynamicSwiftSyntaxLibrary {
     return [.product(name: "_SwiftSyntaxDynamic", package: "swift-syntax")]
@@ -710,6 +711,7 @@ func swiftSyntaxDependencies(_ names: [String]) -> [Target.Dependency] {
   }
 }
 
+@MainActor
 func swiftPMDependency<T>(_ values: [T]) -> [T] {
   if noSwiftPMDependency {
     return []

Sources/BuildServerProtocol/Messages.swift

@@ -10,11 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if compiler(>=6)
 public import LanguageServerProtocol
-#else
-import LanguageServerProtocol
-#endif
 
 fileprivate let requestTypes: [_RequestType.Type] = [
   BuildShutdownRequest.self,

Sources/BuildServerProtocol/Messages/BuildShutdownRequest.swift

@@ -10,11 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if compiler(>=6)
 public import LanguageServerProtocol
-#else
-import LanguageServerProtocol
-#endif
 
 /// Like the language server protocol, the shutdown build request is
 /// sent from the client to the server. It asks the server to shut down,

Sources/BuildServerProtocol/Messages/BuildTargetOutputPathsRequest.swift

@@ -10,11 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if compiler(>=6)
 public import LanguageServerProtocol
-#else
-import LanguageServerProtocol
-#endif
 
 /// For all the source files in this target, the output paths that are used during indexing, ie. the
 /// `-index-unit-output-path` for the file, if it is specified in the compiler arguments or the file that is passed as

Sources/BuildServerProtocol/Messages/BuildTargetPrepareRequest.swift

@@ -10,11 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if compiler(>=6)
 public import LanguageServerProtocol
-#else
-import LanguageServerProtocol
-#endif
 
 public typealias OriginId = String
 

Sources/BuildServerProtocol/Messages/BuildTargetSourcesRequest.swift

@@ -10,11 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if compiler(>=6)
 public import LanguageServerProtocol
-#else
-import LanguageServerProtocol
-#endif
 
 /// The build target sources request is sent from the client to the server to
 /// query for the list of text documents and directories that belong to a

Sources/BuildServerProtocol/Messages/InitializeBuildRequest.swift

@@ -10,11 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if compiler(>=6)
 public import LanguageServerProtocol
-#else
-import LanguageServerProtocol
-#endif
 
 /// Like the language server protocol, the initialize request is sent
 /// as the first request from the client to the server. If the server

Sources/BuildServerProtocol/Messages/OnBuildExitNotification.swift

@@ -10,11 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if compiler(>=6)
 public import LanguageServerProtocol
-#else
-import LanguageServerProtocol
-#endif
 
 /// Like the language server protocol, a notification to ask the
 /// server to exit its process. The server should exit with success

Sources/BuildServerProtocol/Messages/OnBuildInitializedNotification.swift

@@ -10,11 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if compiler(>=6)
 public import LanguageServerProtocol
-#else
-import LanguageServerProtocol
-#endif
 
 /// Like the language server protocol, the initialized notification is sent from the client to the server after the client received the result of the initialize request but before the client is sending any other request or notification to the server. The server can use the initialized notification for example to initialize intensive computation such as dependency resolution or compilation. The initialized notification may only be sent once.
 public struct OnBuildInitializedNotification: NotificationType {

Sources/BuildServerProtocol/Messages/OnBuildLogMessageNotification.swift

@@ -10,11 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if compiler(>=6)
 public import LanguageServerProtocol
-#else
-import LanguageServerProtocol
-#endif
 
 /// The log message notification is sent from a server to a client to ask the client to log a particular message in its console.
 ///