Update DYLD and CoreFoundation private API

Author: Kyle-Ye

Package.swift

@@ -86,6 +86,8 @@ if warningsAsErrorsCondition {
    sharedSwiftSettings.append(.unsafeFlags(["-warnings-as-errors"]))
 }
 
+// NOTE: Mac Catalyst should use macOS-varient build of OpenSwiftUICore.framework and Mac Catalyst/UIKitForMac varient of OpenSwiftUI.framework
+// Add `|| Mac Catalyst` check everywhere in `OpenSwiftUICore` and `COpenSwiftUICore`.
 let openSwiftUICoreTarget = Target.target(
     name: "OpenSwiftUICore",
     dependencies: [

Sources/COpenSwiftUICore/OpenSwiftUITargetConditionals.h

@@ -145,12 +145,14 @@
 #define OPENSWIFTUI_TARGET_OS_IOS           TARGET_OS_IOS
 #define OPENSWIFTUI_TARGET_OS_WATCH         TARGET_OS_WATCH
 #define OPENSWIFTUI_TARGET_OS_TV            TARGET_OS_TV
+#define OPENSWIFTUI_TARGET_OS_MACCATALYST   TARGET_OS_MACCATALYST
 #else
 // iOS, watchOS, and tvOS are not supported
 #define OPENSWIFTUI_TARGET_OS_IPHONE        0
 #define OPENSWIFTUI_TARGET_OS_IOS           0
 #define OPENSWIFTUI_TARGET_OS_WATCH         0
 #define OPENSWIFTUI_TARGET_OS_TV            0
+#define OPENSWIFTUI_TARGET_OS_MACCATALYST   0
 #endif
 
 /* OpenSwiftUI Addition End */

Sources/COpenSwiftUICore/Overlay/CoreGraphics/OpenSwiftUICoreColor.m

@@ -12,7 +12,7 @@
 
 Class OpenSwiftUICoreColorClass(BOOL isAppKitBased);
 
-#if OPENSWIFTUI_TARGET_OS_OSX
+#if OPENSWIFTUI_TARGET_OS_OSX || OPENSWIFTUI_TARGET_OS_MACCATALYST
 id NSColorSpaceForCGColorSpace(CGColorSpaceRef cgColorSpace);
 Class NSColorSpaceClass(void);
 #endif
@@ -25,7 +25,7 @@ BOOL OpenSwiftUICoreColorPlatformColorGetComponents(BOOL system, id color, CGFlo
     if (!colorClass) {
         return NO;
     }
-    #if OPENSWIFTUI_TARGET_OS_OSX
+    #if OPENSWIFTUI_TARGET_OS_OSX || OPENSWIFTUI_TARGET_OS_MACCATALYST
     if (system) {
         id colorSpace = NSColorSpaceForCGColorSpace(CGColorSpaceCreateWithName(kCGColorSpaceExtendedSRGB));
         NSColor *nameSpaceColor = [color colorUsingColorSpace:colorSpace];
@@ -46,7 +46,7 @@ BOOL OpenSwiftUICoreColorPlatformColorGetComponents(BOOL system, id color, CGFlo
     if (!colorClass) {
         return nil;
     }
-    #if OPENSWIFTUI_TARGET_OS_OSX
+    #if OPENSWIFTUI_TARGET_OS_OSX || OPENSWIFTUI_TARGET_OS_MACCATALYST
     if (system) {
         id colorSpace = NSColorSpaceForCGColorSpace(CGColorSpaceCreateWithName(kCGColorSpaceExtendedSRGB));
         return [colorClass colorWithColorSpace:colorSpace components:(CGFloat[]){red, green, blue, alpha} count:4];
@@ -60,19 +60,26 @@ Class OpenSwiftUICoreColorGetKitColorClass(BOOL system) {
 }
 
 Class OpenSwiftUICoreColorClass(BOOL system) {
-    static BOOL isValid = false;
+    static BOOL isValid = true;
     static Class colorClass;
     static dispatch_once_t once;
     dispatch_once(&once, ^{
-        if (system) {
-            Class class = NSClassFromString(@"NSColor");
+        #if OPENSWIFTUI_TARGET_OS_OSX || OPENSWIFTUI_TARGET_OS_MACCATALYST
+        if (!system) {
+            Class class = NSClassFromString(@"UIColor");
             colorClass = class;
             isValid = class != nil;
-        } else {
-            Class class = NSClassFromString(@"UIColor");
+        }
+        if (system) {
+            Class class = NSClassFromString(@"NSColor");
             colorClass = class;
             isValid = class != nil;
         }
+        #else
+        Class class = NSClassFromString(@"UIColor");
+        colorClass = class;
+        isValid = class != nil;
+        #endif
     });
     if (isValid) {
         return colorClass;
@@ -81,7 +88,7 @@ Class OpenSwiftUICoreColorClass(BOOL system) {
     }
 }
 
-#if OPENSWIFTUI_TARGET_OS_OSX
+#if OPENSWIFTUI_TARGET_OS_OSX || OPENSWIFTUI_TARGET_OS_MACCATALYST
 id NSColorSpaceForCGColorSpace(CGColorSpaceRef cgColorSpace) {
     Class colorSpaceClass = NSColorSpaceClass();
     if (colorSpaceClass) {

Sources/COpenSwiftUICore/Shims/CoreFoundation_Private.c

@@ -6,11 +6,15 @@
 #include "dyld_Private.h"
 
 #if !OPENSWIFTUI_TARGET_OS_DARWIN
-
-#define PLATFORM_IOS 2
-#define PLATFORM_MACCATALYST 6
-
 bool _CFMZEnabled(void) {
-    return dyld_get_active_platform() == PLATFORM_MACCATALYST || dyld_get_active_platform() == PLATFORM_IOS;
+    return _OpenSwiftUICFMZEnabled;
 }
 #endif
+
+bool _OpenSwiftUICFMZEnabled(void) {
+    #if OPENSWIFTUI_TARGET_OS_OSX || OPENSWIFTUI_TARGET_OS_MACCATALYST
+    return dyld_get_active_platform() == DYLD_PLATFORM_MACCATALYST || dyld_get_active_platform() == DYLD_PLATFORM_IOS;
+    #else
+    return false;
+    #endif
+}

Sources/COpenSwiftUICore/Shims/CoreFoundation_Private.h

@@ -7,6 +7,9 @@
 
 #include "OpenSwiftUIBase.h"
 
+/// Check if Marzipan is enabled.
+///
+/// > Marzipan is the codename of "UIKit for macOS" / Mac Catalyst
 OPENSWIFTUI_EXPORT
 bool _CFMZEnabled(void);
 

Sources/COpenSwiftUICore/Shims/dyld_Private.h

@@ -12,64 +12,64 @@
 
 typedef uint32_t dyld_platform_t;
 
-typedef OPENSWIFTUI_ENUM(dyld_platform_t, DyldPlatform) {
-    unknown = 0,
-    macOS = 1,
-    iOS = 2,
-    tvOS = 3,
-    watchOS = 4,
-    bridgeOS = 5,
-    macCatalyst = 6,
-    iOSSimulator = 7,
-    tvOSSimulator = 8,
-    watchOSSimulator = 9,
-    driverKit = 10,
-    xROS = 11,
-    xROSSimulator = 12,
+typedef OPENSWIFTUI_ENUM(dyld_platform_t, DYLD_PLATFORM) {
+    DYLD_PLATFORM_UNKNOWN = 0,
+    DYLD_PLATFORM_MACOS = 1,
+    DYLD_PLATFORM_IOS = 2,
+    DYLD_PLATFORM_TVOS = 3,
+    DYLD_PLATFORM_WATCHOS = 4,
+    DYLD_PLATFORM_BRIDGEOS = 5,
+    DYLD_PLATFORM_MACCATALYST = 6,
+    DYLD_PLATFORM_IOSSIMULATOR = 7,
+    DYLD_PLATFORM_TVOSSIMULATOR = 8,
+    DYLD_PLATFORM_WATCHOSSIMULATOR = 9,
+    DYLD_PLATFORM_DRIVERKIT = 10,
+    DYLD_PLATFORM_XROS = 11,
+    DYLD_PLATFORM_XROS_SIMULATOR = 12
 };
 
-typedef OPENSWIFTUI_ENUM(uint32_t, DyldMacOSXVersion) {
-    V10_4 = 0x000A0400,
-    V10_5 = 0x000A0500,
-    V10_6 = 0x000A0600,
-    V10_7 = 0x000A0700,
-    V10_8 = 0x000A0800,
-    V10_9 = 0x000A0900,
-    V10_10 = 0x000A0A00,
-    V10_11 = 0x000A0B00,
-    V10_12 = 0x000A0C00,
-    V10_13 = 0x000A0D00,
-    V10_14 = 0x000A0E00,
-    V10_15 = 0x000A0F00,
-    V15_0 = 0x000F0000,
+typedef OPENSWIFTUI_ENUM(uint32_t, DYLD_MACOSX_VERSION) {
+    DYLD_MACOSX_VERSION_10_4 = 0x000A0400,
+    DYLD_MACOSX_VERSION_10_5 = 0x000A0500,
+    DYLD_MACOSX_VERSION_10_6 = 0x000A0600,
+    DYLD_MACOSX_VERSION_10_7 = 0x000A0700,
+    DYLD_MACOSX_VERSION_10_8 = 0x000A0800,
+    DYLD_MACOSX_VERSION_10_9 = 0x000A0900,
+    DYLD_MACOSX_VERSION_10_10 = 0x000A0A00,
+    DYLD_MACOSX_VERSION_10_11 = 0x000A0B00,
+    DYLD_MACOSX_VERSION_10_12 = 0x000A0C00,
+    DYLD_MACOSX_VERSION_10_13 = 0x000A0D00,
+    DYLD_MACOSX_VERSION_10_14 = 0x000A0E00,
+    DYLD_MACOSX_VERSION_10_15 = 0x000A0F00,
+    DYLD_MACOSX_VERSION_15_0 = 0x000F0000,
     /// For Test Only
-    V16_0 = 0x00100000,
+    DYLD_MACOSX_VERSION_16_0 = 0x00100000,
 };
 
-typedef OPENSWIFTUI_ENUM(uint32_t, DyldIOSVersion) {
-    V2_0 = 0x00020000,
-    V2_1 = 0x00020100,
-    V2_2 = 0x00020200,
-    V3_0 = 0x00030000,
-    V3_1 = 0x00030100,
-    V3_2 = 0x00030200,
-    V4_0 = 0x00040000,
-    V4_1 = 0x00040100,
-    V4_2 = 0x00040200,
-    V4_3 = 0x00040300,
-    V5_0 = 0x00050000,
-    V5_1 = 0x00050100,
-    V6_0 = 0x00060000,
-    V6_1 = 0x00060100,
-    V7_0 = 0x00070000,
-    V7_1 = 0x00070100,
-    V8_0 = 0x00080000,
-    V8_1 = 0x00080100,
-    V8_2 = 0x00080200,
-    V9_0 = 0x00090000,
-    V18_0 = 0x00120000,
+typedef OPENSWIFTUI_ENUM(uint32_t, DYLD_IOS_VERSION) {
+    DYLD_IOS_VERSION_2_0 = 0x00020000,
+    DYLD_IOS_VERSION_2_1 = 0x00020100,
+    DYLD_IOS_VERSION_2_2 = 0x00020200,
+    DYLD_IOS_VERSION_3_0 = 0x00030000,
+    DYLD_IOS_VERSION_3_1 = 0x00030100,
+    DYLD_IOS_VERSION_3_2 = 0x00030200,
+    DYLD_IOS_VERSION_4_0 = 0x00040000,
+    DYLD_IOS_VERSION_4_1 = 0x00040100,
+    DYLD_IOS_VERSION_4_2 = 0x00040200,
+    DYLD_IOS_VERSION_4_3 = 0x00040300,
+    DYLD_IOS_VERSION_5_0 = 0x00050000,
+    DYLD_IOS_VERSION_5_1 = 0x00050100,
+    DYLD_IOS_VERSION_6_0 = 0x00060000,
+    DYLD_IOS_VERSION_6_1 = 0x00060100,
+    DYLD_IOS_VERSION_7_0 = 0x00070000,
+    DYLD_IOS_VERSION_7_1 = 0x00070100,
+    DYLD_IOS_VERSION_8_0 = 0x00080000,
+    DYLD_IOS_VERSION_8_1 = 0x00080100,
+    DYLD_IOS_VERSION_8_2 = 0x00080200,
+    DYLD_IOS_VERSION_9_0 = 0x00090000,
+    DYLD_IOS_VERSION_18_0 = 0x00120000,
     /// For Test Only
-    V19_0 = 0x00130000,
+    DYLD_IOS_VERSION_19_0 = 0x00130000,
 };
 
 typedef struct {

Sources/OpenSwiftUICore/Graphic/Color/CoreColor+Extension.swift

@@ -1,6 +1,6 @@
 //
 //  CoreColor+Extension.swift
-//  OpenSwiftUI
+//  OpenSwiftUICore
 //
 //  Audited for RELEASE_2024
 //  Status: Complete

Sources/OpenSwiftUICore/Util/Utils.swift

@@ -15,12 +15,12 @@ func asOptional<Value>(_ value: Value) -> Value? {
     return optionalValue
 }
 
+#if canImport(Darwin)
+
+// NOTE: use runtime check instead of #if targetEnvironment(macCatalyst) here
 @inline(__always)
 package func isCatalyst() -> Bool {
-    #if os(iOS) || os(tvOS) || os(watchOS)
-    false
-    #elseif os(macOS)
-    // NOTE: use runtime check instead of #if targetEnvironment(macCatalyst) here
+    #if os(macOS) || targetEnvironment(macCatalyst)
     _CFMZEnabled()
     #else
     false
@@ -29,22 +29,20 @@ package func isCatalyst() -> Bool {
 
 @inline(__always)
 package func isUIKitBased() -> Bool {
-    #if os(iOS) || os(tvOS) || os(watchOS)
-    true
-    #elseif os(macOS)
+    #if os(macOS) || targetEnvironment(macCatalyst)
     _CFMZEnabled()
     #else
-    false
+    true
     #endif
 }
 
 @inline(__always)
 package func isAppKitBased() -> Bool {
-    #if os(iOS) || os(tvOS) || os(watchOS)
-    false
-    #elseif os(macOS)
+    #if os(macOS) || targetEnvironment(macCatalyst)
     !_CFMZEnabled()
     #else
     false
     #endif
 }
+
+#endif

Tests/COpenSwiftUICoreTests/Shims/DyldPrivateTests.swift

@@ -22,46 +22,46 @@ struct DyldPrivateTests {
         if #unavailable(iOS 19) {
             #expect(dyld_program_sdk_at_least(.init(
                 platform: dyld_get_active_platform(),
-                version: DyldIOSVersion.V19_0.rawValue
+                version: DYLD_IOS_VERSION._19_0.rawValue
             )) == false)
             if #unavailable(iOS 18) {
                 #expect(dyld_program_sdk_at_least(.init(
                     platform: dyld_get_active_platform(),
-                    version: DyldIOSVersion.V18_0.rawValue
+                    version: DYLD_IOS_VERSION._18_0.rawValue
                 )) == false)
             } else {
                 #expect(dyld_program_sdk_at_least(.init(
                     platform: dyld_get_active_platform(),
-                    version: DyldIOSVersion.V18_0.rawValue
+                    version: DYLD_IOS_VERSION._18_0.rawValue
                 )) == true)
             }
         } else {
             #expect(dyld_program_sdk_at_least(.init(
                 platform: dyld_get_active_platform(),
-                version: DyldIOSVersion.V19_0.rawValue
+                version: DYLD_IOS_VERSION._19_0.rawValue
             )) == true)
         }
         #elseif os(macOS)
         if #unavailable(macOS 16) {
             #expect(dyld_program_sdk_at_least(.init(
                 platform: dyld_get_active_platform(),
-                version: DyldMacOSXVersion.V16_0.rawValue
+                version: DYLD_MACOSX_VERSION._16_0.rawValue
             )) == false)
             if #unavailable(macOS 15) {
                 #expect(dyld_program_sdk_at_least(.init(
                     platform: dyld_get_active_platform(),
-                    version: DyldMacOSXVersion.V15_0.rawValue
+                    version: DYLD_MACOSX_VERSION._15_0.rawValue
                 )) == false)
             } else {
                 #expect(dyld_program_sdk_at_least(.init(
                     platform: dyld_get_active_platform(),
-                    version: DyldMacOSXVersion.V15_0.rawValue
+                    version: DYLD_MACOSX_VERSION._15_0.rawValue
                 )) == true)
             }
         } else {
             #expect(dyld_program_sdk_at_least(.init(
                 platform: dyld_get_active_platform(),
-                version: DyldMacOSXVersion.V16_0.rawValue
+                version: DYLD_MACOSX_VERSION._16_0.rawValue
             )) == true)
         }
         #else
@@ -82,39 +82,39 @@ struct DyldPrivateTests {
 
     @Test
     func activePlatform() throws {
-        let platform = try #require(DyldPlatform(rawValue: dyld_get_active_platform()))
+        let platform = try #require(DYLD_PLATFORM(rawValue: dyld_get_active_platform()))
 #if canImport(Darwin)
         #if targetEnvironment(macCatalyst)
-            #expect(platform == .macCatalyst)
+            #expect(platform == .MACCATALYST)
         #elseif targetEnvironment(simulator)
             #if os(iOS)
-            #expect(platform == .iOSSimulator)
+            #expect(platform == .IOSSIMULATOR)
             #elseif os(tvOS)
-            #expect(platform == .tvOSSimulator)
+            #expect(platform == .TVOSSIMULATOR)
             #elseif os(watchOS)
-            #expect(platform == .watchOSSimulator)
+            #expect(platform == .WATCHOSSIMULATOR)
             #elseif os(visionOS)
-            #expect(platform == .xROSSimulator)
+            #expect(platform == .XROS_SIMULATOR)
             #else
             fatalError("Unsupported Darwin simulator platform")
             #endif
         #else
             #if os(iOS)
-            #expect(platform == .iOS)
+            #expect(platform == .IOS)
             #elseif os(macOS)
-            #expect(platform == .macOS)
+            #expect(platform == .MACOS)
             #elseif os(tvOS)
-            #expect(platform == .tvOS)
+            #expect(platform == .TVOS)
             #elseif os(watchOS)
-            #expect(platform == .watchOS)
+            #expect(platform == .WATCHOS)
             #elseif os(visionOS)
-            #expect(platform == .xROS)
+            #expect(platform == .XROS)
             #else
             fatalError("Unsupported Darwin platform")
             #endif
         #endif
 #else
-        #expect(platform == .unknown)
+        #expect(platform == .UNKNOWN)
 #endif
     }
 }