Merge pull request #1950 from ahoppen/gardening

Gardening

Author: ahoppen

Package.swift

@@ -123,12 +123,14 @@ var targets: [Target] = [
   .target(
     name: "CompletionScoring",
     dependencies: ["CCompletionScoring"],
+    exclude: ["CMakeLists.txt"],
     swiftSettings: globalSwiftSettings
   ),
 
   .target(
     name: "CompletionScoringForPlugin",
     dependencies: ["CCompletionScoring"],
+    exclude: ["CMakeLists.txt"],
     swiftSettings: globalSwiftSettings
   ),
 
@@ -550,6 +552,7 @@ var targets: [Target] = [
       "SwiftExtensionsForPlugin",
       "SwiftSourceKitPluginCommon",
     ],
+    exclude: ["CMakeLists.txt"],
     swiftSettings: globalSwiftSettings + [
       .unsafeFlags([
         "-module-alias", "SourceKitD=SourceKitDForPlugin",
@@ -569,6 +572,7 @@ var targets: [Target] = [
       "SwiftExtensionsForPlugin",
       "SKLoggingForPlugin",
     ],
+    exclude: ["CMakeLists.txt"],
     swiftSettings: globalSwiftSettings + [
       .unsafeFlags([
         "-module-alias", "SourceKitD=SourceKitDForPlugin",
@@ -591,6 +595,7 @@ var targets: [Target] = [
       "SwiftSourceKitPluginCommon",
       "SwiftExtensionsForPlugin",
     ],
+    exclude: ["CMakeLists.txt"],
     swiftSettings: globalSwiftSettings + [
       .unsafeFlags([
         "-module-alias", "CompletionScoring=CompletionScoringForPlugin",

Sources/BuildSystemIntegration/SwiftPMBuildSystem.swift

@@ -425,23 +425,7 @@ package actor SwiftPMBuildSystem: BuiltInBuildSystem {
 
       throw NonFileURIError(uri: file)
     }
-    let compileArguments = try buildTarget.compileArguments(for: fileURL)
-
-    #if compiler(>=6.1)
-    #warning("When we drop support for Swift 5.10 we no longer need to adjust compiler arguments for the Modules move")
-    #endif
-    // Fix up compiler arguments that point to a `/Modules` subdirectory if the Swift version in the toolchain is less
-    // than 6.0 because it places the modules one level higher up.
-    let toolchainVersion = await orLog("Getting Swift version") { try await toolchain.swiftVersion }
-    guard let toolchainVersion, toolchainVersion < SwiftVersion(6, 0) else {
-      return compileArguments
-    }
-    return compileArguments.map { argument in
-      if argument.hasSuffix("/Modules"), argument.contains(self.swiftPMWorkspace.location.scratchDirectory.pathString) {
-        return String(argument.dropLast(8))
-      }
-      return argument
-    }
+    return try buildTarget.compileArguments(for: fileURL)
   }
 
   package func buildTargets(request: WorkspaceBuildTargetsRequest) async throws -> WorkspaceBuildTargetsResponse {