Use the OpenSwiftUI ABI namespace for OpenSwiftUICore

Example/Tuist/Package.swift

@@ -72,6 +72,7 @@ let openSwiftUITargetSettings: SettingsDictionary = [
 let openSwiftUICoreTargetSettings: SettingsDictionary = [
     "DYLIB_INSTALL_NAME_BASE": "@rpath",
     "OTHER_LDFLAGS": "$(inherited) -ObjC",
+    "OTHER_SWIFT_FLAGS": "$(inherited) -module-abi-name OpenSwiftUI",
 ]
 
 var packageProductTypes: [String: ProjectDescription.Product] = [

Package.swift

@@ -586,7 +586,9 @@ let openSwiftUICoreTarget = Target.target(
     ] + (swiftUIRenderCondition && symbolLocatorCondition ? ["OpenSwiftUISymbolDualTestsSupport"] : []),
     cSettings: sharedCSettings,
     cxxSettings: sharedCxxSettings,
-    swiftSettings: sharedSwiftSettings,
+    swiftSettings: sharedSwiftSettings + [
+        .unsafeFlags(["-module-abi-name", "OpenSwiftUI"]),
+    ],
     linkerSettings: computeCondition ? [
         .linkedLibrary("c++", .when(platforms: .darwinPlatforms)),
     ] : []
@@ -969,6 +971,7 @@ let openSwiftUITargetSettings: SettingsDictionary = [
 let openSwiftUICoreTargetSettings: SettingsDictionary = [
     "DYLIB_INSTALL_NAME_BASE": "@rpath",
     "OTHER_LDFLAGS": "$(inherited) -ObjC",
+    "OTHER_SWIFT_FLAGS": "$(inherited) -module-abi-name OpenSwiftUI",
 ]
 
 let packageSettings = PackageSettings(

Sources/OpenSwiftUI/Event/InputEvent/KeyboardShortcut/EventModifiers.swift

@@ -5,24 +5,7 @@
 //  Audited for 3.5.2
 //  Status: Complete
 
-@frozen public struct EventModifiers: OptionSet {
-    public let rawValue: Int
-    public init(rawValue: Int) {
-        self.rawValue = rawValue
-    }
-
-    public static let capsLock = EventModifiers(rawValue: 1) // 0x1
-    public static let shift = EventModifiers(rawValue: 1 << 1) // 0x2
-    public static let control = EventModifiers(rawValue: 1 << 2) // 0x4
-    public static let option = EventModifiers(rawValue: 1 << 3) // 0x8
-    public static let command = EventModifiers(rawValue: 1 << 4) // 0x10
-    public static let numericPad = EventModifiers(rawValue: 1 << 5) // 0x20
-    @available(*, deprecated, message: "Function modifier is reserved for system applications")
-    public static let function = EventModifiers(rawValue: 1 << 6) // 0x40
-    public static let all = [capsLock, shift, control, option, command, numericPad] // 0x3F
-}
-
-extension EventModifiers: Sendable {}
+import OpenSwiftUICore
 
 #if os(iOS) || os(visionOS) || os(tvOS)
 import UIKit

Sources/OpenSwiftUI/View/List/ListStyle.swift

@@ -21,8 +21,6 @@ struct GroupedFormTextFieldStyleContext: StyleContext {}
 
 struct RadioGroupStyleContext: StyleContext {}
 
-struct ToolbarStyleContext: StyleContext {}
-
 struct ColumnarLabeledContentStyle: LabeledContentStyle {
     func makeBody(configuration: Configuration) -> some View {
         _openSwiftUIUnimplementedFailure()

Sources/OpenSwiftUI_SPI/Util/Interpose.c

@@ -100,10 +100,10 @@ static inline CFStringRef _interpose_protocol_description(const void *protocol)
 // MARK: - Color.Resolved Nominal Type Descriptor
 
 extern const void $s7SwiftUI5ColorV8ResolvedVN;
-extern const void *$s15OpenSwiftUICore5ColorV8ResolvedVN;
+extern const void *$s11OpenSwiftUI5ColorV8ResolvedVN;
 
 const void *_OpenSwiftUI_ColorResolvedNTD(void) {
-    return &$s15OpenSwiftUICore5ColorV8ResolvedVN;
+    return &$s11OpenSwiftUI5ColorV8ResolvedVN;
 }
 
 // MARK: - swift_dynamicCast
@@ -142,10 +142,10 @@ static bool my_swift_dynamicCast(void *dest, void *src, const void *srcType, con
 // MARK: - PlatformDrawable Protocol Descriptor
 
 extern const void $s7SwiftUI16PlatformDrawableMp;
-extern const void $s15OpenSwiftUICore16PlatformDrawableMp;
+extern const void $s11OpenSwiftUI16PlatformDrawableMp;
 
 const void *_OpenSwiftUI_PlatformDrawablePD(void) {
-    return &$s15OpenSwiftUICore16PlatformDrawableMp;
+    return &$s11OpenSwiftUI16PlatformDrawableMp;
 }
 
 // MARK: - swift_conformsToProtocol2

Sources/OpenSwiftUI_SPI/Util/ProtocolDescriptor.c

@@ -13,57 +13,57 @@ void _OpenSwiftUI_callVisitViewType(void *visitor_value,
                                     const void *view_pwt);
 
 OPENSWIFTUI_EXPORT
-const void *$s15OpenSwiftUICore4ViewMp;
+const void *$s11OpenSwiftUI4ViewMp;
 
 const void *_OpenSwiftUI_viewProtocolDescriptor(void) {
-    return &$s15OpenSwiftUICore4ViewMp;
+    return &$s11OpenSwiftUI4ViewMp;
 }
 
 OPENSWIFTUI_EXPORT
-const void *$s15OpenSwiftUICore12ViewModifierMp;
+const void *$s11OpenSwiftUI12ViewModifierMp;
 
 const void *_OpenSwiftUI_viewModifierProtocolDescriptor(void) {
-    return &$s15OpenSwiftUICore12ViewModifierMp;
+    return &$s11OpenSwiftUI12ViewModifierMp;
 }
 
 OPENSWIFTUI_EXPORT
-const void *$s15OpenSwiftUICore7GestureMp;
+const void *$s11OpenSwiftUI7GestureMp;
 
 const void *_OpenSwiftUI_gestureProtocolDescriptor(void) {
-    return &$s15OpenSwiftUICore7GestureMp;
+    return &$s11OpenSwiftUI7GestureMp;
 }
 
 OPENSWIFTUI_EXPORT
-const void *$s15OpenSwiftUICore15GestureModifierMp;
+const void *$s11OpenSwiftUI15GestureModifierMp;
 
 const void *_OpenSwiftUI_gestureModifierProtocolDescriptor(void) {
-    return &$s15OpenSwiftUICore15GestureModifierMp;
+    return &$s11OpenSwiftUI15GestureModifierMp;
 }
 
 OPENSWIFTUI_EXPORT
-const void *$s15OpenSwiftUICore20DefaultStyleModifierMp;
+const void *$s11OpenSwiftUI20DefaultStyleModifierMp;
 
 const void *_OpenSwiftUI_defaultStyleModifierProtocolDescriptor(void) {
-    return &$s15OpenSwiftUICore15GestureModifierMp;
+    return &$s11OpenSwiftUI20DefaultStyleModifierMp;
 }
 
 OPENSWIFTUI_EXPORT
-const void *$s15OpenSwiftUICore21StyleOverrideModifierMp;
+const void *$s11OpenSwiftUI21StyleOverrideModifierMp;
 
 const void *_OpenSwiftUI_styleOverrideModifierProtocolDescriptor(void) {
-    return &$s15OpenSwiftUICore21StyleOverrideModifierMp;
+    return &$s11OpenSwiftUI21StyleOverrideModifierMp;
 }
 
 OPENSWIFTUI_EXPORT
-const void *$s15OpenSwiftUICore27StyleWriterOverrideModifierMp;
+const void *$s11OpenSwiftUI27StyleWriterOverrideModifierMp;
 
 const void *_OpenSwiftUI_styleWriterOverrideModifierProtocolDescriptor(void) {
-    return &$s15OpenSwiftUICore27StyleWriterOverrideModifierMp;
+    return &$s11OpenSwiftUI27StyleWriterOverrideModifierMp;
 }
 
 OPENSWIFTUI_EXPORT
-const void *$s15OpenSwiftUICore12StyleContextMp;
+const void *$s11OpenSwiftUI12StyleContextMp;
 
 const void *_OpenSwiftUI_styleContextProtocolDescriptor(void) {
-    return &$s15OpenSwiftUICore12StyleContextMp;
+    return &$s11OpenSwiftUI12StyleContextMp;
 }

Tests/OpenSwiftUICompatibilityTests/Animation/Animation/AnimationCompatibilityTests.swift

@@ -9,11 +9,7 @@ struct AnimationCompatibilityTests {
     func description() {
         let animation = Animation.default
         #expect(animation.description == "DefaultAnimation()")
-        #if OPENSWIFTUI
-        #expect(animation.debugDescription == "AnyAnimator(OpenSwiftUICore.DefaultAnimation())")
-        #else
-        #expect(animation.debugDescription == "AnyAnimator(SwiftUI.DefaultAnimation())")
-        #endif
+        #expect(animation.debugDescription == "AnyAnimator(OpenSwiftUI.DefaultAnimation())".normalizeSwiftUI)
         #expect(animation.customMirror.description == "Mirror for Animation")
     }
 }

Tests/OpenSwiftUICompatibilityTests/StringHelper.swift

@@ -0,0 +1,15 @@
+//
+//  StringHelper.swift
+//  OpenSwiftUICompatibilityTests
+
+import Foundation
+
+extension String {
+    package var normalizeSwiftUI: String {
+        #if OPENSWIFTUI
+        self
+        #else
+        replacingOccurrences(of: "OpenSwiftUI", with: "SwiftUI")
+        #endif
+    }
+}