Merge pull request #2366 from AnthonyLatsis/jepa

Enable some Swift 7 mode features

Author: AnthonyLatsis

Package.swift

@@ -3,20 +3,6 @@
 import Foundation
 import PackageDescription
 
-/// Swift settings that should be applied to every Swift target.
-var globalSwiftSettings: [SwiftSetting] {
-  var result: [SwiftSetting] = [
-    .enableUpcomingFeature("InternalImportsByDefault"),
-    .enableUpcomingFeature("MemberImportVisibility"),
-    .enableUpcomingFeature("InferIsolatedConformances"),
-    .enableUpcomingFeature("NonisolatedNonsendingByDefault"),
-  ]
-  if noSwiftPMDependency {
-    result += [.define("NO_SWIFTPM_DEPENDENCY")]
-  }
-  return result
-}
-
 var products: [Product] = [
   .executable(name: "sourcekit-lsp", targets: ["sourcekit-lsp"]),
   .library(name: "_SourceKitLSP", targets: ["SourceKitLSP"]),
@@ -50,7 +36,6 @@ var targets: [Target] = [
       .product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
     ],
     exclude: ["CMakeLists.txt"],
-    swiftSettings: globalSwiftSettings,
     linkerSettings: sourcekitLSPLinkSettings
   ),
 
@@ -78,7 +63,6 @@ var targets: [Target] = [
         .product(name: "SwiftPMDataModel-auto", package: "swift-package-manager"),
       ]),
     exclude: ["CMakeLists.txt"],
-    swiftSettings: globalSwiftSettings
   ),
 
   .testTarget(
@@ -92,7 +76,6 @@ var targets: [Target] = [
       "TSCExtensions",
       .product(name: "LanguageServerProtocol", package: "swift-tools-protocols"),
     ],
-    swiftSettings: globalSwiftSettings
   ),
 
   .target(
@@ -118,7 +101,6 @@ var targets: [Target] = [
       .product(name: "ToolsProtocolsSwiftExtensions", package: "swift-tools-protocols"),
     ] + swiftSyntaxDependencies(["SwiftSyntax"]),
     exclude: ["CMakeLists.txt"],
-    swiftSettings: globalSwiftSettings
   ),
 
   // MARK: CompletionScoring
@@ -127,26 +109,22 @@ var targets: [Target] = [
     name: "CompletionScoring",
     dependencies: ["CCompletionScoring"],
     exclude: ["CMakeLists.txt"],
-    swiftSettings: globalSwiftSettings
   ),
 
   .target(
     name: "CompletionScoringForPlugin",
     dependencies: ["CCompletionScoring"],
     exclude: ["CMakeLists.txt"],
-    swiftSettings: globalSwiftSettings
   ),
 
   .testTarget(
     name: "CompletionScoringTests",
     dependencies: ["CompletionScoring", "CompletionScoringTestSupport", "SwiftExtensions"],
-    swiftSettings: globalSwiftSettings
   ),
 
   .testTarget(
     name: "CompletionScoringPerfTests",
     dependencies: ["CompletionScoring", "CompletionScoringTestSupport", "SwiftExtensions"],
-    swiftSettings: globalSwiftSettings
   ),
 
   // MARK: CompletionScoringTestSupport
@@ -159,7 +137,6 @@ var targets: [Target] = [
       .product(name: "ToolsProtocolsSwiftExtensions", package: "swift-tools-protocols"),
     ],
     resources: [.copy("INPUTS")],
-    swiftSettings: globalSwiftSettings
   ),
 
   // MARK: CSKTestSupport
@@ -198,7 +175,6 @@ var targets: [Target] = [
       .product(name: "ToolsProtocolsSwiftExtensions", package: "swift-tools-protocols"),
     ] + swiftSyntaxDependencies(["SwiftIDEUtils", "SwiftSyntax", "SwiftParser"]),
     exclude: ["CMakeLists.txt"],
-    swiftSettings: globalSwiftSettings
   ),
 
   .testTarget(
@@ -212,7 +188,6 @@ var targets: [Target] = [
       .product(name: "SKLogging", package: "swift-tools-protocols"),
       .product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
     ],
-    swiftSettings: globalSwiftSettings
   ),
 
   // MARK: DocumentationLanguageService
@@ -234,7 +209,6 @@ var targets: [Target] = [
       .product(name: "SymbolKit", package: "swift-docc-symbolkit"),
     ],
     exclude: [],
-    swiftSettings: globalSwiftSettings
   ),
 
   // MARK: InProcessClient
@@ -255,7 +229,6 @@ var targets: [Target] = [
       .product(name: "ToolsProtocolsSwiftExtensions", package: "swift-tools-protocols"),
     ],
     exclude: ["CMakeLists.txt"],
-    swiftSettings: globalSwiftSettings
   ),
 
   // MARK: LanguageServerProtocolExtensions
@@ -272,7 +245,6 @@ var targets: [Target] = [
       .product(name: "ToolsProtocolsSwiftExtensions", package: "swift-tools-protocols"),
     ],
     exclude: ["CMakeLists.txt"],
-    swiftSettings: globalSwiftSettings
   ),
 
   // MARK: SemanticIndex
@@ -292,7 +264,6 @@ var targets: [Target] = [
       .product(name: "ToolsProtocolsSwiftExtensions", package: "swift-tools-protocols"),
     ],
     exclude: ["CMakeLists.txt"],
-    swiftSettings: globalSwiftSettings
   ),
 
   .testTarget(
@@ -303,7 +274,6 @@ var targets: [Target] = [
       .product(name: "SKLogging", package: "swift-tools-protocols"),
       .product(name: "ToolsProtocolsSwiftExtensions", package: "swift-tools-protocols"),
     ],
-    swiftSettings: globalSwiftSettings
   ),
 
   // MARK: SKOptions
@@ -317,7 +287,6 @@ var targets: [Target] = [
       .product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
     ],
     exclude: ["CMakeLists.txt"],
-    swiftSettings: globalSwiftSettings
   ),
 
   // MARK: SKUtilities
@@ -329,7 +298,6 @@ var targets: [Target] = [
       .product(name: "SKLogging", package: "swift-tools-protocols"),
     ],
     exclude: ["CMakeLists.txt"],
-    swiftSettings: globalSwiftSettings
   ),
 
   .target(
@@ -339,7 +307,7 @@ var targets: [Target] = [
       .product(name: "_SKLoggingForPlugin", package: "swift-tools-protocols"),
     ],
     exclude: ["CMakeLists.txt"],
-    swiftSettings: globalSwiftSettings + [
+    swiftSettings: [
       .unsafeFlags([
         "-module-alias", "SKLogging=_SKLoggingForPlugin",
         "-module-alias", "SwiftExtensions=SwiftExtensionsForPlugin",
@@ -354,7 +322,6 @@ var targets: [Target] = [
       "SKUtilities",
       "SKTestSupport",
     ],
-    swiftSettings: globalSwiftSettings
   ),
 
   // MARK: SKTestSupport
@@ -382,7 +349,6 @@ var targets: [Target] = [
       .product(name: "ToolsProtocolsSwiftExtensions", package: "swift-tools-protocols"),
     ],
     resources: [.copy("INPUTS")],
-    swiftSettings: globalSwiftSettings
   ),
 
   // MARK: SourceKitD
@@ -396,7 +362,6 @@ var targets: [Target] = [
       .product(name: "ToolsProtocolsSwiftExtensions", package: "swift-tools-protocols"),
     ],
     exclude: ["CMakeLists.txt", "sourcekitd_uids.swift.gyb"],
-    swiftSettings: globalSwiftSettings
   ),
 
   .target(
@@ -408,7 +373,7 @@ var targets: [Target] = [
       .product(name: "_ToolsProtocolsSwiftExtensionsForPlugin", package: "swift-tools-protocols"),
     ],
     exclude: ["CMakeLists.txt", "sourcekitd_uids.swift.gyb"],
-    swiftSettings: globalSwiftSettings + [
+    swiftSettings: [
       .unsafeFlags([
         "-module-alias", "SKLogging=_SKLoggingForPlugin",
         "-module-alias", "SwiftExtensions=SwiftExtensionsForPlugin",
@@ -427,7 +392,6 @@ var targets: [Target] = [
       "ToolchainRegistry",
       .product(name: "ToolsProtocolsSwiftExtensions", package: "swift-tools-protocols"),
     ],
-    swiftSettings: globalSwiftSettings
   ),
 
   // MARK: SourceKitLSP
@@ -453,7 +417,6 @@ var targets: [Target] = [
       .product(name: "ToolsProtocolsSwiftExtensions", package: "swift-tools-protocols"),
     ] + swiftSyntaxDependencies(["SwiftSyntax"]),
     exclude: ["CMakeLists.txt"],
-    swiftSettings: globalSwiftSettings
   ),
 
   .testTarget(
@@ -481,7 +444,6 @@ var targets: [Target] = [
       + swiftSyntaxDependencies([
         "SwiftIfConfig", "SwiftParser", "SwiftSyntax", "SwiftCompilerPlugin", "SwiftSyntaxMacros",
       ]),
-    swiftSettings: globalSwiftSettings
   ),
 
   // MARK: SwiftExtensions
@@ -492,7 +454,6 @@ var targets: [Target] = [
       .product(name: "ToolsProtocolsSwiftExtensions", package: "swift-tools-protocols")
     ],
     exclude: ["CMakeLists.txt"],
-    swiftSettings: globalSwiftSettings
   ),
 
   .target(
@@ -501,7 +462,7 @@ var targets: [Target] = [
       .product(name: "_ToolsProtocolsSwiftExtensionsForPlugin", package: "swift-tools-protocols")
     ],
     exclude: ["CMakeLists.txt"],
-    swiftSettings: globalSwiftSettings + [
+    swiftSettings: [
       .unsafeFlags([
         "-module-alias", "ToolsProtocolsSwiftExtensions=_ToolsProtocolsSwiftExtensionsForPlugin",
       ])
@@ -516,7 +477,6 @@ var targets: [Target] = [
       .product(name: "SKLogging", package: "swift-tools-protocols"),
       .product(name: "ToolsProtocolsSwiftExtensions", package: "swift-tools-protocols"),
     ],
-    swiftSettings: globalSwiftSettings
   ),
 
   // MARK: SwiftLanguageService
@@ -555,7 +515,6 @@ var targets: [Target] = [
         "SwiftSyntaxBuilder",
       ]),
     exclude: ["CMakeLists.txt"],
-    swiftSettings: globalSwiftSettings
   ),
 
   // MARK: SwiftSourceKitClientPlugin
@@ -569,7 +528,7 @@ var targets: [Target] = [
       "SwiftSourceKitPluginCommon",
     ],
     exclude: ["CMakeLists.txt"],
-    swiftSettings: globalSwiftSettings + [
+    swiftSettings: [
       .unsafeFlags([
         "-module-alias", "SourceKitD=SourceKitDForPlugin",
         "-module-alias", "SwiftExtensions=SwiftExtensionsForPlugin",
@@ -590,7 +549,7 @@ var targets: [Target] = [
       .product(name: "_SKLoggingForPlugin", package: "swift-tools-protocols"),
     ],
     exclude: ["CMakeLists.txt"],
-    swiftSettings: globalSwiftSettings + [
+    swiftSettings: [
       .unsafeFlags([
         "-module-alias", "SourceKitD=SourceKitDForPlugin",
         "-module-alias", "SwiftExtensions=SwiftExtensionsForPlugin",
@@ -615,7 +574,7 @@ var targets: [Target] = [
       .product(name: "_ToolsProtocolsSwiftExtensionsForPlugin", package: "swift-tools-protocols"),
     ],
     exclude: ["CMakeLists.txt"],
-    swiftSettings: globalSwiftSettings + [
+    swiftSettings: [
       .unsafeFlags([
         "-module-alias", "CompletionScoring=CompletionScoringForPlugin",
         "-module-alias", "SKUtilities=SKUtilitiesForPlugin",
@@ -640,7 +599,6 @@ var targets: [Target] = [
       "ToolchainRegistry",
       .product(name: "LanguageServerProtocol", package: "swift-tools-protocols"),
     ],
-    swiftSettings: globalSwiftSettings
   ),
 
   // MARK: ToolchainRegistry
@@ -654,7 +612,6 @@ var targets: [Target] = [
       .product(name: "SKLogging", package: "swift-tools-protocols"),
     ],
     exclude: ["CMakeLists.txt"],
-    swiftSettings: globalSwiftSettings
   ),
 
   .testTarget(
@@ -663,7 +620,6 @@ var targets: [Target] = [
       "SKTestSupport",
       "ToolchainRegistry",
     ],
-    swiftSettings: globalSwiftSettings
   ),
 
   // MARK: TSCExtensions
@@ -677,7 +633,6 @@ var targets: [Target] = [
       .product(name: "ToolsProtocolsSwiftExtensions", package: "swift-tools-protocols"),
     ],
     exclude: ["CMakeLists.txt"],
-    swiftSettings: globalSwiftSettings
   ),
 
   .testTarget(
@@ -688,10 +643,39 @@ var targets: [Target] = [
       "TSCExtensions",
       .product(name: "ToolsProtocolsSwiftExtensions", package: "swift-tools-protocols"),
     ],
-    swiftSettings: globalSwiftSettings
   ),
 ]
 
+// MARK: - Apply global Swift settings
+
+// Apply global Swift settings to targets.
+do {
+  var globalSwiftSettings: [SwiftSetting] = [
+    // Swift 7 mode upcoming features. These must be compatible with swift-tools-version.
+    .enableUpcomingFeature("InternalImportsByDefault"),
+    .enableUpcomingFeature("MemberImportVisibility"),
+    .enableUpcomingFeature("InferIsolatedConformances"),
+    .enableUpcomingFeature("NonisolatedNonsendingByDefault"),
+    .enableUpcomingFeature("ExistentialAny"),
+    .enableUpcomingFeature("ImmutableWeakCaptures"),
+
+    // Warning escalation.
+    .unsafeFlags(["-Werror", "ExistentialAny"]),
+  ]
+  if noSwiftPMDependency {
+    globalSwiftSettings.append(.define("NO_SWIFTPM_DEPENDENCY"))
+  }
+
+  for target in targets where target.type != .plugin {
+    if let swiftSettings = target.swiftSettings {
+      // Target-specific settings should come last.
+      target.swiftSettings = globalSwiftSettings + swiftSettings
+    } else {
+      target.swiftSettings = globalSwiftSettings
+    }
+  }
+}
+
 if buildOnlyTests {
   products = []
   targets = targets.compactMap { target in