Merge pull request #650 from jakepetroules/merge-6.2

Merge release/6.2 into main

Author: jakepetroules

Sources/SWBApplePlatform/Specs/MetalCompiler.xcspec

@@ -252,6 +252,7 @@
                     Metal30,
                     Metal31,
                     Metal32,
+                    Metal40,
                 );
                 Category = BuildOptions;
             },
@@ -272,6 +273,7 @@
                     Metal30,
                     Metal31,
                     Metal32,
+                    Metal40,
                 );
                 CommandLineArgs = {
                     UseDeploymentTarget = (  );
@@ -286,6 +288,7 @@
                     Metal30 = ( "-std=metal3.0", );
                     Metal31 = ( "-std=metal3.1", );
                     Metal32 = ( "-std=metal3.2", );
+                    Metal40 = ( "-std=metal4.0", );
                 };
             },
             {

Sources/SWBApplePlatform/Specs/MetalLinker.xcspec

@@ -83,6 +83,7 @@
                     Metal30 = ( "-std=metal3.0", );
                     Metal31 = ( "-std=metal3.1", );
                     Metal32 = ( "-std=metal3.2", );
+                    Metal40 = ( "-std=metal4.0", );
                 };
             },
             {

Sources/SWBApplePlatform/Specs/en.lproj/com.apple.compilers.metal.strings

@@ -90,6 +90,8 @@
 "[MTL_LANGUAGE_REVISION]-description-[Metal31]" = "Metal 3.1";
 "[MTL_LANGUAGE_REVISION]-value-[Metal32]" = "Metal 3.2";
 "[MTL_LANGUAGE_REVISION]-description-[Metal32]" = "Metal 3.2";
+"[MTL_LANGUAGE_REVISION]-value-[Metal40]" = "Metal 4.0";
+"[MTL_LANGUAGE_REVISION]-description-[Metal40]" = "Metal 4.0";
 
 "[MTL_ENABLE_DEBUG_INFO]-name" = "Produce Debugging Information";
 "[MTL_ENABLE_DEBUG_INFO]-description" = "Debugging information is required for shader debugging and profiling.";

Sources/SWBApplePlatform/Specs/macOSCoreBuildSystem.xcspec

@@ -30,6 +30,12 @@
                 DefaultValue = "";
                 Category = "Deployment";
             },
+            {   Name = "REGISTER_APP_GROUPS";
+                Type = Boolean;
+                DefaultValue = NO;
+                Category = "Code Signing";
+                Description = "Register app groups in profiles.";
+            },
         );
     },
 

Sources/SWBApplePlatform/Specs/macOSNativeBuildSystem.xcspec

@@ -31,6 +31,12 @@
                 Category = "Deployment";
                 Description = "Path to a file specifying additional requirements for a product archive.";
             },
+            {   Name = "REGISTER_APP_GROUPS";
+                Type = Boolean;
+                DefaultValue = NO;
+                Category = "Code Signing";
+                Description = "Register app groups in profiles.";
+            },
         );
     }
 )

Sources/SWBCore/PlatformRegistry.swift

@@ -73,9 +73,12 @@ public final class Platform: Sendable {
     /// Minimum OS version for Swift-in-the-OS support. If this is `nil`, the platform does not support Swift-in-the-OS at all.
     fileprivate(set) var minimumOSForSwiftInTheOS: Version? = nil
 
-    /// Minimum OS version for built-in Swift concurrency support. If this is `nil`, the platform does not support Swift concurrency at all.
+    /// Minimum OS version for Swift concurrency (Swift 5.5). If this is `nil`, the platform does not support Swift concurrency at all.
     fileprivate(set) var minimumOSForSwiftConcurrency: Version? = nil
 
+    /// Minimum OS version for Span in the standard library (Swift 6.2). If this is `nil`, Span, MutableSpan, and related types are not available.
+    fileprivate(set) var minimumOSForSwiftSpan: Version? = nil
+
     /// The canonical name of the public SDK for this platform.
     /// - remark: This does not mean that this SDK exists, just that this is its canonical name if it does exist.
     @_spi(Testing) public let sdkCanonicalName: String?
@@ -244,6 +247,11 @@ extension Platform {
         return self.minimumOSForSwiftConcurrency ?? self.correspondingDevicePlatform?.minimumOSForSwiftConcurrency ?? nil
     }
 
+    /// Determines the deployment version to use for Swift Span support.
+    fileprivate func swiftOSSpanVersion(_ deploymentTarget: StringMacroDeclaration) -> Version? {
+        return self.minimumOSForSwiftSpan ?? self.correspondingDevicePlatform?.minimumOSForSwiftSpan ?? nil
+    }
+
     /// Determines if the platform supports Swift in the OS.
     public func supportsSwiftInTheOS(_ scope: MacroEvaluationScope, forceNextMajorVersion: Bool = false, considerTargetDeviceOSVersion: Bool = true) -> Bool {
         guard let deploymentTarget = self.deploymentTargetMacro else { return false }
@@ -265,7 +273,7 @@ extension Platform {
         return version >= minimumSwiftInTheOSVersion
     }
 
-    /// Determines if the platform natively supports Swift concurrency. If `false`, then the Swift back-compat concurrency libs needs to be copied into the app/framework's bundle.
+    /// Determines if the platform natively supports Swift concurrency. If `false`, then the Swift concurrency back-compat concurrency libs needs to be copied into the app/framework's bundle.
     public func supportsSwiftConcurrencyNatively(_ scope: MacroEvaluationScope, forceNextMajorVersion: Bool = false, considerTargetDeviceOSVersion: Bool = true) -> Bool? {
         guard let deploymentTarget = self.deploymentTargetMacro else { return false }
 
@@ -287,6 +295,29 @@ extension Platform {
 
         return version >= minimumSwiftConcurrencyVersion
     }
+
+    /// Determines if the platform natively supports Swift 6.2's Span type. If `false`, then the Swift Span back-compat lib needs to be copied into the app/framework's bundle.
+    public func supportsSwiftSpanNatively(_ scope: MacroEvaluationScope, forceNextMajorVersion: Bool, considerTargetDeviceOSVersion: Bool) -> Bool? {
+        guard let deploymentTarget = self.deploymentTargetMacro else { return false }
+
+        // If we have target device info and its platform matches the build platform, compare the device OS version
+        let targetDeviceVersion: Version?
+        if considerTargetDeviceOSVersion && scope.evaluate(BuiltinMacros.TARGET_DEVICE_PLATFORM_NAME) == self.name {
+            targetDeviceVersion = try? Version(scope.evaluate(BuiltinMacros.TARGET_DEVICE_OS_VERSION))
+        } else {
+            targetDeviceVersion = nil
+        }
+
+        // Otherwise fall back to comparing the minimum deployment target
+        let deploymentTargetVersion = try? Version(scope.evaluate(deploymentTarget))
+
+        guard let version = targetDeviceVersion ?? deploymentTargetVersion else { return false }
+
+        // Return `nil` here as there is no metadata for the platform to allow downstream clients to be aware of this.
+        guard let minimumSwiftSpanVersion = swiftOSSpanVersion(deploymentTarget) else { return nil }
+
+        return version >= minimumSwiftSpanVersion
+    }
 }
 
 extension Platform: CustomStringConvertible {
@@ -633,6 +664,7 @@ public final class PlatformRegistry {
             if let variant = platform.defaultSDKVariant {
                 platform.minimumOSForSwiftInTheOS = variant.minimumOSForSwiftInTheOS
                 platform.minimumOSForSwiftConcurrency = variant.minimumOSForSwiftConcurrency
+                platform.minimumOSForSwiftSpan = variant.minimumOSForSwiftSpan
             }
         }
 

Sources/SWBCore/SDKRegistry.swift

@@ -313,9 +313,12 @@ public final class SDKVariant: PlatformInfoProvider, Sendable {
     /// Minimum OS version for Swift-in-the-OS support. If this is `nil`, the platform does not support Swift-in-the-OS at all.
     public let minimumOSForSwiftInTheOS: Version?
 
-    /// Minimum OS version for built-in Swift concurrency support. If this is `nil`, the platform does not support Swift concurrency at all.
+    /// Minimum OS version for built-in Swift concurrency support (Swift 5.5). If this is `nil`, the platform does not support Swift concurrency at all.
     public let minimumOSForSwiftConcurrency: Version?
 
+    /// Minimum OS version for built-in Swift Span support (Swift 6.2). If this is `nil`, the platform does not support Swift Span at all.
+    public let minimumOSForSwiftSpan: Version?
+
     /// The path prefix under which all built content produced by this SDK variant should be installed, relative to the system root.
     ///
     /// Empty string if content should be installed directly into the system root (default).
@@ -392,9 +395,10 @@ public final class SDKVariant: PlatformInfoProvider, Sendable {
 
         self.clangRuntimeLibraryPlatformName = supportedTargetDict["ClangRuntimeLibraryPlatformName"]?.stringValue ?? Self.fallbackClangRuntimeLibraryPlatformName(variantName: name)
 
-        let (os, concurrency) = Self.fallbackSwiftVersions(variantName: name)
+        let (os, concurrency, span) = Self.fallbackSwiftVersions(variantName: name)
         self.minimumOSForSwiftInTheOS = try (supportedTargetDict["SwiftOSRuntimeMinimumDeploymentTarget"]?.stringValue ?? os).map { try Version($0) }
         self.minimumOSForSwiftConcurrency = try (supportedTargetDict["SwiftConcurrencyMinimumDeploymentTarget"]?.stringValue ?? concurrency).map { try Version($0) }
+        self.minimumOSForSwiftSpan = try (supportedTargetDict["SwiftSpanMinimumDeploymentTarget"]?.stringValue ?? span).map { try Version($0) }
 
         self.systemPrefix = supportedTargetDict["SystemPrefix"]?.stringValue ?? {
             switch name {
@@ -445,12 +449,12 @@ public final class SDKVariant: PlatformInfoProvider, Sendable {
         }
     }
 
-    private static func fallbackSwiftVersions(variantName name: String) -> (String?, String?) {
+    private static func fallbackSwiftVersions(variantName name: String) -> (os: String?, concurrency: String?, span: String?) {
         switch name {
         case "macos", "macosx":
-            return ("10.14.4", "12.0")
+            return ("10.14.4", "12.0", "26.0")
         default:
-            return (nil, nil)
+            return (nil, nil, "26.0")
         }
     }
 

Sources/SWBCore/SWBFeatureFlag.swift

@@ -157,5 +157,5 @@ public enum SWBFeatureFlag {
 
     public static let enableCacheMetricsLogs = SWBFeatureFlagProperty("EnableCacheMetricsLogs", defaultValue: false)
 
-    public static let enableAppSandboxConflictingValuesEmitsWarning = SWBFeatureFlagProperty("AppSandboxConflictingValuesEmitsWarning", defaultValue: false)
+    public static let enableAppSandboxConflictingValuesEmitsWarning = SWBFeatureFlagProperty("AppSandboxConflictingValuesEmitsWarning", defaultValue: true)
 }

Sources/SWBCore/Settings/BuiltinMacros.swift

@@ -602,6 +602,7 @@ public final class BuiltinMacros {
     public static let DISABLE_INFOPLIST_PLATFORM_PROCESSING = BuiltinMacros.declareBooleanMacro("DISABLE_INFOPLIST_PLATFORM_PROCESSING")
     public static let DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING = BuiltinMacros.declareBooleanMacro("DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING")
     public static let DISABLE_STALE_FILE_REMOVAL = BuiltinMacros.declareBooleanMacro("DISABLE_STALE_FILE_REMOVAL")
+    public static let DISABLE_SWIFT_SPAN_COMPATIBILITY_RPATH = BuiltinMacros.declareBooleanMacro("DISABLE_SWIFT_SPAN_COMPATIBILITY_RPATH")
     public static let DISABLE_TEST_HOST_PLATFORM_PROCESSING = BuiltinMacros.declareBooleanMacro("DISABLE_TEST_HOST_PLATFORM_PROCESSING")
     public static let DISABLE_XCFRAMEWORK_SIGNATURE_VALIDATION = BuiltinMacros.declareBooleanMacro("DISABLE_XCFRAMEWORK_SIGNATURE_VALIDATION")
     public static let DONT_CREATE_BUILT_PRODUCTS_DIR_SYMLINKS = BuiltinMacros.declareBooleanMacro("DONT_CREATE_BUILT_PRODUCTS_DIR_SYMLINKS")
@@ -1620,6 +1621,7 @@ public final class BuiltinMacros {
         DISABLE_INFOPLIST_PLATFORM_PROCESSING,
         DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING,
         DISABLE_STALE_FILE_REMOVAL,
+        DISABLE_SWIFT_SPAN_COMPATIBILITY_RPATH,
         DISABLE_TEST_HOST_PLATFORM_PROCESSING,
         DISABLE_XCFRAMEWORK_SIGNATURE_VALIDATION,
         DOCC_ARCHIVE_PATH,

Sources/SWBCore/Settings/Settings.swift

@@ -146,6 +146,11 @@ fileprivate struct PreOverridesSettings {
             table.push(BuiltinMacros.LM_SKIP_METADATA_EXTRACTION, BuiltinMacros.namespace.parseString("YES"))
         }
 
+        // This is a hack to prevent Span back deployment from causing excessive test churn when using an older Xcode in Swift CI.
+        if core.xcodeProductBuildVersion <= (try! ProductBuildVersion("17A1")) {
+            table.push(BuiltinMacros.DISABLE_SWIFT_SPAN_COMPATIBILITY_RPATH, BuiltinMacros.namespace.parseString("YES"))
+        }
+
         // Add the "calculated" settings.
         addCalculatedUniversalDefaults(&table)