Update COpenSwiftUI and COpenSwiftUICore to OpenSwiftUI_SPI

Author: Kyle-Ye

Package.swift

@@ -87,19 +87,18 @@ if warningsAsErrorsCondition {
 }
 
 // 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`.
+// Add `|| Mac Catalyst` check everywhere in `OpenSwiftUICore` and `OpenSwiftUI_SPI`.
 let openSwiftUICoreTarget = Target.target(
     name: "OpenSwiftUICore",
     dependencies: [
-        "COpenSwiftUICore",
+        "OpenSwiftUI_SPI",
         .product(name: "OpenGraphShims", package: "OpenGraph"),
     ],
     swiftSettings: sharedSwiftSettings
 )
 let openSwiftUITarget = Target.target(
     name: "OpenSwiftUI",
     dependencies: [
-        "COpenSwiftUI",
         "OpenSwiftUICore",
         .target(name: "CoreServices", condition: .when(platforms: [.iOS])),
         .product(name: "OpenGraphShims", package: "OpenGraph"),
@@ -113,10 +112,10 @@ let openSwiftUIExtensionTarget = Target.target(
     ],
     swiftSettings: sharedSwiftSettings
 )
-let cOpenSwiftUICoreTestTarget = Target.testTarget(
-    name: "COpenSwiftUICoreTests",
+let OpenSwiftUI_SPITestTarget = Target.testTarget(
+    name: "OpenSwiftUI_SPITests",
     dependencies: [
-        "COpenSwiftUICore",
+        "OpenSwiftUI_SPI",
         // For ProtocolDescriptor symbol linking
         "OpenSwiftUI",
     ],
@@ -156,8 +155,7 @@ let package = Package(
     products: [
         .library(name: "OpenSwiftUI", targets: ["OpenSwiftUI", "OpenSwiftUIExtension"]),
         // FIXME: This will block xcodebuild build(iOS CI) somehow
-        .library(name: "COpenSwiftUI", targets: ["COpenSwiftUI"]),
-        .library(name: "COpenSwiftUICore", targets: ["COpenSwiftUICore"]),
+        // .library(name: "OpenSwiftUI_SPI", targets: ["OpenSwiftUI_SPI"]),
     ],
     targets: [
         // TODO: Add SwiftGTK as an backend alternative for UIKit/AppKit on Linux and macOS
@@ -170,18 +168,7 @@ let package = Package(
             ]
         ),
         .target(
-            name: "COpenSwiftUI",
-            dependencies: [
-                "COpenSwiftUICore",
-            ],
-            cSettings: [
-                .unsafeFlags(["-I", includePath], .when(platforms: .nonDarwinPlatforms)),
-                .define("__COREFOUNDATION_FORSWIFTFOUNDATIONONLY__", to: "1", .when(platforms: .nonDarwinPlatforms)),
-                .define("_WASI_EMULATED_SIGNAL", .when(platforms: [.wasi])),
-            ]
-        ),
-        .target(
-            name: "COpenSwiftUICore",
+            name: "OpenSwiftUI_SPI",
             publicHeadersPath: ".",
             cSettings: [
                 .unsafeFlags(["-I", includePath], .when(platforms: .nonDarwinPlatforms)),
@@ -194,7 +181,7 @@ let package = Package(
         openSwiftUITarget,
         openSwiftUIExtensionTarget,
 
-        cOpenSwiftUICoreTestTarget,
+        OpenSwiftUI_SPITestTarget,
         openSwiftUICoreTestTarget,
         openSwiftUITestTarget,
         openSwiftUICompatibilityTestTarget,
@@ -243,7 +230,7 @@ if attributeGraphCondition {
     openSwiftUICoreTarget.addAGSettings()
     openSwiftUITarget.addAGSettings()
 
-    cOpenSwiftUICoreTestTarget.addAGSettings()
+    OpenSwiftUI_SPITestTarget.addAGSettings()
     openSwiftUICoreTestTarget.addAGSettings()
     openSwiftUITestTarget.addAGSettings()
     openSwiftUICompatibilityTestTarget.addAGSettings()

[email protected]

@@ -86,15 +86,14 @@ if warningsAsErrorsCondition {
 let openSwiftUICoreTarget = Target.target(
     name: "OpenSwiftUICore",
     dependencies: [
-        "COpenSwiftUICore",
+        "OpenSwiftUI_SPI",
         .product(name: "OpenGraphShims", package: "OpenGraph"),
     ],
     swiftSettings: sharedSwiftSettings
 )
 let openSwiftUITarget = Target.target(
     name: "OpenSwiftUI",
     dependencies: [
-        "COpenSwiftUI",
         "OpenSwiftUICore",
         .target(name: "CoreServices", condition: .when(platforms: [.iOS])),
         .product(name: "OpenGraphShims", package: "OpenGraph"),
@@ -141,7 +140,7 @@ let package = Package(
     products: [
         .library(name: "OpenSwiftUI", targets: ["OpenSwiftUI", "OpenSwiftUIExtension"]),
         // FIXME: This will block xcodebuild build(iOS CI) somehow
-        // .library(name: "COpenSwiftUI", targets: ["COpenSwiftUI"]),
+        // .library(name: "OpenSwiftUI_SPI", targets: ["OpenSwiftUI_SPI"]),
     ],
     targets: [
         // TODO: Add SwiftGTK as an backend alternative for UIKit/AppKit on Linux and macOS
@@ -154,18 +153,7 @@ let package = Package(
             ]
         ),
         .target(
-            name: "COpenSwiftUI",
-            dependencies: [
-                "COpenSwiftUICore",
-            ],
-            cSettings: [
-                .unsafeFlags(["-I", includePath], .when(platforms: .nonDarwinPlatforms)),
-                .define("__COREFOUNDATION_FORSWIFTFOUNDATIONONLY__", to: "1", .when(platforms: .nonDarwinPlatforms)),
-                .define("_WASI_EMULATED_SIGNAL", .when(platforms: [.wasi])),
-            ]
-        ),
-        .target(
-            name: "COpenSwiftUICore",
+            name: "OpenSwiftUI_SPI",
             cSettings: [
                 .unsafeFlags(["-I", includePath], .when(platforms: .nonDarwinPlatforms)),
                 .define("__COREFOUNDATION_FORSWIFTFOUNDATIONONLY__", to: "1", .when(platforms: .nonDarwinPlatforms)),

Sources/COpenSwiftUI/empty.c

@@ -6,7 +6,7 @@
 //  Status: Complete
 
 #if os(iOS)
-internal import COpenSwiftUICore
+internal import OpenSwiftUI_SPI
 import UIKit
 
 class _UIGraphicsView: UIView {    

Sources/COpenSwiftUI/include/empty.h

@@ -11,7 +11,7 @@ import UIKit
 import AppKit
 #endif
 
-internal import COpenSwiftUICore
+internal import OpenSwiftUI_SPI
 
 public protocol _PerformanceTest: _Test {
     var name: String { get }

Sources/OpenSwiftUI/Integration/UIKit/UIGraphicsView.swift

@@ -6,7 +6,7 @@
 //  Status: Complete
 //  ID: 6C985860B64B768EC9A2691B5DBA71A0
 
-internal import COpenSwiftUICore
+internal import OpenSwiftUI_SPI
 
 extension View {
     func buttonDefaultRenderingMode() -> some View {

Sources/OpenSwiftUI/Test/_PerformanceTest.swift

@@ -7,7 +7,7 @@
 
 #if OPENSWIFTUI_RELEASE_2021
 
-internal import COpenSwiftUICore
+internal import OpenSwiftUI_SPI
 
 package extension LockedPointer {
     @_transparent

Sources/OpenSwiftUI/View/Control/Button/ButtonStyle/ButtonDefaultRenderingModeModifier.swift

@@ -7,7 +7,7 @@
 
 #if OPENSWIFTUI_RELEASE_2021
 
-internal import COpenSwiftUICore
+internal import OpenSwiftUI_SPI
 
 package struct UnsafeAtomicLazy<Data>: Destroyable {
     @UnsafeLockedPointer

Sources/OpenSwiftUICore/Data/Other/2021/LockedPointer.swift

@@ -7,7 +7,7 @@
 
 #if OPENSWIFTUI_RELEASE_2021
 
-internal import COpenSwiftUICore
+internal import OpenSwiftUI_SPI
 
 @propertyWrapper
 package struct UnsafeLockedPointer<Data>: Destroyable {

Sources/OpenSwiftUICore/Data/Other/2021/UnsafeAtomicLazy.swift

@@ -7,7 +7,7 @@
 //  ID: 2B32D570B0B3D2A55DA9D4BFC1584D20 (RELEASE_2021)
 //  ID: D64CE6C88E7413721C59A34C0C940F2C (RELEASE_2024)
 
-internal import COpenSwiftUICore
+internal import OpenSwiftUI_SPI
 internal import OpenGraphShims
 
 // MARK: - PropertyList

Sources/OpenSwiftUICore/Data/Other/2021/UnsafeLockedPointer.swift

@@ -10,7 +10,7 @@ import OpenCombine
 #else
 import Combine
 #endif
-internal import COpenSwiftUICore
+internal import OpenSwiftUI_SPI
 
 struct ObservableObjectLocation<Root, Value>: Location where Root: ObservableObject {
     let base: Root

Sources/OpenSwiftUICore/Data/Property/PropertyList.swift

@@ -8,7 +8,7 @@
 //  ID: 4F21368B1C1680817451AC25B55A8D48 (RELEASE_2024)
 
 internal import OpenGraphShims
-internal import COpenSwiftUICore
+internal import OpenSwiftUI_SPI
 
 package class StoredLocationBase<Value>: AnyLocation<Value>, Location, @unchecked Sendable {
     private struct Data {

Sources/OpenSwiftUICore/Data/State/ObservableObjectLocation.swift

@@ -7,7 +7,7 @@
 //  ID: B2543BCA257433E04979186A1DC2B6BC
 
 internal import OpenGraphShims
-internal import COpenSwiftUICore
+internal import OpenSwiftUI_SPI
 
 /// The context of the current state-processing update.
 ///

Sources/OpenSwiftUICore/Data/State/StoredLocation.swift

@@ -7,7 +7,7 @@
 //  ID: EA173074DA35FA471DC70643259B7E74 (RELEASE_2021)
 //  ID: 61534957AEEC2EDC447ABDC13B4D426F (RELEASE_2024)
 
-internal import COpenSwiftUICore
+internal import OpenSwiftUI_SPI
 internal import OpenGraphShims
 import Foundation
 

Sources/OpenSwiftUICore/Data/Transaction/Transaction.swift

@@ -6,7 +6,7 @@
 //  Status: WIP
 
 import Foundation
-internal import COpenSwiftUICore
+internal import OpenSwiftUI_SPI
 
 protocol ContentResponder {
     func contains(points: [CGPoint], size: CGSize) -> BitVector64

Sources/OpenSwiftUICore/Data/Update.swift

@@ -7,7 +7,7 @@
 //  ID: 30C09FF16BC95EC5173809B57186CAC3 (RELEASE_2021)
 //  ID: F9F204BD2F8DB167A76F17F3FB1B3335 (RELEASE_2024)
 
-internal import COpenSwiftUICore
+internal import OpenSwiftUI_SPI
 package import OpenGraphShims
 import Foundation
 

Sources/OpenSwiftUICore/EventHandling/InputEvent/HitTesting/ContentResponder.swift

@@ -6,7 +6,7 @@
 //  Status: WIP
 
 import Foundation
-internal import COpenSwiftUICore
+internal import OpenSwiftUI_SPI
 
 // MARK: - Color.Resolved
 

Sources/OpenSwiftUICore/Graph/GraphHost.swift

@@ -7,7 +7,7 @@
 
 #if canImport(Darwin)
 import Foundation
-internal import COpenSwiftUICore
+internal import OpenSwiftUI_SPI
 
 extension OpenSwiftUICoreColor {
     package static func platformColor(resolvedColor: Color.Resolved) -> NSObject? {

Sources/OpenSwiftUICore/Graphic/Color/ColorResolved.swift

@@ -7,7 +7,7 @@
 //  ID: 34756F646CF7AC3DBE2A8E0B344C962F (RELEASE_2021)
 //  ID: 59349949219F590F26B6A55CEC9D59A2 (RELEASE_2024)
 
-internal import COpenSwiftUICore
+internal import OpenSwiftUI_SPI
 internal import OpenGraphShims
 #if canImport(Darwin)
 import os.signpost

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

@@ -5,7 +5,7 @@
 //  Audited for RELEASE_2024
 //  Status: Blocked by PlatformDrawable and GraphicsContext
 
-internal import COpenSwiftUICore
+internal import OpenSwiftUI_SPI
 #if canImport(Darwin)
 import QuartzCore
 #endif

Sources/OpenSwiftUICore/Log/Signpost.swift

@@ -5,7 +5,7 @@
 //  Audited for RELEASE_2021
 //  Status: WIP
 
-internal import COpenSwiftUICore
+internal import OpenSwiftUI_SPI
 internal import OpenGraphShims
 
 // MARK: - ProtocolDescriptor

Sources/OpenSwiftUICore/Render/PlatformViewDefinition.swift

@@ -5,7 +5,7 @@
 //  Audited for RELEASE_2024
 //  Status: Complete
 
-internal import COpenSwiftUICore
+internal import OpenSwiftUI_SPI
 
 package protocol SemanticFeature: Feature {
     static var introduced: Semantics { get }

Sources/OpenSwiftUICore/Runtime/ProtocolDescriptor.swift

@@ -5,7 +5,7 @@
 //  Audited for RELEASE_2024
 //  Status: Complete
 
-internal import COpenSwiftUICore
+internal import OpenSwiftUI_SPI
 
 @inline(__always)
 package func isLinkedOnOrAfter(_ semantics: Semantics) -> Bool {

Sources/OpenSwiftUICore/Semantic/SemanticFeature.swift

@@ -10,7 +10,7 @@
 import Foundation
 
 #if canImport(CoreGraphics)
-internal import COpenSwiftUICore
+internal import OpenSwiftUI_SPI
 import CoreGraphics
 
 @_silgen_name("__CGPathParseString")

Sources/OpenSwiftUICore/Semantic/Semantics.swift

@@ -18,7 +18,7 @@ import WASILibc
 #endif
 internal import OpenGraphShims
 import Foundation
-internal import COpenSwiftUICore
+internal import OpenSwiftUI_SPI
 #if canImport(Darwin)
 import os.log
 #endif

Sources/OpenSwiftUICore/Shape/Path/Path.swift

@@ -5,7 +5,7 @@
 //  Audited for RELEASE_2024
 //  Status: WIP
 
-internal import COpenSwiftUICore
+internal import OpenSwiftUI_SPI
 
 @inlinable
 @inline(__always)

Sources/OpenSwiftUICore/Util/Tracing.swift

@@ -7,7 +7,7 @@
 //  ID: A96961F3546506F21D8995C6092F15B5
 
 internal import OpenGraphShims
-internal import COpenSwiftUICore
+internal import OpenSwiftUI_SPI
 
 @frozen
 public struct AnyView: PrimitiveView {

Sources/OpenSwiftUICore/Util/Utils.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 internal import OpenGraphShims
-internal import COpenSwiftUICore
+internal import OpenSwiftUI_SPI
 
 public enum _ViewDebug {
     public enum Property: UInt32, Hashable {

Sources/OpenSwiftUICore/View/AnyView.swift

@@ -1,6 +1,6 @@
 //
 //  OpenSwiftUICoreColor.h
-//  COpenSwiftUICore
+//  OpenSwiftUI_SPI
 //
 //  Audited for RELEASE_2024
 //  Status: Complete

Sources/OpenSwiftUICore/View/Debug/ViewDebug.swift

@@ -1,6 +1,6 @@
 //
 //  OpenSwiftUICoreColor.h
-//  COpenSwiftUICore
+//  OpenSwiftUI_SPI
 //
 //  Audited for RELEASE_2024
 //  Status: Complete

Sources/COpenSwiftUICore/OpenSwiftUIBase.h renamed to Sources/OpenSwiftUI_SPI/OpenSwiftUIBase.h

@@ -1,6 +1,6 @@
 //
 //  OpenSwiftUICoreGraphicsContext.h
-//  COpenSwiftUICore
+//  OpenSwiftUI_SPI
 //
 //  Audited for RELEASE_2024
 //  Status: Complete

Sources/COpenSwiftUICore/OpenSwiftUITargetConditionals.h renamed to Sources/OpenSwiftUI_SPI/OpenSwiftUITargetConditionals.h

@@ -1,6 +1,6 @@
 //
 //  OpenSwiftUICoreGraphicsContext.h
-//  COpenSwiftUICore
+//  OpenSwiftUI_SPI
 //
 //  Audited for RELEASE_2024
 //  Status: WIP

Sources/COpenSwiftUICore/Overlay/CoreGraphics/OpenSwiftUICoreColor.h renamed to Sources/OpenSwiftUI_SPI/Overlay/CoreGraphics/OpenSwiftUICoreColor.h

@@ -1,6 +1,6 @@
 //
 //  __CGPathParseString.h
-//  COpenSwiftUI
+//  OpenSwiftUI_SPI
 
 #ifndef __CGPathParseString_h
 #define __CGPathParseString_h