Merge branch 'main' into automerge/merge-main-2025-09-01_09-02

Author: jakepetroules

.editorconfig

@@ -11,3 +11,6 @@ xcode_trim_whitespace_on_empty_lines = true
 
 [*.{yml,yaml}]
 indent_size = 2
+
+[CMakeLists.txt]
+indent_size = 2

.github/scripts/linux_pre_build.sh

@@ -31,16 +31,16 @@ if command -v apt-get >/dev/null 2>&1 ; then # bookworm, noble, jammy
     # Android NDK
     dpkg_architecture="$(dpkg --print-architecture)"
     if [[ "$SKIP_ANDROID" != "1" ]] && [[ "$dpkg_architecture" == amd64 ]] ; then
-        eval "$(cat /etc/lsb-release)"
-        case "$DISTRIB_CODENAME" in
+        eval "$(cat /etc/os-release)"
+        case "$VERSION_CODENAME" in
             bookworm|jammy)
                 : # Not available
                 ;;
             noble)
                 apt-get install -y google-android-ndk-r26c-installer
                 ;;
             *)
-                echo "Unknown distribution: $DISTRIB_CODENAME" >&2
+                echo "Unable to fetch Android NDK for unknown Linux distribution: $VERSION_CODENAME" >&2
                 exit 1
         esac
     else

.github/workflows/automerge.yml

@@ -10,7 +10,8 @@ jobs:
     name: Create PR to merge main into release branch
     uses: swiftlang/github-workflows/.github/workflows/create_automerge_pr.yml@main
     with:
-      base_branch: release/6.2
+      head_branch: release/6.2
+      base_branch: main
     permissions:
       contents: write
       pull-requests: write

.github/workflows/pull_request.yml

@@ -13,12 +13,14 @@ jobs:
     name: Test
     uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
     with:
-      linux_os_versions: '["noble", "jammy", "rhel-ubi9"]'
+      linux_os_versions: '["amazonlinux2", "bookworm", "noble", "jammy", "rhel-ubi9"]'
       linux_pre_build_command: ./.github/scripts/linux_pre_build.sh
       linux_build_command: 'swift test --no-parallel'
       linux_swift_versions: '["nightly-main", "nightly-6.2"]'
       windows_swift_versions: '["nightly-main"]'
-      windows_build_command: 'swift test --no-parallel'
+      windows_build_command: 'Invoke-Program swift test --no-parallel'
+      enable_linux_static_sdk_build: true
+      linux_static_sdk_build_command: SWIFTBUILD_STATIC_LINK=1 LLBUILD_STATIC_LINK=1 swift build
   cmake-smoke-test:
     name: cmake-smoke-test
     uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main

.licenseignore

@@ -5,5 +5,6 @@
 **/Package.swift
 .dir-locals.el
 .editorconfig
+.swift-version
 CODEOWNERS
 Package.swift

.swift-version

@@ -0,0 +1 @@
+6.1.0

Package.swift

@@ -20,6 +20,7 @@ let appleOS = true
 let appleOS = false
 #endif
 
+let isStaticBuild = Context.environment["SWIFTBUILD_STATIC_LINK"] != nil
 let useLocalDependencies = Context.environment["SWIFTCI_USE_LOCAL_DEPS"] != nil
 let useLLBuildFramework = Context.environment["SWIFTBUILD_LLBUILD_FWK"] != nil
 
@@ -70,7 +71,11 @@ func swiftSettings(languageMode: SwiftLanguageMode) -> [SwiftSetting] {
 let package = Package(
     name: "SwiftBuild",
     defaultLocalization: "en",
-    platforms: [.macOS("13.0"), .iOS("17.0"), .macCatalyst("17.0")],
+    platforms: [
+        .macOS(.v14),
+        .iOS("17.0"),
+        .macCatalyst("17.0"),
+    ],
     products: [
         .executable(name: "swbuild", targets: ["swbuild"]),
         .executable(name: "SWBBuildServiceBundle", targets: ["SWBBuildServiceBundle"]),
@@ -204,7 +209,7 @@ let package = Package(
                 .product(name: "SystemPackage", package: "swift-system", condition: .when(platforms: [.linux, .openbsd, .android, .windows, .custom("freebsd")])),
             ],
             exclude: ["CMakeLists.txt"],
-            swiftSettings: swiftSettings(languageMode: .v5)),
+            swiftSettings: swiftSettings(languageMode: .v6)),
         .target(
             name: "SWBCAS",
             dependencies: ["SWBUtil", "SWBCSupport"],
@@ -369,7 +374,7 @@ let package = Package(
         // Perf tests
         .testTarget(
             name: "SWBBuildSystemPerfTests",
-            dependencies: ["SWBBuildSystem", "SWBTestSupport"],
+            dependencies: ["SWBBuildSystem", "SWBTestSupport", "SwiftBuildTestSupport"],
             swiftSettings: swiftSettings(languageMode: .v6)),
         .testTarget(
             name: "SWBCASPerfTests",
@@ -443,6 +448,12 @@ for target in package.targets {
     }
 }
 
+if isStaticBuild {
+    package.targets = package.targets.filter { target in
+        target.type != .test && !target.name.hasSuffix("TestSupport")
+    }
+}
+
 // `SWIFTCI_USE_LOCAL_DEPS` configures if dependencies are locally available to build
 if useLocalDependencies {
     package.dependencies += [
@@ -455,11 +466,11 @@ if useLocalDependencies {
     }
 } else {
     package.dependencies += [
-        .package(url: "https://github.com/swiftlang/swift-driver.git", branch: "release/6.2"),
+        .package(url: "https://github.com/swiftlang/swift-driver.git", branch: "main"),
         .package(url: "https://github.com/apple/swift-system.git", .upToNextMajor(from: "1.5.0")),
         .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.0.3"),
     ]
     if !useLLBuildFramework {
-        package.dependencies += [.package(url: "https://github.com/swiftlang/swift-llbuild.git", branch: "release/6.2"),]
+        package.dependencies += [.package(url: "https://github.com/swiftlang/swift-llbuild.git", branch: "main"),]
     }
 }

README.md

@@ -12,11 +12,11 @@ When building SwiftPM from sources which include Swift Build integration, passin
 
 ### With Xcode
 
-Changes to swift-build can also be tested in Xcode using the `launch-xcode` command plugin provided by the package. Run `swift package --disable-sandbox launch-xcode` from your checkout of swift-build to launch a copy of the currently `xcode-select`ed Xcode.app configured to use your modified copy of the build system service. This workflow is currently supported when using Xcode 16.2.
+Changes to swift-build can also be tested in Xcode using the `launch-xcode` command plugin provided by the package. Run `swift package --disable-sandbox launch-xcode` from your checkout of swift-build to launch a copy of the currently `xcode-select`ed Xcode.app configured to use your modified copy of the build system service. This workflow is generally only supported when using the latest available Xcode version.
 
 ### With xcodebuild
 
-Changes to swift-build can also be tested in xcodebuild using the `run-xcodebuild` command plugin provided by the package. Run `swift package --disable-sandbox run-xcodebuild` from your checkout of swift-build to run xcodebuild from the currently `xcode-select`ed Xcode.app configured to use your modified copy of the build system service. Arguments followed by `--` will be forwarded to xcodebuild unmodified. This workflow is currently supported when using Xcode 16.2.
+Changes to swift-build can also be tested in xcodebuild using the `run-xcodebuild` command plugin provided by the package. Run `swift package --disable-sandbox run-xcodebuild` from your checkout of swift-build to run xcodebuild from the currently `xcode-select`ed Xcode.app configured to use your modified copy of the build system service. Arguments followed by `--` will be forwarded to xcodebuild unmodified. This workflow is generally only supported when using the latest available Xcode version.
 
 ### Debugging
 

Sources/SWBAndroidPlatform/AndroidSDK.swift

@@ -57,10 +57,6 @@ public import Foundation
 
             let metaPath = ndkPath.path.join("meta")
 
-            guard #available(macOS 14, *) else {
-                throw StubError.error("Unsupported macOS version")
-            }
-
             if version < Self.minimumNDKVersion {
                 throw Error.unsupportedVersion(path: ndkPath, minimumVersion: Self.minimumNDKVersion)
             }

Sources/SWBAndroidPlatform/Plugin.swift

@@ -15,7 +15,7 @@ public import SWBCore
 import SWBMacro
 import Foundation
 
-@PluginExtensionSystemActor public func initializePlugin(_ manager: PluginManager) {
+public let initializePlugin: PluginInitializationFunction = { manager in
     let plugin = AndroidPlugin()
     manager.register(AndroidPlatformSpecsExtension(), type: SpecificationsExtensionPoint.self)
     manager.register(AndroidEnvironmentExtension(plugin: plugin), type: EnvironmentExtensionPoint.self)
@@ -149,26 +149,44 @@ struct AndroidPlatformExtension: PlatformInfoExtension {
             hostOperatingSystem: context.hostOperatingSystem
         )) ?? []
 
-        let swiftSettings: [String: PropertyListItem]
-        // FIXME: We need a way to narrow down the list, possibly by passing down a Swift SDK identifier from SwiftPM
-        // The resource path should be the same for all triples in an Android Swift SDK
-        if let androidSwiftSDK = androidSwiftSDKs.only, let swiftResourceDir = Set(androidSwiftSDK.targetTriples.values.map { tripleProperties in androidSwiftSDK.path.join(tripleProperties.swiftResourcesPath) }).only {
-            swiftSettings = [
-                "SWIFT_LIBRARY_PATH": .plString(swiftResourceDir.join("android").str),
-                "SWIFT_RESOURCE_DIR": .plString(swiftResourceDir.str),
-                "SWIFT_TARGET_TRIPLE": .plString("$(CURRENT_ARCH)-unknown-$(SWIFT_PLATFORM_TARGET_PREFIX)$(LLVM_TARGET_TRIPLE_SUFFIX)"),
-                "LIBRARY_SEARCH_PATHS": "$(inherited) $(SWIFT_RESOURCE_DIR)/../$(__ANDROID_TRIPLE_$(CURRENT_ARCH))",
-            ].merging(abis.map {
-                ("__ANDROID_TRIPLE_\($0.value.llvm_triple.arch)", .plString($0.value.triple))
-            }, uniquingKeysWith: { _, new in new })
-        } else {
-            swiftSettings = [:]
-        }
+        return try androidSwiftSDKs.map { androidSwiftSDK in
+            let perArchSwiftResourceDirs = try Dictionary(grouping: androidSwiftSDK.targetTriples, by: { try LLVMTriple($0.key).arch }).mapValues {
+                let paths = Set($0.compactMap { $0.value.swiftResourcesPath })
+                guard let path = paths.only else {
+                    throw StubError.error("The resource path should be the same for all triples of the same architecture in an Android Swift SDK")
+                }
+                return Path(path)
+            }
+
+            return sdk(
+                canonicalName: androidSwiftSDK.identifier,
+                androidPlatform: androidPlatform,
+                androidNdk: androidNdk,
+                defaultProperties: defaultProperties,
+                customProperties: [
+                    "SWIFT_TARGET_TRIPLE": .plString("$(CURRENT_ARCH)-unknown-$(SWIFT_PLATFORM_TARGET_PREFIX)$(LLVM_TARGET_TRIPLE_SUFFIX)"),
+                    "LIBRARY_SEARCH_PATHS": "$(inherited) $(SWIFT_RESOURCE_DIR)/../$(__ANDROID_TRIPLE_$(CURRENT_ARCH))",
+                ].merging(perArchSwiftResourceDirs.map {
+                    [
+                        ("SWIFT_LIBRARY_PATH[arch=\($0.key)]", .plString($0.value.join("android").str)),
+                        ("SWIFT_RESOURCE_DIR[arch=\($0.key)]", .plString($0.value.str)),
+                    ]
+                }.flatMap { $0 }, uniquingKeysWith: { _, new in new }).merging(abis.map {
+                    ("__ANDROID_TRIPLE_\($0.value.llvm_triple.arch)", .plString($0.value.triple))
+                }, uniquingKeysWith: { _, new in new }))
+        } + [
+            // Fallback SDK for when there are no Swift SDKs (Android SDK is still usable for C/C++-only code)
+            sdk(androidPlatform: androidPlatform, androidNdk: androidNdk, defaultProperties: defaultProperties)
+        ]
+    }
 
-        return [(androidNdk.sysroot.path, androidPlatform, [
+    private func sdk(canonicalName: String? = nil, androidPlatform: Platform, androidNdk: AndroidSDK.NDK, defaultProperties: [String: PropertyListItem], customProperties: [String: PropertyListItem] = [:]) -> (path: Path, platform: SWBCore.Platform?, data: [String: PropertyListItem]) {
+        return (androidNdk.sysroot.path, androidPlatform, [
             "Type": .plString("SDK"),
-            "Version": .plString("0.0.0"),
-            "CanonicalName": .plString("android"),
+            "Version": .plString(androidNdk.version.description),
+            "CanonicalName": .plString(canonicalName ?? "android\(androidNdk.version.description)"),
+            // "android.ndk" is an alias for the "Android SDK without a Swift SDK" scenario in order for tests to deterministically pick a single Android destination regardless of how many Android Swift SDKs may be installed.
+            "Aliases": .plArray([.plString("android")] + (canonicalName == nil ? [.plString("android.ndk")] : [])),
             "IsBaseSDK": .plBool(true),
             "DefaultProperties": .plDict([
                 "PLATFORM_NAME": .plString("android"),
@@ -178,14 +196,14 @@ struct AndroidPlatformExtension: PlatformInfoExtension {
                 // FIXME: Make this configurable in a better way so we don't need to push build settings at the SDK definition level
                 "LLVM_TARGET_TRIPLE_OS_VERSION": .plString("$(SWIFT_PLATFORM_TARGET_PREFIX)"),
                 "LLVM_TARGET_TRIPLE_SUFFIX": .plString("-android$($(DEPLOYMENT_TARGET_SETTING_NAME))"),
-            ].merging(swiftSettings, uniquingKeysWith: { _, new in new })),
+            ].merging(customProperties, uniquingKeysWith: { _, new in new })),
             "SupportedTargets": .plDict([
                 "android": .plDict([
-                    "Archs": .plArray(abis.map { .plString($0.value.llvm_triple.arch) }),
+                    "Archs": .plArray(androidNdk.abis.map { .plString($0.value.llvm_triple.arch) }),
                     "DeploymentTargetSettingName": .plString("ANDROID_DEPLOYMENT_TARGET"),
-                    "DefaultDeploymentTarget": .plString("\(deploymentTargetRange.min)"),
-                    "MinimumDeploymentTarget": .plString("\(deploymentTargetRange.min)"),
-                    "MaximumDeploymentTarget": .plString("\(deploymentTargetRange.max)"),
+                    "DefaultDeploymentTarget": .plString("\(androidNdk.deploymentTargetRange.min)"),
+                    "MinimumDeploymentTarget": .plString("\(androidNdk.deploymentTargetRange.min)"),
+                    "MaximumDeploymentTarget": .plString("\(androidNdk.deploymentTargetRange.max)"),
                     "LLVMTargetTripleEnvironment": .plString("android"), // FIXME: androideabi for armv7!
                     "LLVMTargetTripleSys": .plString("linux"),
                     "LLVMTargetTripleVendor": .plString("none"),
@@ -194,7 +212,7 @@ struct AndroidPlatformExtension: PlatformInfoExtension {
             "Toolchains": .plArray([
                 .plString("android")
             ])
-        ])]
+        ])
     }
 }