macOS 27.0 architecture updates

Author: owenv

Sources/SWBApplePlatform/Specs/DriverKit.xcspec

@@ -82,6 +82,7 @@
         Name = "Intel 64-bit";
         Description = "64-bit Intel";
         PerArchBuildSettingName = "Intel 64-bit";
+        DeploymentTargetRange = ( "0", "27" );
     },
     {
         _Domain = driverkit;

Sources/SWBApplePlatform/Specs/macOSArchitectures.xcspec

@@ -79,6 +79,7 @@
 		PerArchBuildSettingName = "Intel 64-bit";
 		ListInEnum = NO;
 		SortNumber = 106;
+        DeploymentTargetRange = ( "10.4.4", "27" );
 	},
     {
         _Domain = macosx;

Sources/SWBTestSupport/RunDestinationTestSupport.swift

@@ -28,12 +28,12 @@ package protocol _RunDestinationInfo {
 extension _RunDestinationInfo {
     /// A generic run destination targeting macOS, using the public SDK.
     package static var anyMac: Self {
-        return generic(sdk: "macosx", sdkVariant: "macos", supportedArchitectures: ["arm64", "arm64e", "x86_64", "x86_64h"])
+        return generic(sdk: "macosx", sdkVariant: "macos", supportedArchitectures: ["arm64", "arm64e"])
     }
 
     /// A generic run destination targeting Mac Catalyst, using the public SDK.
     package static var anyMacCatalyst: Self {
-        return generic(sdk: "macosx", sdkVariant: MacCatalystInfo.sdkVariantName, supportedArchitectures: ["arm64", "arm64e", "x86_64", "x86_64h"])
+        return generic(sdk: "macosx", sdkVariant: MacCatalystInfo.sdkVariantName, supportedArchitectures: ["arm64", "arm64e"])
     }
 
     /// A generic run destination targeting iOS, using the public SDK.
@@ -86,7 +86,14 @@ extension _RunDestinationInfo {
     static func destination(operatingSystem: OperatingSystem) -> Self {
         switch operatingSystem {
         case .macOS:
-            macOS
+            switch Architecture.host.stringValue {
+            case "arm64":
+                macOSAppleSilicon
+            case "x86_64":
+                macOSIntel
+            default:
+                preconditionFailure("Unknown architecture \(Architecture.host.stringValue ?? "<nil>")")
+            }
         case .iOS(let simulator):
             simulator ? iOSSimulator : iOS
         case .tvOS(let simulator):
@@ -119,18 +126,8 @@ extension _RunDestinationInfo {
 
     /// A run destination targeting macOS, using the public SDK.
     package static var macOS: Self {
-        #if os(macOS)
-        switch Architecture.host.stringValue {
-        case "arm64":
-            return macOSAppleSilicon
-        case "x86_64":
-            return macOSIntel
-        default:
-            preconditionFailure("Unknown architecture \(Architecture.host.stringValue ?? "<nil>")")
-        }
-        #else
-        return macOSIntel
-        #endif
+        // Default to Apple Silicon now that x86 is no longer supported in new versions of macOS
+        return .macOSAppleSilicon
     }
 
     /// A run destination targeting macOS running on Intel, using the public SDK.
@@ -150,19 +147,8 @@ extension _RunDestinationInfo {
 
     /// A run destination targeting macOS (Mac Catalyst), using the public SDK.
     package static var macCatalyst: Self {
-        #if os(macOS)
-        switch Architecture.host.stringValue {
-        case "arm64":
-            // FIXME: <rdar://78361860> Use results.runDestinationTargetArchitecture in our tests where appropriate so that this works
-            fallthrough // return macCatalystAppleSilicon
-        case "x86_64":
-            return macCatalystIntel
-        default:
-            preconditionFailure("Unknown architecture \(Architecture.host.stringValue ?? "<nil>")")
-        }
-        #else
-        return macCatalystIntel
-        #endif
+        // Default to Apple Silicon now that x86 is no longer supported in new versions of macOS
+        return .macCatalystAppleSilicon
     }
 
     /// A run destination targeting macOS (Mac Catalyst) running on Intel, using the public SDK.

Sources/SWBTestSupport/SkippedTestSupport.swift

@@ -329,6 +329,10 @@ extension Trait where Self == Testing.ConditionTrait {
         requireMinimumXcodeBuildVersion("17A1", sourceLocation: sourceLocation)
     }
 
+    package static func requireXcode27(sourceLocation: SourceLocation = #_sourceLocation) -> Self {
+        requireMinimumXcodeBuildVersion("27A1", sourceLocation: sourceLocation)
+    }
+
     package static func requireXcode26dot4(sourceLocation: SourceLocation = #_sourceLocation) -> Self {
         requireMinimumXcodeBuildVersion("17E1", sourceLocation: sourceLocation)
     }

Tests/SWBBuildSystemTests/BuildBacktraceTests.swift

@@ -263,7 +263,7 @@ fileprivate struct BuildBacktraceTests: CoreBasedTests {
         }
     }
 
-    @Test(.requireSDKs(.macOS))
+    @Test(.requireSDKs(.macOS), .requireXcode26())
     func backtracesForDeletedOutputs() async throws {
         try await withTemporaryDirectory { tmpDirPath async throws -> Void in
             let testWorkspace = TestWorkspace(

Tests/SWBBuildSystemTests/BuildCommandTests.swift

@@ -287,9 +287,9 @@ fileprivate struct BuildCommandTests: CoreBasedTests {
     }
 
     /// Check assembling of a single file.
-    @Test(.requireSDKs(.macOS))
+    @Test(.requireSDKs(.macOS), .requireXcode26())
     func assembleSingleFile() async throws {
-        try await runSingleFileTask(BuildParameters(configuration: "Debug", activeRunDestination: .macOSIntel), buildCommand: .generateAssemblyCode(buildOnlyTheseFiles: [Path("")]), fileName: "File.m") { results, excludedTypes, inputs, outputs in
+        try await runSingleFileTask(BuildParameters(configuration: "Debug", activeRunDestination: .macOSIntel, overrides: ["MACOSX_DEPLOYMENT_TARGET": "26.0"]), buildCommand: .generateAssemblyCode(buildOnlyTheseFiles: [Path("")]), fileName: "File.m") { results, excludedTypes, inputs, outputs in
             results.consumeTasksMatchingRuleTypes(excludedTypes)
             try results.checkTask(.matchRuleType("Assemble"), .matchRuleItemBasename("File.m"), .matchRuleItem("normal"), .matchRuleItem(results.runDestinationTargetArchitecture)) { task in
                 task.checkCommandLineContainsUninterrupted(["-x", "objective-c"])
@@ -301,7 +301,7 @@ fileprivate struct BuildCommandTests: CoreBasedTests {
         }
 
         // Ensure that RUN_CLANG_STATIC_ANALYZER=YES doesn't interfere with the assemble build command
-        try await runSingleFileTask(BuildParameters(configuration: "Debug", activeRunDestination: .macOSIntel, overrides: ["RUN_CLANG_STATIC_ANALYZER": "YES"]), buildCommand: .generateAssemblyCode(buildOnlyTheseFiles: [Path("")]), fileName: "File.m") { results, excludedTypes, inputs, outputs in
+        try await runSingleFileTask(BuildParameters(configuration: "Debug", activeRunDestination: .macOSIntel, overrides: ["RUN_CLANG_STATIC_ANALYZER": "YES", "MACOSX_DEPLOYMENT_TARGET": "26.0"]), buildCommand: .generateAssemblyCode(buildOnlyTheseFiles: [Path("")]), fileName: "File.m") { results, excludedTypes, inputs, outputs in
             results.consumeTasksMatchingRuleTypes(excludedTypes)
             try results.checkTask(.matchRuleType("Assemble"), .matchRuleItemBasename("File.m"), .matchRuleItem("normal"), .matchRuleItem(results.runDestinationTargetArchitecture)) { task in
                 task.checkCommandLineContainsUninterrupted(["-x", "objective-c"])
@@ -313,7 +313,7 @@ fileprivate struct BuildCommandTests: CoreBasedTests {
         }
 
         // Include the single file to assemble in multiple targets
-        try await runSingleFileTask(BuildParameters(configuration: "Debug", activeRunDestination: .macOSIntel), buildCommand: .generateAssemblyCode(buildOnlyTheseFiles: [Path("")]), fileName: "File.m", multipleTargets: true) { results, excludedTypes, inputs, outputs in
+        try await runSingleFileTask(BuildParameters(configuration: "Debug", activeRunDestination: .macOSIntel, overrides: ["MACOSX_DEPLOYMENT_TARGET": "26.0"]), buildCommand: .generateAssemblyCode(buildOnlyTheseFiles: [Path("")]), fileName: "File.m", multipleTargets: true) { results, excludedTypes, inputs, outputs in
             let firstOutput = try #require(outputs.sorted()[safe: 0])
             let secondOutput = try #require(outputs.sorted()[safe: 1])
             results.consumeTasksMatchingRuleTypes(excludedTypes)

Tests/SWBBuildSystemTests/BuildDescriptionConstructionTests.swift

@@ -854,6 +854,7 @@ fileprivate struct BuildDescriptionConstructionTests: CoreBasedTests {
 
     @Test(.requireSDKs(.macOS))
     func packageDiamondProblemDiagnosticWithBundleLoader() async throws {
+        let core = try await getCore()
         try await withTemporaryDirectory { tmpDir in
             let workspace = try await TestWorkspace("Workspace",
                                                     sourceRoot: tmpDir,
@@ -874,8 +875,8 @@ fileprivate struct BuildDescriptionConstructionTests: CoreBasedTests {
                                                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                                                 "USE_HEADERMAP": "NO",
                                                                 "SKIP_INSTALL": "YES",
-                                                                "MACOSX_DEPLOYMENT_TARGET": "10.15",
-                                                                "IPHONEOS_DEPLOYMENT_TARGET": "13.0",
+                                                                "MACOSX_DEPLOYMENT_TARGET": core.loadSDK(.macOS).defaultDeploymentTarget,
+                                                                "IPHONEOS_DEPLOYMENT_TARGET": core.loadSDK(.iOS).defaultDeploymentTarget,
                                                                 "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
                                                                 "SUPPORTS_MACCATALYST": "YES",
                                                             ]),

Tests/SWBBuildSystemTests/BuildOperationTests.swift

@@ -3097,7 +3097,7 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
     }
 
     /// Check the actual behavior of mutable tasks in an [incremental] build.
-    @Test(.requireSDKs(.macOS))
+    @Test(.requireSDKs(.macOS), .requireXcode26())
     func actualMutableBehaviors() async throws {
         func checkScenario(_ name: String, expectedTasks: [String], generic: Bool = false, settings: [String: String] = [:], enableSigning: Bool = false, targetType: TestStandardTarget.TargetType = .commandLineTool) async throws {
             let targetName = targetType == .framework ? "Fwk" : "Tool"
@@ -3239,6 +3239,7 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
         try await checkScenario("Universal Tool Mutation", expectedTasks: ["ScanDependencies", "ScanDependencies", "CompileC", "CompileC", "CreateUniversalBinary", "Ld", "Ld", "Strip"], generic: true, settings: [
             "STRIP_INSTALLED_PRODUCT": "YES",
             "ARCHS": "x86_64 x86_64h",
+            "MACOSX_DEPLOYMENT_TARGET": "26.0",
             "VALID_ARCHS[sdk=macosx*]": "$(inherited) x86_64h"])
 
         // Check the behavior of signing a framework.
@@ -3481,7 +3482,7 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
     }
 
     /// Tests that content such as headers is removed from frameworks when they are processed by a copy files build phase.
-    @Test(.requireSDKs(.macOS, .iOS), arguments: [.anyMac, .anyiOSDevice, .anyMacCatalyst] as [RunDestinationInfo])
+    @Test(.requireSDKs(.macOS, .iOS), .requireXcode27(), arguments: [.anyMac, .anyiOSDevice, .anyMacCatalyst] as [RunDestinationInfo])
     func copiedFrameworkContentPruning(runDestination: RunDestinationInfo) async throws {
         try await withTemporaryDirectory { tmpDirPath in
             let testWorkspace = TestWorkspace(
@@ -3551,7 +3552,7 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
             let signableTargets: Set<String> = ["App", "App2"]
 
             let sourceDynamicFrameworkPath = tmpDirPath.join("ADynamicFwk.framework")
-            try await tester.fs.writeFramework(sourceDynamicFrameworkPath, archs: runDestination.platform == "macosx" ? ["arm64", "x86_64"] : ["arm64"], platform: #require(runDestination.buildVersionPlatform(core)), infoLookup: core, static: false) { _, _, headersDir, resourcesDir in
+            try await tester.fs.writeFramework(sourceDynamicFrameworkPath, archs: ["arm64"], platform: #require(runDestination.buildVersionPlatform(core)), infoLookup: core, static: false) { _, _, headersDir, resourcesDir in
                 try await tester.fs.writeFileContents(headersDir.join("ADynamicFwk.h")) { $0 <<< "" }
                 try await tester.fs.writePlist(resourcesDir.join("ADynamicResource.plist"), .plDict([:]))
                 try await tester.fs.writePlist(resourcesDir.join("Info.plist"), .plDict([
@@ -3589,7 +3590,7 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
             let bundleSupportedPlatforms = try #require(platform?.additionalInfoPlistEntries["CFBundleSupportedPlatforms"])
 
             let sourceStaticFrameworkPath = tmpDirPath.join("AStaticFwk.framework")
-            try await tester.fs.writeFramework(sourceStaticFrameworkPath, archs: runDestination.platform == "macosx" ? ["arm64", "x86_64"] : ["arm64"], platform: #require(runDestination.buildVersionPlatform(core)), infoLookup: core, static: true) { _, _, headersDir, resourcesDir in
+            try await tester.fs.writeFramework(sourceStaticFrameworkPath, archs: ["arm64"], platform: #require(runDestination.buildVersionPlatform(core)), infoLookup: core, static: true) { _, _, headersDir, resourcesDir in
                 try await tester.fs.writeFileContents(headersDir.join("AStaticFwk.h")) { $0 <<< "" }
                 try await tester.fs.writePlist(resourcesDir.join("AStaticResource.plist"), .plDict([:]))
                 try await tester.fs.writePlist(resourcesDir.join("Info.plist"), .plDict([
@@ -3669,7 +3670,7 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                             } else {
                                 let minos = try #require(vtoolOutput.components(separatedBy: "\n").first(where: { $0.contains("minos") })?.trimmingPrefix(while: { $0.isWhitespace }))
                                 #expect(minos == (runDestination.buildVersionPlatform(core) == .macCatalyst ? "minos 14.2" : "minos 11.0"))
-                                #expect(try Set(MachO(reader: BinaryReader(data: tester.fs.read(Path(frameworkPath)))).slices().map { $0.arch }) == ["arm64", "x86_64"])
+                                #expect(try Set(MachO(reader: BinaryReader(data: tester.fs.read(Path(frameworkPath)))).slices().map { $0.arch }) == ["arm64"])
                             }
                         }
 
@@ -7253,7 +7254,7 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
         try await test(buildSettings: ["ENABLE_ENHANCED_SECURITY": "NO", "ENABLE_POINTER_AUTHENTICATION": "YES"], expectedArchs: ["arm64e"])
     }
 
-    @Test(.requireSDKs(.macOS))
+    @Test(.requireSDKs(.macOS), .requireXcode26())
     func pointerAuthenticationBuildSetting_macOS() async throws {
         func test(buildSettings: [String: String], expectedArchs: [String], line: UInt = #line) async throws {
 
@@ -7314,14 +7315,14 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
             }
         }
 
-        try await test(buildSettings: ["ENABLE_POINTER_AUTHENTICATION": "YES"], expectedArchs: ["x86_64", "arm64", "arm64e"])
-        try await test(buildSettings: ["ENABLE_POINTER_AUTHENTICATION": "NO"], expectedArchs: ["x86_64", "arm64"])
+        try await test(buildSettings: ["ENABLE_POINTER_AUTHENTICATION": "YES", "MACOSX_DEPLOYMENT_TARGET": "26.0"], expectedArchs: ["x86_64", "arm64", "arm64e"])
+        try await test(buildSettings: ["ENABLE_POINTER_AUTHENTICATION": "NO", "MACOSX_DEPLOYMENT_TARGET": "26.0"], expectedArchs: ["x86_64", "arm64"])
 
         // ENABLE_ENHANCED_SECURITY enables pointer authentication unless ENABLE_POINTER_AUTHENTICATION is explicitly disabled.
-        try await test(buildSettings: ["ENABLE_ENHANCED_SECURITY": "YES"], expectedArchs: ["x86_64", "arm64", "arm64e"])
-        try await test(buildSettings: ["ENABLE_ENHANCED_SECURITY": "NO"], expectedArchs: ["x86_64", "arm64"])
-        try await test(buildSettings: ["ENABLE_ENHANCED_SECURITY": "YES", "ENABLE_POINTER_AUTHENTICATION": "NO"], expectedArchs: ["x86_64", "arm64"])
-        try await test(buildSettings: ["ENABLE_ENHANCED_SECURITY": "NO", "ENABLE_POINTER_AUTHENTICATION": "YES"], expectedArchs: ["x86_64", "arm64e"])
+        try await test(buildSettings: ["ENABLE_ENHANCED_SECURITY": "YES", "MACOSX_DEPLOYMENT_TARGET": "26.0"], expectedArchs: ["x86_64", "arm64", "arm64e"])
+        try await test(buildSettings: ["ENABLE_ENHANCED_SECURITY": "NO", "MACOSX_DEPLOYMENT_TARGET": "26.0"], expectedArchs: ["x86_64", "arm64"])
+        try await test(buildSettings: ["ENABLE_ENHANCED_SECURITY": "YES", "ENABLE_POINTER_AUTHENTICATION": "NO", "MACOSX_DEPLOYMENT_TARGET": "26.0"], expectedArchs: ["x86_64", "arm64"])
+        try await test(buildSettings: ["ENABLE_ENHANCED_SECURITY": "NO", "ENABLE_POINTER_AUTHENTICATION": "YES", "MACOSX_DEPLOYMENT_TARGET": "26.0"], expectedArchs: ["x86_64", "arm64e"])
     }
 
     @Test(.requireSDKs(.macOS))