[utils] swift-xcodegen: Bump tools version to 6.0

Author: AnthonyLatsis

utils/swift-xcodegen/Package.swift

@@ -1,4 +1,4 @@
-// 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
@@ -16,26 +16,21 @@ 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]
 )
 
 if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {

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,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
@@ -17,7 +17,7 @@ struct RunnableTarget: Hashable {
   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/Generator/SwiftTarget.swift

@@ -2,15 +2,16 @@
 //
 // 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
 //
 //===----------------------------------------------------------------------===//
 
-final class SwiftTarget {
+// FIXME: Come up with a design to safely convince the compiler that this is never accessed concurrently.
+final class SwiftTarget: @unchecked Sendable {
   let name: String
   let moduleName: String
 
@@ -41,16 +42,16 @@ extension SwiftTarget: CustomDebugStringConvertible {
 }
 
 extension SwiftTarget {
-  struct Sources {
+  struct Sources: Sendable {
     var repoSources: [RelativePath] = []
     var externalSources: [AbsolutePath] = []
   }
-  struct BuildRule {
+  struct BuildRule: Sendable {
     var parentPath: RelativePath?
     var sources: Sources
     var buildArgs: BuildArgs
   }
-  struct EmitModuleRule {
+  struct EmitModuleRule: Sendable {
     var sources: Sources
     var buildArgs: BuildArgs
   }