Merge pull request #85574 from swiftlang/jepa-main4

[utils] swift-xcodegen: Bump tools & SDK versions + misc improvements

Author: AnthonyLatsis

utils/swift-xcodegen/Package.swift

@@ -1,12 +1,12 @@
-// swift-tools-version: 5.8
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 import class Foundation.ProcessInfo
 
 let package = Package(
     name: "swift-xcodegen",
-    platforms: [.macOS(.v13)],
+    platforms: [.macOS(.v15)],
     targets: [
         .target(
             name: "SwiftXcodeGen",
@@ -16,28 +16,51 @@ let package = Package(
             ],
             exclude: [
               "Xcodeproj/README.md",
-            ],
-            swiftSettings: [
-              .enableExperimentalFeature("StrictConcurrency")
             ]
         ),
         .executableTarget(
           name: "swift-xcodegen",
           dependencies: [
             .product(name: "ArgumentParser", package: "swift-argument-parser"),
             "SwiftXcodeGen"
-          ],
-          swiftSettings: [
-            .enableExperimentalFeature("StrictConcurrency")
           ]
         ),
         .testTarget(
           name: "SwiftXcodeGenTest",
           dependencies: ["SwiftXcodeGen"]
         )
-    ]
+    ],
+    swiftLanguageModes: [.v6]
 )
 
+// Apply global Swift settings to targets.
+do {
+  var globalSwiftSettings: [SwiftSetting] = [
+    // Swift 7 mode upcoming features. These must be compatible with 'swift-tools-version'.
+    .enableUpcomingFeature("ExistentialAny"),
+    .enableUpcomingFeature("InternalImportsByDefault"),
+    .enableUpcomingFeature("MemberImportVisibility"),
+    .enableUpcomingFeature("NonisolatedNonsendingByDefault"),
+  ]
+
+  #if compiler(>=6.1)
+  globalSwiftSettings.append(
+    .unsafeFlags(["-Werror", "ExistentialAny"])
+  )
+  #endif
+
+  globalSwiftSettings += []  // avoid unused warning
+
+  for target in package.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 ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
   package.dependencies += [
     .package(url: "https://github.com/apple/swift-argument-parser", from: "1.4.0"),

utils/swift-xcodegen/README.md

@@ -2,7 +2,7 @@
 
 A script for generating an Xcode project for the Swift repo, that sits on top of an existing Ninja build.
 
-This script is primarily focussed on providing a good editor experience for working on the Swift project; it is not designed to produce compiled products or run tests, that should be done with `ninja` and `build-script`. It can however be used to [debug executables produced by the Ninja build](#debugging).
+This script is primarily focussed on providing a good editor experience for working on the Swift project; it is not designed to produce compiled products or run tests, that should be done with `ninja` and `build-script`. It can, however, be used to [debug executables produced by the Ninja build](#debugging).
 
 ## Running
 
@@ -12,11 +12,11 @@ You can run using either `utils/generate-xcode` or the `swift-xcodegen` script i
 ./swift-xcodegen <build dir>
 ```
 
-where `<build dir>` is the path to the build directory e.g `build/Ninja-RelWithDebInfoAssert`. This will by default create a `Swift.xcodeproj` in the parent directory (next to the `build` directory). Projects for LLVM, LLDB, and Clang may also be created by passing `--llvm`, `--lldb`, and `--clang` respectively. Workspaces of useful combinations will also be created (e.g Swift+LLVM, Clang+LLVM).
+where `<build dir>` is the path to the build directory e.g `build/Ninja-RelWithDebInfoAssert`. This will by default create a `Swift.xcodeproj` in the parent directory (next to the `build` directory). Projects for LLVM, LLDB, and Clang may also be created by passing `--llvm`, `--lldb`, and `--clang`, respectively. Workspaces of useful combinations will also be created (e.g Swift+LLVM, Clang+LLVM).
 
 For the full set of options, see the [Command usage](#command-usage) below.
 
-An `ALL` meta-target is created that depends on all the targets in the given project or workspace. A scheme for this target is automatically generated too (and automatic scheme generation is disabled). You can manually add individual schemes for targets you're interested in. Note however that Clang targets do not currently have dependency information.
+An `ALL` meta-target is created that depends on all the targets in the given project or workspace. A scheme for this target is automatically generated too (and automatic scheme generation is disabled). You can manually add individual schemes for targets you're interested in. Note, however, that Clang targets do not currently have dependency information.
 
 ## Debugging
 
@@ -95,7 +95,6 @@ PROJECT CONFIGURATION:
                           folder references to be used for compatible targets. This allows new
                           source files to be added to a target without needing to regenerate the
                           project. (default: --buildable-folders)
-
   --runtimes-build-dir <runtimes-build-dir>
                           Experimental: The path to a build directory for the new 'Runtimes/'
                           stdlib CMake build. This creates a separate 'SwiftRuntimes' project, along
@@ -107,10 +106,10 @@ PROJECT CONFIGURATION:
 MISC:
   --project-root-dir <project-root-dir>
                           The project root directory, which is the parent directory of the Swift repo.
-                          By default this is inferred from the build directory path.
-  --output-dir <output-dir>
-                          The output directory to write the Xcode project to. Defaults to the project
-                          root directory.
+                          By default, this is inferred from the build directory path.
+  -o, --output-dir <output-dir>
+                          The output directory to write the Xcode project to. Defaults to the
+                          project root directory.
   --log-level <log-level> The log level verbosity (default: info) (values: debug, info, note, warning, error)
   --parallel/--no-parallel
                           Parallelize generation of projects (default: --parallel)

utils/swift-xcodegen/Sources/SwiftXcodeGen/BuildArgs/BuildArgs.swift

@@ -2,15 +2,15 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2024 Apple Inc. and the Swift project authors
+// Copyright (c) 2024 - 2025 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See https://swift.org/LICENSE.txt for license information
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
 
-struct BuildArgs {
+struct BuildArgs: Sendable {
   let command: KnownCommand
   private var topLevelArgs: [Command.Argument] = []
   private var subOptArgs: [SubOptionArgs] = []

utils/swift-xcodegen/Sources/SwiftXcodeGen/BuildArgs/ClangBuildArgsProvider.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2024 Apple Inc. and the Swift project authors
+// Copyright (c) 2024 - 2025 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See https://swift.org/LICENSE.txt for license information
@@ -12,7 +12,7 @@
 
 import Foundation
 
-struct ClangBuildArgsProvider {
+struct ClangBuildArgsProvider: Sendable {
   private var args = CommandArgTree()
   private var outputs: [RelativePath: AbsolutePath] = [:]
 

utils/swift-xcodegen/Sources/SwiftXcodeGen/BuildArgs/RunnableTargets.swift

@@ -2,22 +2,24 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2024 Apple Inc. and the Swift project authors
+// Copyright (c) 2024 - 2025 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See https://swift.org/LICENSE.txt for license information
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
 
+import System
+
 /// A target that defines a runnable executable.
 struct RunnableTarget: Hashable {
   var name: String
   var ninjaTargetName: String
   var path: AbsolutePath
 }
 
-struct RunnableTargets {
+struct RunnableTargets: Sendable {
   private var addedPaths: Set<RelativePath> = []
   private var targets: [RunnableTarget] = []
 

utils/swift-xcodegen/Sources/SwiftXcodeGen/BuildArgs/SwiftTargets.swift

@@ -2,15 +2,15 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2024 Apple Inc. and the Swift project authors
+// Copyright (c) 2024 - 2025 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See https://swift.org/LICENSE.txt for license information
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
 
-struct SwiftTargets {
+struct SwiftTargets: Sendable {
   private var targets: [SwiftTarget] = []
 
   private var outputAliases: [String: [String]] = [:]

utils/swift-xcodegen/Sources/SwiftXcodeGen/Command/Command.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2024 Apple Inc. and the Swift project authors
+// Copyright (c) 2024 - 2025 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See https://swift.org/LICENSE.txt for license information
@@ -21,7 +21,7 @@ struct Command: Hashable {
 }
 
 extension Command: Decodable {
-  init(from decoder: Decoder) throws {
+  init(from decoder: any Decoder) throws {
     let command = try decoder.singleValueContainer().decode(String.self)
     self = try CommandParser.parseCommand(command)
   }

utils/swift-xcodegen/Sources/SwiftXcodeGen/Command/CompileCommands.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2024 Apple Inc. and the Swift project authors
+// Copyright (c) 2024 - 2025 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See https://swift.org/LICENSE.txt for license information
@@ -18,7 +18,7 @@ struct CompileCommands: Decodable {
     self.commands = commands
   }
 
-  public init(from decoder: Decoder) throws {
+  public init(from decoder: any Decoder) throws {
     self.init(try decoder.singleValueContainer().decode([Element].self))
   }
 }

utils/swift-xcodegen/Sources/SwiftXcodeGen/Concurrency/Lock.swift

@@ -0,0 +1,42 @@
+//===--- Mutex+Extensions.swift -------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2025 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+import Synchronization
+
+extension Mutex {
+  init() where Value == Void {
+    self.init(())
+  }
+
+  init<T>() where Value == T? {
+    self.init(nil)
+  }
+
+  init<T>() where Value == [T] {
+    self.init([])
+  }
+
+  init<T, U>() where Value == [T: U] {
+    self.init([:])
+  }
+}
+
+/// Having to write `_ in` when the value is `Void` is annoying.
+extension Mutex where Value == Void {
+  borrowing func withLock<Result: ~Copyable & Sendable, E>(
+    _ body: () throws(E) -> sending Result
+  ) throws(E) -> sending Result {
+    return try self.withLock { _ throws(E) in
+      try body()
+    }
+  }
+}