diff --git a/.github/workflows/compatibility_tests.yml b/.github/workflows/compatibility_tests.yml index 3a30e329d..5b6095693 100644 --- a/.github/workflows/compatibility_tests.yml +++ b/.github/workflows/compatibility_tests.yml @@ -18,15 +18,15 @@ jobs: runs-on: ${{ matrix.os }} env: OPENSWIFTUI_WERROR: 1 - OPENGRAPH_ATTRIBUTEGRAPH: 1 + OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH: 1 OPENSWIFTUI_SWIFT_LOG: 0 OPENSWIFTUI_SWIFT_CRYPTO: 0 OPENSWIFTUI_TARGET_RELEASE: ${{ matrix.release }} OPENSWIFTUI_USE_LOCAL_DEPS: 1 - OPENGRAPH_USE_LOCAL_DEPS: 1 - OPENGRAPH_TARGET_RELEASE: ${{ matrix.release }} - OPENBOX_USE_LOCAL_DEPS: 1 - OPENBOX_TARGET_RELEASE: ${{ matrix.release }} + OPENATTRIBUTEGRAPH_USE_LOCAL_DEPS: 1 + OPENATTRIBUTEGRAPH_TARGET_RELEASE: ${{ matrix.release }} + OPENRENDERBOX_USE_LOCAL_DEPS: 1 + OPENRENDERBOX_TARGET_RELEASE: ${{ matrix.release }} DARWIN_PRIVATE_FRAMEWORKS_TARGET_RELEASE: ${{ matrix.release }} GH_TOKEN: ${{ github.token }} steps: @@ -67,16 +67,16 @@ jobs: runs-on: ${{ matrix.os }} env: OPENSWIFTUI_WERROR: 1 - OPENGRAPH_ATTRIBUTEGRAPH: 1 + OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH: 1 OPENSWIFTUI_SWIFT_LOG: 0 OPENSWIFTUI_SWIFT_CRYPTO: 0 OPENSWIFTUI_TARGET_RELEASE: ${{ matrix.release }} OPENSWIFTUI_SUPPORT_MULTI_PRODUCTS: 0 OPENSWIFTUI_USE_LOCAL_DEPS: 1 - OPENGRAPH_USE_LOCAL_DEPS: 1 - OPENGRAPH_TARGET_RELEASE: ${{ matrix.release }} - OPENBOX_USE_LOCAL_DEPS: 1 - OPENBOX_TARGET_RELEASE: ${{ matrix.release }} + OPENATTRIBUTEGRAPH_USE_LOCAL_DEPS: 1 + OPENATTRIBUTEGRAPH_TARGET_RELEASE: ${{ matrix.release }} + OPENRENDERBOX_USE_LOCAL_DEPS: 1 + OPENRENDERBOX_TARGET_RELEASE: ${{ matrix.release }} DARWIN_PRIVATE_FRAMEWORKS_TARGET_RELEASE: ${{ matrix.release }} GH_TOKEN: ${{ github.token }} steps: diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 0b841cdee..8d454a39c 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -22,17 +22,17 @@ jobs: runs-on: ${{ matrix.os }} env: OPENSWIFTUI_WERROR: 1 - OPENGRAPH_ATTRIBUTEGRAPH: 1 + OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH: 1 OPENSWIFTUI_COMPATIBILITY_TEST: 0 OPENSWIFTUI_SWIFT_LOG: 0 OPENSWIFTUI_SWIFT_CRYPTO: 0 OPENSWIFTUI_TARGET_RELEASE: ${{ matrix.release }} OPENSWIFTUI_SUPPORT_MULTI_PRODUCTS: 0 OPENSWIFTUI_USE_LOCAL_DEPS: 1 - OPENGRAPH_USE_LOCAL_DEPS: 1 - OPENGRAPH_TARGET_RELEASE: ${{ matrix.release }} - OPENBOX_USE_LOCAL_DEPS: 1 - OPENBOX_TARGET_RELEASE: ${{ matrix.release }} + OPENATTRIBUTEGRAPH_USE_LOCAL_DEPS: 1 + OPENATTRIBUTEGRAPH_TARGET_RELEASE: ${{ matrix.release }} + OPENRENDERBOX_USE_LOCAL_DEPS: 1 + OPENRENDERBOX_TARGET_RELEASE: ${{ matrix.release }} DARWIN_PRIVATE_FRAMEWORKS_TARGET_RELEASE: ${{ matrix.release }} GH_TOKEN: ${{ github.token }} steps: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index dda5ee4c8..1b4966d40 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -18,16 +18,16 @@ jobs: runs-on: ${{ matrix.os }} env: OPENSWIFTUI_WERROR: 1 - OPENGRAPH_ATTRIBUTEGRAPH: 1 + OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH: 1 OPENSWIFTUI_COMPATIBILITY_TEST: 0 OPENSWIFTUI_SWIFT_LOG: 0 OPENSWIFTUI_SWIFT_CRYPTO: 0 OPENSWIFTUI_TARGET_RELEASE: ${{ matrix.release }} OPENSWIFTUI_USE_LOCAL_DEPS: 1 - OPENGRAPH_USE_LOCAL_DEPS: 1 - OPENGRAPH_TARGET_RELEASE: ${{ matrix.release }} - OPENBOX_USE_LOCAL_DEPS: 1 - OPENBOX_TARGET_RELEASE: ${{ matrix.release }} + OPENATTRIBUTEGRAPH_USE_LOCAL_DEPS: 1 + OPENATTRIBUTEGRAPH_TARGET_RELEASE: ${{ matrix.release }} + OPENRENDERBOX_USE_LOCAL_DEPS: 1 + OPENRENDERBOX_TARGET_RELEASE: ${{ matrix.release }} DARWIN_PRIVATE_FRAMEWORKS_TARGET_RELEASE: ${{ matrix.release }} GH_TOKEN: ${{ github.token }} steps: diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index df8811c0b..7a1e63ff2 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-22.04 env: OPENSWIFTUI_WERROR: 1 - OPENGRAPH_ATTRIBUTEGRAPH: 0 + OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH: 0 OPENSWIFTUI_COMPATIBILITY_TEST: 0 OPENSWIFTUI_SWIFT_LOG: 1 OPENSWIFTUI_SWIFT_CRYPTO: 1 diff --git a/.github/workflows/uitests.yml b/.github/workflows/uitests.yml index 608d5ea5a..398fef619 100644 --- a/.github/workflows/uitests.yml +++ b/.github/workflows/uitests.yml @@ -22,17 +22,17 @@ jobs: runs-on: ${{ matrix.os }} env: OPENSWIFTUI_WERROR: 1 - OPENGRAPH_ATTRIBUTEGRAPH: 1 + OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH: 1 OPENSWIFTUI_COMPATIBILITY_TEST: 0 OPENSWIFTUI_SWIFT_LOG: 0 OPENSWIFTUI_SWIFT_CRYPTO: 0 OPENSWIFTUI_TARGET_RELEASE: ${{ matrix.release }} OPENSWIFTUI_SUPPORT_MULTI_PRODUCTS: 0 OPENSWIFTUI_USE_LOCAL_DEPS: 1 - OPENGRAPH_USE_LOCAL_DEPS: 1 - OPENGRAPH_TARGET_RELEASE: ${{ matrix.release }} - OPENBOX_USE_LOCAL_DEPS: 1 - OPENBOX_TARGET_RELEASE: ${{ matrix.release }} + OPENATTRIBUTEGRAPH_USE_LOCAL_DEPS: 1 + OPENATTRIBUTEGRAPH_TARGET_RELEASE: ${{ matrix.release }} + OPENRENDERBOX_USE_LOCAL_DEPS: 1 + OPENRENDERBOX_TARGET_RELEASE: ${{ matrix.release }} DARWIN_PRIVATE_FRAMEWORKS_TARGET_RELEASE: ${{ matrix.release }} GH_TOKEN: ${{ github.token }} steps: @@ -74,17 +74,17 @@ jobs: runs-on: ${{ matrix.os }} env: OPENSWIFTUI_WERROR: 1 - OPENGRAPH_ATTRIBUTEGRAPH: 1 + OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH: 1 OPENSWIFTUI_COMPATIBILITY_TEST: 0 OPENSWIFTUI_SWIFT_LOG: 0 OPENSWIFTUI_SWIFT_CRYPTO: 0 OPENSWIFTUI_TARGET_RELEASE: ${{ matrix.release }} OPENSWIFTUI_SUPPORT_MULTI_PRODUCTS: 0 OPENSWIFTUI_USE_LOCAL_DEPS: 1 - OPENGRAPH_USE_LOCAL_DEPS: 1 - OPENGRAPH_TARGET_RELEASE: ${{ matrix.release }} - OPENBOX_USE_LOCAL_DEPS: 1 - OPENBOX_TARGET_RELEASE: ${{ matrix.release }} + OPENATTRIBUTEGRAPH_USE_LOCAL_DEPS: 1 + OPENATTRIBUTEGRAPH_TARGET_RELEASE: ${{ matrix.release }} + OPENRENDERBOX_USE_LOCAL_DEPS: 1 + OPENRENDERBOX_TARGET_RELEASE: ${{ matrix.release }} DARWIN_PRIVATE_FRAMEWORKS_TARGET_RELEASE: ${{ matrix.release }} GH_TOKEN: ${{ github.token }} steps: diff --git a/Benchmarks/Package.resolved b/Benchmarks/Package.resolved index 209f01634..1ea075219 100644 --- a/Benchmarks/Package.resolved +++ b/Benchmarks/Package.resolved @@ -12,7 +12,7 @@ { "identity" : "opengraph", "kind" : "remoteSourceControl", - "location" : "https://github.com/OpenSwiftUIProject/OpenGraph", + "location" : "https://github.com/OpenSwiftUIProject/OpenAttributeGraph", "state" : { "branch" : "main", "revision" : "6835ce0972f40ef76f1214dc0efc75ec19082631" diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj index 89f5e4fd6..3e05d925f 100644 --- a/Example/Example.xcodeproj/project.pbxproj +++ b/Example/Example.xcodeproj/project.pbxproj @@ -80,14 +80,14 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 271D81642BB1E8E300A6D543 /* OpenGraph */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = OpenGraph; path = ../../OpenGraph; sourceTree = ""; }; + 271D81642BB1E8E300A6D543 /* OpenAttributeGraph */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = OpenAttributeGraph; path = ../../OpenAttributeGraph; sourceTree = ""; }; 275751E32DEE1441003E467C /* TestingHost.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TestingHost.app; sourceTree = BUILT_PRODUCTS_DIR; }; 279283B92DFF11CE00234D64 /* OpenSwiftUIUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OpenSwiftUIUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 27B7FC802BB31FF500272BA5 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; 27CD0B492AFC8D37003665EB /* Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example.app; sourceTree = BUILT_PRODUCTS_DIR; }; 27CD0B612AFC8E0E003665EB /* OpenSwiftUI */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = OpenSwiftUI; path = ..; sourceTree = ""; }; 27D49DF82BA604FB00F6E2E2 /* HostingExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HostingExample.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 27E6C4D02D2842530010502F /* OpenBox */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = OpenBox; path = ../../OpenBox; sourceTree = ""; }; + 27E6C4D02D2842530010502F /* OpenRenderBox */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = OpenRenderBox; path = ../../OpenRenderBox; sourceTree = ""; }; 27E6C4D12D2842740010502F /* AttributeGraph.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = AttributeGraph.xcframework; path = ../../DarwinPrivateFrameworks/AG/2024/AttributeGraph.xcframework; sourceTree = ""; }; 27E6C4D42D2842810010502F /* RenderBox.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = RenderBox.xcframework; path = ../../DarwinPrivateFrameworks/RB/2024/RenderBox.xcframework; sourceTree = ""; }; 27E6C4F72D2844470010502F /* DarwinPrivateFrameworks */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = DarwinPrivateFrameworks; path = ../../DarwinPrivateFrameworks; sourceTree = ""; }; @@ -181,8 +181,8 @@ 27E6C4F62D2842D80010502F /* Configurations */, 27B7FC802BB31FF500272BA5 /* README.md */, 27E6C4F72D2844470010502F /* DarwinPrivateFrameworks */, - 27E6C4D02D2842530010502F /* OpenBox */, - 271D81642BB1E8E300A6D543 /* OpenGraph */, + 27E6C4D02D2842530010502F /* OpenRenderBox */, + 271D81642BB1E8E300A6D543 /* OpenAttributeGraph */, 27CD0B612AFC8E0E003665EB /* OpenSwiftUI */, 27FFF0422E08850C0060A4DA /* SharedExample */, 275751AF2DEE136A003E467C /* Example */, diff --git a/Example/Package.swift b/Example/Package.swift index b3eca91d5..c7d05aad6 100644 --- a/Example/Package.swift +++ b/Example/Package.swift @@ -22,7 +22,7 @@ let package = Package( products: [.executable(name: "Example", targets: ["Example"])], dependencies: [ .package(path: "../"), - .package(path: "../../OpenGraph") + .package(path: "../../OpenAttributeGraph") ], targets: [ exampleTarget, @@ -43,19 +43,19 @@ func envEnable(_ key: String, default defaultValue: Bool = false) -> Bool { } #if os(macOS) -let attributeGraphCondition = envEnable("OPENGRAPH_ATTRIBUTEGRAPH", default: true) +let attributeGraphCondition = envEnable("OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH", default: true) #else -let attributeGraphCondition = envEnable("OPENGRAPH_ATTRIBUTEGRAPH") +let attributeGraphCondition = envEnable("OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH") #endif extension Target { func addAGSettings() { // FIXME: Weird SwiftPM behavior for binary Target. Otherwize we'll get the following error message // "could not determine executable path for bundle 'AttributeGraph.framework'" - dependencies.append(.product(name: "AttributeGraph", package: "OpenGraph")) + dependencies.append(.product(name: "AttributeGraph", package: "OpenAttributeGraph")) var swiftSettings = swiftSettings ?? [] - swiftSettings.append(.define("OPENGRAPH_ATTRIBUTEGRAPH")) + swiftSettings.append(.define("OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH")) self.swiftSettings = swiftSettings } } diff --git a/Example/README.md b/Example/README.md index 19189144a..b82a96762 100644 --- a/Example/README.md +++ b/Example/README.md @@ -6,8 +6,8 @@ Clone other components to the same directory of `OpenSwiftUI` ```shell cd .. -git clone https://github.com/OpenSwiftUIProject/OpenGraph.git -git clone https://github.com/OpenSwiftUIProject/OpenBox.git +git clone https://github.com/OpenSwiftUIProject/OpenAttributeGraph.git +git clone https://github.com/OpenSwiftUIProject/OpenRenderBox.git git clone https://github.com/OpenSwiftUIProject/DarwinPrivateFrameworks.git ``` diff --git a/Package.resolved b/Package.resolved index 78f1dbc77..493091068 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "ab8bc707b0e15c72f40e788831881b7a09b99df76f95fd09712e31d2550b8ade", + "originHash" : "f229c995beae82593994793abdd0fb2239bd44bded0c9672a73e95e1a2baecf5", "pins" : [ { "identity" : "darwinprivateframeworks", @@ -11,12 +11,12 @@ } }, { - "identity" : "openbox", + "identity" : "openattributegraph", "kind" : "remoteSourceControl", - "location" : "https://github.com/OpenSwiftUIProject/OpenBox", + "location" : "https://github.com/OpenSwiftUIProject/OpenAttributeGraph", "state" : { "branch" : "main", - "revision" : "f757b0ab3c243d4e60b5c5cb66128ab6fb81940a" + "revision" : "cc5a58ccf7720bf096fc487c2a518ae1c5139c4d" } }, { @@ -29,12 +29,12 @@ } }, { - "identity" : "opengraph", + "identity" : "openrenderbox", "kind" : "remoteSourceControl", - "location" : "https://github.com/OpenSwiftUIProject/OpenGraph", + "location" : "https://github.com/OpenSwiftUIProject/OpenRenderBox", "state" : { "branch" : "main", - "revision" : "43739e647189207da56903cd55f97ac45eb4ef71" + "revision" : "a288f586e9ecac85b259d433a795d4104cb929a5" } }, { diff --git a/Package.swift b/Package.swift index 26cb084ff..59b4a24d3 100644 --- a/Package.swift +++ b/Package.swift @@ -191,7 +191,7 @@ sharedSwiftSettings.append(contentsOf: [SwiftSetting].availabilityMacroSettings( let openSwiftUISPITarget = Target.target( name: "OpenSwiftUI_SPI", dependencies: [ - .product(name: "OpenBox", package: "OpenBox"), + .product(name: "OpenRenderBox", package: "OpenRenderBox"), ], publicHeadersPath: ".", cSettings: sharedCSettings + [.define("_GNU_SOURCE", .when(platforms: .nonDarwinPlatforms))], @@ -222,8 +222,8 @@ let openSwiftUICoreTarget = Target.target( "OpenSwiftUI_SPI", .product(name: "OpenCoreGraphicsShims", package: "OpenCoreGraphics"), .product(name: "OpenQuartzCoreShims", package: "OpenCoreGraphics"), - .product(name: "OpenGraphShims", package: "OpenGraph"), - .product(name: "OpenBoxShims", package: "OpenBox"), + .product(name: "OpenAttributeGraphShims", package: "OpenAttributeGraph"), + .product(name: "OpenRenderBoxShims", package: "OpenRenderBox"), ] + (swiftUIRenderCondition && symbolLocatorCondition ? ["OpenSwiftUISymbolDualTestsSupport"] : []), cSettings: sharedCSettings, cxxSettings: sharedCxxSettings, @@ -263,8 +263,8 @@ let openSwiftUITarget = Target.target( "COpenSwiftUI", .product(name: "OpenCoreGraphicsShims", package: "OpenCoreGraphics"), .product(name: "OpenQuartzCoreShims", package: "OpenCoreGraphics"), - .product(name: "OpenGraphShims", package: "OpenGraph"), - .product(name: "OpenBoxShims", package: "OpenBox"), + .product(name: "OpenAttributeGraphShims", package: "OpenAttributeGraph"), + .product(name: "OpenRenderBoxShims", package: "OpenRenderBox"), ], cSettings: sharedCSettings, cxxSettings: sharedCxxSettings, @@ -454,7 +454,7 @@ extension Target { // "could not determine executable path for bundle 'AttributeGraph.framework'" dependencies.append(.product(name: "AttributeGraph", package: "DarwinPrivateFrameworks")) var swiftSettings = swiftSettings ?? [] - swiftSettings.append(.define("OPENGRAPH_ATTRIBUTEGRAPH")) + swiftSettings.append(.define("OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH")) self.swiftSettings = swiftSettings } @@ -463,7 +463,7 @@ extension Target { // "could not determine executable path for bundle 'RenderBox.framework'" dependencies.append(.product(name: "RenderBox", package: "DarwinPrivateFrameworks")) var swiftSettings = swiftSettings ?? [] - swiftSettings.append(.define("OPENBOX_RENDERBOX")) + swiftSettings.append(.define("OPENRENDERBOX_RENDERBOX")) self.swiftSettings = swiftSettings } @@ -497,7 +497,7 @@ extension Target { let useLocalDeps = envEnable("OPENSWIFTUI_USE_LOCAL_DEPS") -let attributeGraphCondition = envEnable("OPENGRAPH_ATTRIBUTEGRAPH", default: buildForDarwinPlatform && !isSPIBuild) +let attributeGraphCondition = envEnable("OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH", default: buildForDarwinPlatform && !isSPIBuild) if attributeGraphCondition { openSwiftUICoreTarget.addAGSettings() openSwiftUITarget.addAGSettings() @@ -509,7 +509,7 @@ if attributeGraphCondition { openSwiftUIBridgeTestTarget.addAGSettings() } -let renderBoxCondition = envEnable("OPENBOX_RENDERBOX", default: buildForDarwinPlatform && !isSPIBuild) +let renderBoxCondition = envEnable("OPENRENDERBOX_RENDERBOX", default: buildForDarwinPlatform && !isSPIBuild) if renderBoxCondition { openSwiftUICoreTarget.addRBSettings() openSwiftUITarget.addRBSettings() @@ -540,8 +540,8 @@ if linkCoreUI { if useLocalDeps { var dependencies: [Package.Dependency] = [ .package(path: "../OpenCoreGraphics"), - .package(path: "../OpenGraph"), - .package(path: "../OpenBox"), + .package(path: "../OpenAttributeGraph"), + .package(path: "../OpenRenderBox"), ] if attributeGraphCondition || renderBoxCondition || linkCoreUI { dependencies.append(.package(path: "../DarwinPrivateFrameworks")) @@ -551,8 +551,8 @@ if useLocalDeps { var dependencies: [Package.Dependency] = [ .package(url: "https://github.com/OpenSwiftUIProject/OpenCoreGraphics", branch: "main"), // FIXME: on Linux platform: OG contains unsafe build flags which prevents us using version dependency - .package(url: "https://github.com/OpenSwiftUIProject/OpenGraph", branch: "main"), - .package(url: "https://github.com/OpenSwiftUIProject/OpenBox", branch: "main"), + .package(url: "https://github.com/OpenSwiftUIProject/OpenAttributeGraph", branch: "main"), + .package(url: "https://github.com/OpenSwiftUIProject/OpenRenderBox", branch: "main"), ] if attributeGraphCondition || renderBoxCondition || linkCoreUI { dependencies.append(.package(url: "https://github.com/OpenSwiftUIProject/DarwinPrivateFrameworks.git", branch: "main")) diff --git a/README.md b/README.md index d54e7e30e..46b78dca7 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ The author of this project is not responsible for any consequences that may aris See Example folder and try it with ExampleApp > [!IMPORTANT] -> Clone OpenGraph in the same directory before running the example. +> Clone OpenAttributeGraph in the same directory before running the example. > > See [Example/README.md](Example/README.md) for more detail. @@ -99,7 +99,7 @@ for various platforms: [^4]: Build is supported. Test is not supported yet dut to upstream issue. > [!NOTE] -> The cross-platform OpenGraph is not fully implemented. +> The cross-platform OpenAttributeGraph is not fully implemented. > > It is only API compatible with AttributeGraph now. > diff --git a/Scripts/CI/darwin_setup_build.sh b/Scripts/CI/darwin_setup_build.sh index 5e516ba2b..8a362c3d3 100755 --- a/Scripts/CI/darwin_setup_build.sh +++ b/Scripts/CI/darwin_setup_build.sh @@ -9,6 +9,6 @@ REPO_ROOT="$(dirname $(dirname $(dirname $(filepath $0))))" cd $REPO_ROOT Scripts/CI/opencoregraphics_setup.sh -Scripts/CI/og_setup.sh -Scripts/CI/ob_setup.sh +Scripts/CI/openattributegraph_setup.sh +Scripts/CI/openrenderbox_setup.sh Scripts/CI/framework_setup.sh diff --git a/Scripts/CI/og_setup.sh b/Scripts/CI/og_setup.sh deleted file mode 100755 index 761d83498..000000000 --- a/Scripts/CI/og_setup.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -# A `realpath` alternative using the default C implementation. -filepath() { - [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}" -} - -REPO_ROOT="$(dirname $(dirname $(dirname $(filepath $0))))" - -clone_checkout_og() { - cd $REPO_ROOT - revision=$(Scripts/CI/get_revision.sh opengraph) - cd .. - if [ ! -d OpenGraph ]; then - gh repo clone OpenSwiftUIProject/OpenGraph - cd OpenGraph - else - echo "OpenGraph already exists, skipping clone." - cd OpenGraph - git fetch --all --quiet - git stash --quiet || true - git reset --hard --quiet origin/main - fi - git checkout --quiet $revision -} - -update_og() { - cd $REPO_ROOT/../OpenGraph - ./Scripts/CI/darwin_setup_build.sh -} - -clone_checkout_og -update_og diff --git a/Scripts/CI/openattributegraph_setup.sh b/Scripts/CI/openattributegraph_setup.sh new file mode 100755 index 000000000..30af68cc1 --- /dev/null +++ b/Scripts/CI/openattributegraph_setup.sh @@ -0,0 +1,33 @@ +#!/bin/bash + +# A `realpath` alternative using the default C implementation. +filepath() { + [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}" +} + +REPO_ROOT="$(dirname $(dirname $(dirname $(filepath $0))))" + +clone_checkout_openattributegraph() { + cd $REPO_ROOT + revision=$(Scripts/CI/get_revision.sh openattributegraph) + cd .. + if [ ! -d OpenAttributeGraph ]; then + gh repo clone OpenSwiftUIProject/OpenAttributeGraph + cd OpenAttributeGraph + else + echo "OpenAttributeGraph already exists, skipping clone." + cd OpenAttributeGraph + git fetch --all --quiet + git stash --quiet || true + git reset --hard --quiet origin/main + fi + git checkout --quiet $revision +} + +update_openattributegraph() { + cd $REPO_ROOT/../OpenAttributeGraph + ./Scripts/CI/darwin_setup_build.sh +} + +clone_checkout_openattributegraph +update_openattributegraph diff --git a/Scripts/CI/ob_setup.sh b/Scripts/CI/openrenderbox_setup.sh similarity index 52% rename from Scripts/CI/ob_setup.sh rename to Scripts/CI/openrenderbox_setup.sh index 084a99f95..48454d15a 100755 --- a/Scripts/CI/ob_setup.sh +++ b/Scripts/CI/openrenderbox_setup.sh @@ -7,16 +7,16 @@ filepath() { REPO_ROOT="$(dirname $(dirname $(dirname $(filepath $0))))" -clone_checkout_og() { +clone_checkout_openrenderbox() { cd $REPO_ROOT - revision=$(Scripts/CI/get_revision.sh openbox) + revision=$(Scripts/CI/get_revision.sh openrenderbox) cd .. - if [ ! -d OpenBox ]; then - gh repo clone OpenSwiftUIProject/OpenBox - cd OpenBox + if [ ! -d OpenRenderBox ]; then + gh repo clone OpenSwiftUIProject/OpenRenderBox + cd OpenRenderBox else - echo "OpenBox already exists, skipping clone." - cd OpenBox + echo "OpenRenderBox already exists, skipping clone." + cd OpenRenderBox git fetch --all --quiet git stash --quiet || true git reset --hard --quiet origin/main @@ -24,10 +24,10 @@ clone_checkout_og() { git checkout --quiet $revision } -update_og() { - cd $REPO_ROOT/../OpenBox +update_openrenderbox() { + cd $REPO_ROOT/../OpenRenderBox ./Scripts/CI/darwin_setup_build.sh } -clone_checkout_og -update_og +clone_checkout_openrenderbox +update_openrenderbox diff --git a/Sources/OpenSwiftUI/Accessibility/AccessibilityNodeList.swift b/Sources/OpenSwiftUI/Accessibility/AccessibilityNodeList.swift index 9f7f81899..d2370cf75 100644 --- a/Sources/OpenSwiftUI/Accessibility/AccessibilityNodeList.swift +++ b/Sources/OpenSwiftUI/Accessibility/AccessibilityNodeList.swift @@ -1,4 +1,4 @@ -import OpenGraphShims +import OpenAttributeGraphShims // FIXME struct AccessibilityNodeList { diff --git a/Sources/OpenSwiftUI/App/AppGraph.swift b/Sources/OpenSwiftUI/App/AppGraph.swift index 3e99a2af6..390fc6c58 100644 --- a/Sources/OpenSwiftUI/App/AppGraph.swift +++ b/Sources/OpenSwiftUI/App/AppGraph.swift @@ -13,7 +13,7 @@ import Glibc #elseif os(WASI) import WASILibc #endif -import OpenGraphShims +import OpenAttributeGraphShims @_spi(ForOpenSwiftUIOnly) package import OpenSwiftUICore package final class AppGraph: GraphHost { diff --git a/Sources/OpenSwiftUI/Event/Focus/FocusedValueKey.swift b/Sources/OpenSwiftUI/Event/Focus/FocusedValueKey.swift index 18f0e14d4..7d205243c 100644 --- a/Sources/OpenSwiftUI/Event/Focus/FocusedValueKey.swift +++ b/Sources/OpenSwiftUI/Event/Focus/FocusedValueKey.swift @@ -6,7 +6,7 @@ // Status: WIP import OpenSwiftUICore -import OpenGraphShims +import OpenAttributeGraphShims @available(OpenSwiftUI_v2_0, *) @propertyWrapper diff --git a/Sources/OpenSwiftUI/Integration/Hosting/UIKit/View/UIHostingViewBase.swift b/Sources/OpenSwiftUI/Integration/Hosting/UIKit/View/UIHostingViewBase.swift index 49bcfc236..a209ba5dd 100644 --- a/Sources/OpenSwiftUI/Integration/Hosting/UIKit/View/UIHostingViewBase.swift +++ b/Sources/OpenSwiftUI/Integration/Hosting/UIKit/View/UIHostingViewBase.swift @@ -11,7 +11,7 @@ package import QuartzCore package import UIKit import COpenSwiftUI -import OpenGraphShims +import OpenAttributeGraphShims import OpenSwiftUI_SPI @_spi(ForOpenSwiftUIOnly) package import OpenSwiftUICore diff --git a/Sources/OpenSwiftUI/Integration/Representable/AppKit/NSViewControllerRepresentable.swift b/Sources/OpenSwiftUI/Integration/Representable/AppKit/NSViewControllerRepresentable.swift index 681681251..199147f7e 100644 --- a/Sources/OpenSwiftUI/Integration/Representable/AppKit/NSViewControllerRepresentable.swift +++ b/Sources/OpenSwiftUI/Integration/Representable/AppKit/NSViewControllerRepresentable.swift @@ -10,7 +10,7 @@ public import AppKit public import OpenSwiftUICore -import OpenGraphShims +import OpenAttributeGraphShims // MARK: - NSViewControllerRepresentable diff --git a/Sources/OpenSwiftUI/Integration/Representable/AppKit/NSViewRepresentable.swift b/Sources/OpenSwiftUI/Integration/Representable/AppKit/NSViewRepresentable.swift index d10098165..458393e38 100644 --- a/Sources/OpenSwiftUI/Integration/Representable/AppKit/NSViewRepresentable.swift +++ b/Sources/OpenSwiftUI/Integration/Representable/AppKit/NSViewRepresentable.swift @@ -10,7 +10,7 @@ public import AppKit public import OpenSwiftUICore -import OpenGraphShims +import OpenAttributeGraphShims // MARK: - NSViewRepresentable diff --git a/Sources/OpenSwiftUI/Integration/Representable/Platform/AnyPlatformViewHost.swift b/Sources/OpenSwiftUI/Integration/Representable/Platform/AnyPlatformViewHost.swift index 76d27bf6c..9af9194d5 100644 --- a/Sources/OpenSwiftUI/Integration/Representable/Platform/AnyPlatformViewHost.swift +++ b/Sources/OpenSwiftUI/Integration/Representable/Platform/AnyPlatformViewHost.swift @@ -7,7 +7,7 @@ @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore -import OpenGraphShims +import OpenAttributeGraphShims // MARK: - AnyPlatformViewHost diff --git a/Sources/OpenSwiftUI/Integration/Representable/Platform/PlatformViewRepresentable.swift b/Sources/OpenSwiftUI/Integration/Representable/Platform/PlatformViewRepresentable.swift index 5b9c10604..bef0b98c0 100644 --- a/Sources/OpenSwiftUI/Integration/Representable/Platform/PlatformViewRepresentable.swift +++ b/Sources/OpenSwiftUI/Integration/Representable/Platform/PlatformViewRepresentable.swift @@ -28,7 +28,7 @@ typealias PlatformViewResponder = NSObject @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore -import OpenGraphShims +import OpenAttributeGraphShims // MARK: - PlatformViewRepresentable diff --git a/Sources/OpenSwiftUI/Integration/Representable/Platform/PlatformViewRepresentableContext.swift b/Sources/OpenSwiftUI/Integration/Representable/Platform/PlatformViewRepresentableContext.swift index e42438926..f458f1bdd 100644 --- a/Sources/OpenSwiftUI/Integration/Representable/Platform/PlatformViewRepresentableContext.swift +++ b/Sources/OpenSwiftUI/Integration/Representable/Platform/PlatformViewRepresentableContext.swift @@ -5,7 +5,7 @@ // Audited for 6.5.4 // Status: Complete -import OpenGraphShims +import OpenAttributeGraphShims // MARK: - RepresentableContextValues diff --git a/Sources/OpenSwiftUI/Integration/Representable/UIKit/UIViewControllerRepresentable.swift b/Sources/OpenSwiftUI/Integration/Representable/UIKit/UIViewControllerRepresentable.swift index 46ec756d0..a9998fa42 100644 --- a/Sources/OpenSwiftUI/Integration/Representable/UIKit/UIViewControllerRepresentable.swift +++ b/Sources/OpenSwiftUI/Integration/Representable/UIKit/UIViewControllerRepresentable.swift @@ -10,7 +10,7 @@ public import UIKit public import OpenSwiftUICore -import OpenGraphShims +import OpenAttributeGraphShims // MARK: - UIViewControllerRepresentable diff --git a/Sources/OpenSwiftUI/Integration/Representable/UIKit/UIViewRepresentable.swift b/Sources/OpenSwiftUI/Integration/Representable/UIKit/UIViewRepresentable.swift index cbe046941..2f13719fb 100644 --- a/Sources/OpenSwiftUI/Integration/Representable/UIKit/UIViewRepresentable.swift +++ b/Sources/OpenSwiftUI/Integration/Representable/UIKit/UIViewRepresentable.swift @@ -10,7 +10,7 @@ public import UIKit public import OpenSwiftUICore -import OpenGraphShims +import OpenAttributeGraphShims // MARK: - UIViewRepresentable diff --git a/Sources/OpenSwiftUI/Modifier/ViewModifier/TaskModifier.swift b/Sources/OpenSwiftUI/Modifier/ViewModifier/TaskModifier.swift index bb1a29c74..a892afb6d 100644 --- a/Sources/OpenSwiftUI/Modifier/ViewModifier/TaskModifier.swift +++ b/Sources/OpenSwiftUI/Modifier/ViewModifier/TaskModifier.swift @@ -6,7 +6,7 @@ // Status: Complete // ID: 293A0AF83C78DECE53AFAAF3EDCBA9D4 (SwiftUI) -import OpenGraphShims +import OpenAttributeGraphShims @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore diff --git a/Sources/OpenSwiftUI/OpenGraph/Attribute/AnyAttributeFix.swift b/Sources/OpenSwiftUI/OpenGraph/Attribute/AnyAttributeFix.swift index 497b58062..a58025568 100644 --- a/Sources/OpenSwiftUI/OpenGraph/Attribute/AnyAttributeFix.swift +++ b/Sources/OpenSwiftUI/OpenGraph/Attribute/AnyAttributeFix.swift @@ -3,7 +3,7 @@ // OpenSwiftUI #if OPENSWIFTUI_ANY_ATTRIBUTE_FIX -package import OpenGraphShims +package import OpenAttributeGraphShims package typealias AnyAttribute = OpenSwiftUICore.AnyAttribute package typealias AttributeInfo = OpenSwiftUICore.AttributeInfo @@ -56,11 +56,11 @@ extension AnyAttribute { preconditionFailure("#39") } - package func addInput(_ attribute: AnyAttribute, options: OGInputOptions = [], token: Int) { + package func addInput(_ attribute: AnyAttribute, options: OAGInputOptions = [], token: Int) { preconditionFailure("#39") } - package func addInput(_ attribute: Attribute, options: OGInputOptions = [], token: Int) { + package func addInput(_ attribute: Attribute, options: OAGInputOptions = [], token: Int) { preconditionFailure("#39") } diff --git a/Sources/OpenSwiftUI/Util/OpenSwiftUIGlue.swift b/Sources/OpenSwiftUI/Util/OpenSwiftUIGlue.swift index c3fa2ccaa..8e8cb83ae 100644 --- a/Sources/OpenSwiftUI/Util/OpenSwiftUIGlue.swift +++ b/Sources/OpenSwiftUI/Util/OpenSwiftUIGlue.swift @@ -8,7 +8,7 @@ public import Foundation @_spi(ForOpenSwiftUIOnly) public import OpenSwiftUICore -public import OpenGraphShims +public import OpenAttributeGraphShims import COpenSwiftUI // MARK: - OpenSwiftUIGlue diff --git a/Sources/OpenSwiftUI/View/EquatableView.swift b/Sources/OpenSwiftUI/View/EquatableView.swift index 0f3182f63..fcf24672d 100644 --- a/Sources/OpenSwiftUI/View/EquatableView.swift +++ b/Sources/OpenSwiftUI/View/EquatableView.swift @@ -6,7 +6,7 @@ // Status: Complete // ID: 93C51C71D9D4CBAB391E78A2AAC640D6 (SwiftUI) -import OpenGraphShims +import OpenAttributeGraphShims @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore diff --git a/Sources/OpenSwiftUI/View/IdentifiedView/IdentifiedModifier.swift b/Sources/OpenSwiftUI/View/IdentifiedView/IdentifiedModifier.swift index 66b1b4810..e52739237 100644 --- a/Sources/OpenSwiftUI/View/IdentifiedView/IdentifiedModifier.swift +++ b/Sources/OpenSwiftUI/View/IdentifiedView/IdentifiedModifier.swift @@ -5,7 +5,7 @@ // Status: Complete // ID: 972049776785601E5EF56C4D9DFD84DB (SwiftUI) -import OpenGraphShims +import OpenAttributeGraphShims @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore diff --git a/Sources/OpenSwiftUI/View/List/EditMode.swift b/Sources/OpenSwiftUI/View/List/EditMode.swift index f3097c124..b0b8ecb1e 100644 --- a/Sources/OpenSwiftUI/View/List/EditMode.swift +++ b/Sources/OpenSwiftUI/View/List/EditMode.swift @@ -7,7 +7,7 @@ // ID: D7D98064D8079914AC08939D4AA110C8 (SwiftUI) public import OpenSwiftUICore -import OpenGraphShims +import OpenAttributeGraphShims // MARK: - EditMode diff --git a/Sources/OpenSwiftUI/View/ViewAlias.swift b/Sources/OpenSwiftUI/View/ViewAlias.swift index 9067c95f2..a15cee675 100644 --- a/Sources/OpenSwiftUI/View/ViewAlias.swift +++ b/Sources/OpenSwiftUI/View/ViewAlias.swift @@ -6,7 +6,7 @@ // Status: Complete // ID: D9F7AF928092578A4B8FA861B49E2161 (SwiftUI) -import OpenGraphShims +import OpenAttributeGraphShims @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore // MARK: - ViewAlias diff --git a/Sources/OpenSwiftUICore/Animation/Animatable/Animatable.swift b/Sources/OpenSwiftUICore/Animation/Animatable/Animatable.swift index eb51ba2f8..a305efb85 100644 --- a/Sources/OpenSwiftUICore/Animation/Animatable/Animatable.swift +++ b/Sources/OpenSwiftUICore/Animation/Animatable/Animatable.swift @@ -6,7 +6,7 @@ // Status: Complete public import Foundation -package import OpenGraphShims +package import OpenAttributeGraphShims // MARK: - Animatable diff --git a/Sources/OpenSwiftUICore/Animation/Animatable/AnimatableAttribute.swift b/Sources/OpenSwiftUICore/Animation/Animatable/AnimatableAttribute.swift index ff9ee6d7a..a134bbb99 100644 --- a/Sources/OpenSwiftUICore/Animation/Animatable/AnimatableAttribute.swift +++ b/Sources/OpenSwiftUICore/Animation/Animatable/AnimatableAttribute.swift @@ -7,7 +7,7 @@ // ID: 35ADF281214A25133F1A6DF28858952D (SwiftUICore) package import Foundation -package import OpenGraphShims +package import OpenAttributeGraphShims // MARK: - AnimatableAttribute @@ -292,12 +292,12 @@ package struct AnimatableAttributeHelper where Value: Animatable { ) // let attribute = AnyAttribute.current // For tracing if isAnimationOver { - // TODO: [Trace] CustomEventTrace + OGGraphAddTraceEvent + // TODO: [Trace] CustomEventTrace + OAGGraphAddTraceEvent // TODO: Signpost removeListeners() self.animatorState = nil } else { - // TODO: [Trace] CustomEventTrace + OGGraphAddTraceEvent + // TODO: [Trace] CustomEventTrace + OAGGraphAddTraceEvent sampleCollector(animatableData, time) animatorState.nextUpdate() } diff --git a/Sources/OpenSwiftUICore/Animation/Animation/AnimationContext.swift b/Sources/OpenSwiftUICore/Animation/Animation/AnimationContext.swift index 8030b7d6d..778a40f9e 100644 --- a/Sources/OpenSwiftUICore/Animation/Animation/AnimationContext.swift +++ b/Sources/OpenSwiftUICore/Animation/Animation/AnimationContext.swift @@ -5,7 +5,7 @@ // Audited for 6.5.4 // Status: Complete -package import OpenGraphShims +package import OpenAttributeGraphShims /// Contextual values that a custom animation can use to manage state and /// access a view's environment. diff --git a/Sources/OpenSwiftUICore/Animation/Animation/AnimationModifier.swift b/Sources/OpenSwiftUICore/Animation/Animation/AnimationModifier.swift index d5d31c174..37cb3db1b 100644 --- a/Sources/OpenSwiftUICore/Animation/Animation/AnimationModifier.swift +++ b/Sources/OpenSwiftUICore/Animation/Animation/AnimationModifier.swift @@ -6,7 +6,7 @@ // Status: Blocked by ArichevedView // ID: 530459AF10BEFD7ED901D8CE93C1E289 (SwiftUICore) -import OpenGraphShims +import OpenAttributeGraphShims @available(OpenSwiftUI_v1_0, *) @frozen diff --git a/Sources/OpenSwiftUICore/Animation/Transaction/Transaction.swift b/Sources/OpenSwiftUICore/Animation/Transaction/Transaction.swift index 2f24a942d..5566526c2 100644 --- a/Sources/OpenSwiftUICore/Animation/Transaction/Transaction.swift +++ b/Sources/OpenSwiftUICore/Animation/Transaction/Transaction.swift @@ -6,7 +6,7 @@ // Status: Complete // ID: B2543BCA257433E04979186A1DC2B6BC (SwiftUICore) -import OpenGraphShims +import OpenAttributeGraphShims import OpenSwiftUI_SPI // MARK: - TransactionKey diff --git a/Sources/OpenSwiftUICore/Animation/Transaction/TransactionID.swift b/Sources/OpenSwiftUICore/Animation/Transaction/TransactionID.swift index 924383fcf..d9e986bdc 100644 --- a/Sources/OpenSwiftUICore/Animation/Transaction/TransactionID.swift +++ b/Sources/OpenSwiftUICore/Animation/Transaction/TransactionID.swift @@ -5,7 +5,7 @@ // Audited for 6.5.4 // Status: Complete -package import OpenGraphShims +package import OpenAttributeGraphShims // MARK: - TransactionID diff --git a/Sources/OpenSwiftUICore/Animation/Transaction/TransactionModifier.swift b/Sources/OpenSwiftUICore/Animation/Transaction/TransactionModifier.swift index 4aef388b5..cabb71284 100644 --- a/Sources/OpenSwiftUICore/Animation/Transaction/TransactionModifier.swift +++ b/Sources/OpenSwiftUICore/Animation/Transaction/TransactionModifier.swift @@ -6,7 +6,7 @@ // Status: Complete // ID: A1B10B5AB036C34AB7DD2EE8825FCA93 (SwiftUICore) -package import OpenGraphShims +package import OpenAttributeGraphShims // MARK: View + transaction diff --git a/Sources/OpenSwiftUICore/Data/DynamicProperty/ChangedBodyProperty.swift b/Sources/OpenSwiftUICore/Data/DynamicProperty/ChangedBodyProperty.swift index ba93c8c62..36f2f0291 100644 --- a/Sources/OpenSwiftUICore/Data/DynamicProperty/ChangedBodyProperty.swift +++ b/Sources/OpenSwiftUICore/Data/DynamicProperty/ChangedBodyProperty.swift @@ -5,7 +5,7 @@ // Audited for iOS 15.5 // Status: Complete -import OpenGraphShims +import OpenAttributeGraphShims import Foundation // MARK: - changedBodyProperties diff --git a/Sources/OpenSwiftUICore/Data/DynamicProperty/DynamicProperty.swift b/Sources/OpenSwiftUICore/Data/DynamicProperty/DynamicProperty.swift index 1261dba46..711324d20 100644 --- a/Sources/OpenSwiftUICore/Data/DynamicProperty/DynamicProperty.swift +++ b/Sources/OpenSwiftUICore/Data/DynamicProperty/DynamicProperty.swift @@ -7,7 +7,7 @@ // ID: 49D2A32E637CD497C6DE29B8E060A506 (SwiftUI) // ID: A4C1D658B3717A3062FEFC91A812D6EB (SwiftUICore) -package import OpenGraphShims +package import OpenAttributeGraphShims // MARK: - DynamicProperty diff --git a/Sources/OpenSwiftUICore/Data/DynamicProperty/DynamicPropertyBuffer.swift b/Sources/OpenSwiftUICore/Data/DynamicProperty/DynamicPropertyBuffer.swift index 1c00a3883..aaa3af487 100644 --- a/Sources/OpenSwiftUICore/Data/DynamicProperty/DynamicPropertyBuffer.swift +++ b/Sources/OpenSwiftUICore/Data/DynamicProperty/DynamicPropertyBuffer.swift @@ -7,7 +7,7 @@ // ID: 68550FF604D39F05971FE35A26EE75B0 (SwiftUI) // ID: F3A89CF4357225EF49A7DD673FDFEE02 (SwiftUICore) -import OpenGraphShims +import OpenAttributeGraphShims private let nullPtr: UnsafeMutableRawPointer = Unmanaged.passUnretained(unsafeBitCast(0, to: AnyObject.self)).toOpaque() diff --git a/Sources/OpenSwiftUICore/Data/Environment/CachedEnvironment.swift b/Sources/OpenSwiftUICore/Data/Environment/CachedEnvironment.swift index 7787220a6..488101b1b 100644 --- a/Sources/OpenSwiftUICore/Data/Environment/CachedEnvironment.swift +++ b/Sources/OpenSwiftUICore/Data/Environment/CachedEnvironment.swift @@ -7,7 +7,7 @@ // ID: B62A4B04AF9F1325924A089D63071424 (SwiftUICore) package import Foundation -package import OpenGraphShims +package import OpenAttributeGraphShims // MARK: - CachedEnvironment [6.4.41] [WIP] diff --git a/Sources/OpenSwiftUICore/Data/Environment/Enabled.swift b/Sources/OpenSwiftUICore/Data/Environment/Enabled.swift index 8a9578e80..1676cfedc 100644 --- a/Sources/OpenSwiftUICore/Data/Environment/Enabled.swift +++ b/Sources/OpenSwiftUICore/Data/Environment/Enabled.swift @@ -5,7 +5,7 @@ // Status: Complete // ID: 09CE35833F3876FE3A3A46977D61FC64 (SwiftUICore) -package import OpenGraphShims +package import OpenAttributeGraphShims // MARK: - EnabledKey [6.5.4] diff --git a/Sources/OpenSwiftUICore/Data/Environment/Environment.swift b/Sources/OpenSwiftUICore/Data/Environment/Environment.swift index 2f7ee8ef4..1315b125f 100644 --- a/Sources/OpenSwiftUICore/Data/Environment/Environment.swift +++ b/Sources/OpenSwiftUICore/Data/Environment/Environment.swift @@ -6,7 +6,7 @@ // Status: Complete // ID: 7B48F30970137591804EEB8D0D309152 -import OpenGraphShims +import OpenAttributeGraphShims #if OPENSWIFTUI_SWIFT_LOG public import Logging #else diff --git a/Sources/OpenSwiftUICore/Data/Environment/EnvironmentAdditions.swift b/Sources/OpenSwiftUICore/Data/Environment/EnvironmentAdditions.swift index b993510c6..a171694cb 100644 --- a/Sources/OpenSwiftUICore/Data/Environment/EnvironmentAdditions.swift +++ b/Sources/OpenSwiftUICore/Data/Environment/EnvironmentAdditions.swift @@ -7,7 +7,7 @@ // ID: 1B17C64D9E901A0054B49B69A4A2439D (SwiftUICore) public import Foundation -package import OpenGraphShims +package import OpenAttributeGraphShims // MARK: - EnvironmentValues + Root diff --git a/Sources/OpenSwiftUICore/Data/Environment/EnvironmentKey.swift b/Sources/OpenSwiftUICore/Data/Environment/EnvironmentKey.swift index ae06bf00f..8f4ae8406 100644 --- a/Sources/OpenSwiftUICore/Data/Environment/EnvironmentKey.swift +++ b/Sources/OpenSwiftUICore/Data/Environment/EnvironmentKey.swift @@ -5,7 +5,7 @@ // Audited for 6.5.4 // Status: Complete -import OpenGraphShims +import OpenAttributeGraphShims /// A key for accessing values in the environment. /// diff --git a/Sources/OpenSwiftUICore/Data/Environment/EnvironmentKeyTransformModifier.swift b/Sources/OpenSwiftUICore/Data/Environment/EnvironmentKeyTransformModifier.swift index daf7612c5..5fb5b9290 100644 --- a/Sources/OpenSwiftUICore/Data/Environment/EnvironmentKeyTransformModifier.swift +++ b/Sources/OpenSwiftUICore/Data/Environment/EnvironmentKeyTransformModifier.swift @@ -7,7 +7,7 @@ // ID: 1DBD4F024EFF0E73A70DB6DD05D5B548 (SwiftUI) // ID: E370275CDB55AC7AD9ACF0420859A9E8 (SwiftUICore) -package import OpenGraphShims +package import OpenAttributeGraphShims // MARK: - EnvironmentKeyTransformModifier diff --git a/Sources/OpenSwiftUICore/Data/Environment/EnvironmentalView.swift b/Sources/OpenSwiftUICore/Data/Environment/EnvironmentalView.swift index 69e028d02..1adcef4e9 100644 --- a/Sources/OpenSwiftUICore/Data/Environment/EnvironmentalView.swift +++ b/Sources/OpenSwiftUICore/Data/Environment/EnvironmentalView.swift @@ -5,7 +5,7 @@ // Audited for iOS 18.0 // Status: Complete -import OpenGraphShims +import OpenAttributeGraphShims // MARK: - EnvironmentalView diff --git a/Sources/OpenSwiftUICore/Data/Preference/PreferenceBridge.swift b/Sources/OpenSwiftUICore/Data/Preference/PreferenceBridge.swift index 5bca86529..8fd98dfb9 100644 --- a/Sources/OpenSwiftUICore/Data/Preference/PreferenceBridge.swift +++ b/Sources/OpenSwiftUICore/Data/Preference/PreferenceBridge.swift @@ -7,7 +7,7 @@ // ID: A9FAE381E99529D5274BA37A9BC9B074 (SwiftUI) // ID: DF57A19C61B44C613EB77C1D47FC679A (SwiftUICore) -package import OpenGraphShims +package import OpenAttributeGraphShims package final class PreferenceBridge { package weak var viewGraph: ViewGraph? diff --git a/Sources/OpenSwiftUICore/Data/Preference/PreferenceCombiner.swift b/Sources/OpenSwiftUICore/Data/Preference/PreferenceCombiner.swift index ea8b38091..d1de7618a 100644 --- a/Sources/OpenSwiftUICore/Data/Preference/PreferenceCombiner.swift +++ b/Sources/OpenSwiftUICore/Data/Preference/PreferenceCombiner.swift @@ -7,7 +7,7 @@ // ID: 59D15989E597719355BF0EAE6CB41FF9 (SwiftUI) // ID: EAF68AEE5E08E2f44FEB886FE6A27001 (SwiftUICore) -package import OpenGraphShims +package import OpenAttributeGraphShims // MARK: - PreferenceCombiner diff --git a/Sources/OpenSwiftUICore/Data/Preference/PreferenceTransformModifier.swift b/Sources/OpenSwiftUICore/Data/Preference/PreferenceTransformModifier.swift index 74bc692ef..5d4b1ece7 100644 --- a/Sources/OpenSwiftUICore/Data/Preference/PreferenceTransformModifier.swift +++ b/Sources/OpenSwiftUICore/Data/Preference/PreferenceTransformModifier.swift @@ -5,7 +5,7 @@ // Status: WIP // ID: D3405DB583003A73D556A7797845B7F4 (SwiftUICore) -package import OpenGraphShims +package import OpenAttributeGraphShims // MARK: - PreferenceTransformModifier [6.4.41] diff --git a/Sources/OpenSwiftUICore/Data/Preference/PreferencesInputs.swift b/Sources/OpenSwiftUICore/Data/Preference/PreferencesInputs.swift index 3db33e40c..d094a6dbe 100644 --- a/Sources/OpenSwiftUICore/Data/Preference/PreferencesInputs.swift +++ b/Sources/OpenSwiftUICore/Data/Preference/PreferencesInputs.swift @@ -5,7 +5,7 @@ // Audited for iOS 18.0 // Status: Complete -package import OpenGraphShims +package import OpenAttributeGraphShims package struct PreferencesInputs { package var keys: PreferenceKeys diff --git a/Sources/OpenSwiftUICore/Data/Preference/PreferencesOutputs.swift b/Sources/OpenSwiftUICore/Data/Preference/PreferencesOutputs.swift index 3eb8c08dd..cd03cdb8d 100644 --- a/Sources/OpenSwiftUICore/Data/Preference/PreferencesOutputs.swift +++ b/Sources/OpenSwiftUICore/Data/Preference/PreferencesOutputs.swift @@ -5,7 +5,7 @@ // Status: Complete // ID: 639FD567E11A491423DEEA5A95A52B4C (SwiftUICore) -package import OpenGraphShims +package import OpenAttributeGraphShims // MARK: - PreferencesOutputs [6.5.4] diff --git a/Sources/OpenSwiftUICore/Data/Preference/View_Indirect.swift b/Sources/OpenSwiftUICore/Data/Preference/View_Indirect.swift index b1229e0d6..8fbe74d51 100644 --- a/Sources/OpenSwiftUICore/Data/Preference/View_Indirect.swift +++ b/Sources/OpenSwiftUICore/Data/Preference/View_Indirect.swift @@ -6,9 +6,9 @@ // Status: Complete #if canImport(Darwin) -package import OpenGraphShims +package import OpenAttributeGraphShims #else -import OpenGraphShims +import OpenAttributeGraphShims #endif extension _ViewInputs { diff --git a/Sources/OpenSwiftUICore/Data/PropertyList.swift b/Sources/OpenSwiftUICore/Data/PropertyList.swift index 99cfbb0b1..c250ef975 100644 --- a/Sources/OpenSwiftUICore/Data/PropertyList.swift +++ b/Sources/OpenSwiftUICore/Data/PropertyList.swift @@ -8,7 +8,7 @@ // ID: D64CE6C88E7413721C59A34C0C940F2C (SwiftUICore) import OpenSwiftUI_SPI -import OpenGraphShims +import OpenAttributeGraphShims // MARK: - PropertyKey diff --git a/Sources/OpenSwiftUICore/Data/State/ConstantLocation.swift b/Sources/OpenSwiftUICore/Data/State/ConstantLocation.swift index 636aa10ca..5e01fa04f 100644 --- a/Sources/OpenSwiftUICore/Data/State/ConstantLocation.swift +++ b/Sources/OpenSwiftUICore/Data/State/ConstantLocation.swift @@ -5,7 +5,7 @@ // Audited for iOS 15.5 // Status: Complete -import OpenGraphShims +import OpenAttributeGraphShims struct ConstantLocation: Location { var value: Value diff --git a/Sources/OpenSwiftUICore/Data/State/FunctionalLocation.swift b/Sources/OpenSwiftUICore/Data/State/FunctionalLocation.swift index de46e11b3..3e0a0496e 100644 --- a/Sources/OpenSwiftUICore/Data/State/FunctionalLocation.swift +++ b/Sources/OpenSwiftUICore/Data/State/FunctionalLocation.swift @@ -5,7 +5,7 @@ // Audited for iOS 15.5 // Status: Complete -import OpenGraphShims +import OpenAttributeGraphShims struct FunctionalLocation: Location { var getValue: () -> Value diff --git a/Sources/OpenSwiftUICore/Data/State/State.swift b/Sources/OpenSwiftUICore/Data/State/State.swift index ec2df2746..5b5a0e4aa 100644 --- a/Sources/OpenSwiftUICore/Data/State/State.swift +++ b/Sources/OpenSwiftUICore/Data/State/State.swift @@ -6,7 +6,7 @@ // Status: Complete // ID: 08168374F4710A99DCB15B5E8768D632 -import OpenGraphShims +import OpenAttributeGraphShims /// A property wrapper type that can read and write a value managed by OpenSwiftUI. /// diff --git a/Sources/OpenSwiftUICore/Data/State/StoredLocation.swift b/Sources/OpenSwiftUICore/Data/State/StoredLocation.swift index 00dd122cd..1be6c07b8 100644 --- a/Sources/OpenSwiftUICore/Data/State/StoredLocation.swift +++ b/Sources/OpenSwiftUICore/Data/State/StoredLocation.swift @@ -7,7 +7,7 @@ // ID: EBDC911C9EE054BAE3D86F947C24B7C3 (RELEASE_2021) // ID: 4F21368B1C1680817451AC25B55A8D48 (RELEASE_2024) -import OpenGraphShims +import OpenAttributeGraphShims import OpenSwiftUI_SPI package class StoredLocationBase: AnyLocation, Location, @unchecked Sendable { diff --git a/Sources/OpenSwiftUICore/Data/StrongHash.swift b/Sources/OpenSwiftUICore/Data/StrongHash.swift index cd46056d5..6a3e3831c 100644 --- a/Sources/OpenSwiftUICore/Data/StrongHash.swift +++ b/Sources/OpenSwiftUICore/Data/StrongHash.swift @@ -3,7 +3,7 @@ // OpenSwiftUICore // // Audited for iOS 18.0 -// Status: Blocked by OGTypeGetSignature +// Status: Blocked by OAGTypeGetSignature #if OPENSWIFTUI_SWIFT_CRYPTO import Crypto @@ -12,7 +12,7 @@ import CommonCrypto #endif import Foundation -import OpenBoxShims +import OpenRenderBoxShims package protocol StronglyHashable { func hash(into hasher: inout StrongHasher) @@ -149,9 +149,9 @@ package struct StrongHasher { } package mutating func combineType(_ type: any Any.Type) { -// let signature = OGTypeGetSignature +// let signature = OAGTypeGetSignature // CC_SHA1_Update(&state, signature, 20) - preconditionFailure("Blocked by latest OGTypeGetSignature") + preconditionFailure("Blocked by latest OAGTypeGetSignature") } } @@ -213,7 +213,7 @@ extension Float: StronglyHashableByBitPattern {} extension Double: StronglyHashableByBitPattern {} extension UUID: StronglyHashableByBitPattern {} -extension OBUUID { +extension ORBUUID { package init(hash: StrongHash) { self.init( UInt64(hash.words.0) | (UInt64(hash.words.1) << 32), diff --git a/Sources/OpenSwiftUICore/Data/Update.swift b/Sources/OpenSwiftUICore/Data/Update.swift index 04c6e5f6b..4843789c9 100644 --- a/Sources/OpenSwiftUICore/Data/Update.swift +++ b/Sources/OpenSwiftUICore/Data/Update.swift @@ -8,7 +8,7 @@ // ID: 61534957AEEC2EDC447ABDC13B4D426F (SwiftUICore) import OpenSwiftUI_SPI -import OpenGraphShims +import OpenAttributeGraphShims import Foundation package enum Update { diff --git a/Sources/OpenSwiftUICore/Event/Gesture/AnyGesture.swift b/Sources/OpenSwiftUICore/Event/Gesture/AnyGesture.swift index f982ec4e8..18c333b4d 100644 --- a/Sources/OpenSwiftUICore/Event/Gesture/AnyGesture.swift +++ b/Sources/OpenSwiftUICore/Event/Gesture/AnyGesture.swift @@ -5,7 +5,7 @@ // Status: Complete // ID: 9726BF9F3BA5F571B5F201AD7C8C86F0 (SwiftUICore) -import OpenGraphShims +import OpenAttributeGraphShims // MARK: - AnyGesture [6.5.4] diff --git a/Sources/OpenSwiftUICore/Event/Gesture/ExclusiveGesture.swift b/Sources/OpenSwiftUICore/Event/Gesture/ExclusiveGesture.swift index a5f1adab1..8af0a6f6e 100644 --- a/Sources/OpenSwiftUICore/Event/Gesture/ExclusiveGesture.swift +++ b/Sources/OpenSwiftUICore/Event/Gesture/ExclusiveGesture.swift @@ -5,7 +5,7 @@ // Status: Complete // ID: C6A5F4DE707A20D3CFD8B7768E28573B (SwiftUICore) -import OpenGraphShims +import OpenAttributeGraphShims @available(OpenSwiftUI_v1_0, *) extension Gesture { diff --git a/Sources/OpenSwiftUICore/Event/Gesture/GestureDebug.swift b/Sources/OpenSwiftUICore/Event/Gesture/GestureDebug.swift index f4bb88894..cbf1d7085 100644 --- a/Sources/OpenSwiftUICore/Event/Gesture/GestureDebug.swift +++ b/Sources/OpenSwiftUICore/Event/Gesture/GestureDebug.swift @@ -6,7 +6,7 @@ // ID: 40D5679141F478561068F8E300838A67 (SwiftUICore) package import Foundation -package import OpenGraphShims +package import OpenAttributeGraphShims import OpenSwiftUI_SPI package enum GestureDebug { diff --git a/Sources/OpenSwiftUICore/Event/Gesture/GestureDependency.swift b/Sources/OpenSwiftUICore/Event/Gesture/GestureDependency.swift index 232d051cc..fc17d3e53 100644 --- a/Sources/OpenSwiftUICore/Event/Gesture/GestureDependency.swift +++ b/Sources/OpenSwiftUICore/Event/Gesture/GestureDependency.swift @@ -5,7 +5,7 @@ // Status: Complete // ID: 8687835E41FEE17B108D67665C1D2D0B (SwiftUICore) -import OpenGraphShims +import OpenAttributeGraphShims // MARK: - GestureDependency [6.5.4] diff --git a/Sources/OpenSwiftUICore/Event/Gesture/GestureGraph.swift b/Sources/OpenSwiftUICore/Event/Gesture/GestureGraph.swift index f895b564a..a3903b28a 100644 --- a/Sources/OpenSwiftUICore/Event/Gesture/GestureGraph.swift +++ b/Sources/OpenSwiftUICore/Event/Gesture/GestureGraph.swift @@ -4,7 +4,7 @@ // // Status: WIP -import OpenGraphShims +import OpenAttributeGraphShims // MARK: - GestureGraphDelegate [6.5.4] diff --git a/Sources/OpenSwiftUICore/Event/Gesture/GestureInputs.swift b/Sources/OpenSwiftUICore/Event/Gesture/GestureInputs.swift index 503725ab7..bc49349e1 100644 --- a/Sources/OpenSwiftUICore/Event/Gesture/GestureInputs.swift +++ b/Sources/OpenSwiftUICore/Event/Gesture/GestureInputs.swift @@ -4,7 +4,7 @@ // // Status: Complete -package import OpenGraphShims +package import OpenAttributeGraphShims // MARK: - GestureInputs [6.5.4] diff --git a/Sources/OpenSwiftUICore/Event/Gesture/GestureOutputs.swift b/Sources/OpenSwiftUICore/Event/Gesture/GestureOutputs.swift index fa6fda811..1ba879c95 100644 --- a/Sources/OpenSwiftUICore/Event/Gesture/GestureOutputs.swift +++ b/Sources/OpenSwiftUICore/Event/Gesture/GestureOutputs.swift @@ -4,7 +4,7 @@ // // Status: Complete -package import OpenGraphShims +package import OpenAttributeGraphShims // MARK: - GestureOutputs [6.5.4] diff --git a/Sources/OpenSwiftUICore/Event/Gesture/GestureViewModifier.swift b/Sources/OpenSwiftUICore/Event/Gesture/GestureViewModifier.swift index 9fb685b1d..1d76c7721 100644 --- a/Sources/OpenSwiftUICore/Event/Gesture/GestureViewModifier.swift +++ b/Sources/OpenSwiftUICore/Event/Gesture/GestureViewModifier.swift @@ -5,7 +5,7 @@ // Status: WIP // ID: 9DF46B4E935FF03A55FF3DDFB0B1FF2B (SwiftUICore) -package import OpenGraphShims +package import OpenAttributeGraphShims // MARK: - GestureViewModifier [6.5.4] diff --git a/Sources/OpenSwiftUICore/Event/Gesture/RepeatGesture.swift b/Sources/OpenSwiftUICore/Event/Gesture/RepeatGesture.swift index 331d035f1..32c209f24 100644 --- a/Sources/OpenSwiftUICore/Event/Gesture/RepeatGesture.swift +++ b/Sources/OpenSwiftUICore/Event/Gesture/RepeatGesture.swift @@ -5,7 +5,7 @@ // Status: Unimplmented // ID: BECD07FC80B4CA0BF429B041392E806A (SwiftUICore) -import OpenGraphShims +import OpenAttributeGraphShims // MARK: - RepeatGesture [6.5.4] diff --git a/Sources/OpenSwiftUICore/Event/Gesture/ResettableGestureRule.swift b/Sources/OpenSwiftUICore/Event/Gesture/ResettableGestureRule.swift index 43e69793a..6b1d077ee 100644 --- a/Sources/OpenSwiftUICore/Event/Gesture/ResettableGestureRule.swift +++ b/Sources/OpenSwiftUICore/Event/Gesture/ResettableGestureRule.swift @@ -4,7 +4,7 @@ // // Status: Complete -package import OpenGraphShims +package import OpenAttributeGraphShims // MARK: - ResettableGestureRule [6.5.4] diff --git a/Sources/OpenSwiftUICore/Event/Gesture/SimultaneousGesture.swift b/Sources/OpenSwiftUICore/Event/Gesture/SimultaneousGesture.swift index f10fc6c33..b4726c1d6 100644 --- a/Sources/OpenSwiftUICore/Event/Gesture/SimultaneousGesture.swift +++ b/Sources/OpenSwiftUICore/Event/Gesture/SimultaneousGesture.swift @@ -5,7 +5,7 @@ // Status: Complete // ID: FD72499B2A88A75B09DC7635754CA91F (SwiftUICore) -import OpenGraphShims +import OpenAttributeGraphShims @available(OpenSwiftUI_v1_0, *) extension Gesture { diff --git a/Sources/OpenSwiftUICore/Event/Responder/DefaultLayoutViewResponder.swift b/Sources/OpenSwiftUICore/Event/Responder/DefaultLayoutViewResponder.swift index 33acd27ca..dce7a3a46 100644 --- a/Sources/OpenSwiftUICore/Event/Responder/DefaultLayoutViewResponder.swift +++ b/Sources/OpenSwiftUICore/Event/Responder/DefaultLayoutViewResponder.swift @@ -4,7 +4,7 @@ // // Status: Complete -package import OpenGraphShims +package import OpenAttributeGraphShims // MARK: - DefaultLayoutResponderFilter [6.5.4] diff --git a/Sources/OpenSwiftUICore/Event/Responder/ViewResponder.swift b/Sources/OpenSwiftUICore/Event/Responder/ViewResponder.swift index e5c99eead..2ea612208 100644 --- a/Sources/OpenSwiftUICore/Event/Responder/ViewResponder.swift +++ b/Sources/OpenSwiftUICore/Event/Responder/ViewResponder.swift @@ -6,7 +6,7 @@ // ID: 5DC9CCF050AF89FBA971AEC7E32C63B6 (SwiftUICore) public import Foundation -import OpenGraphShims +import OpenAttributeGraphShims // MARK: - ViewRespondersKey [6.5.4] diff --git a/Sources/OpenSwiftUICore/Graph/GraphHost.swift b/Sources/OpenSwiftUICore/Graph/GraphHost.swift index 5d5ee5b19..7f43a0d2b 100644 --- a/Sources/OpenSwiftUICore/Graph/GraphHost.swift +++ b/Sources/OpenSwiftUICore/Graph/GraphHost.swift @@ -8,7 +8,7 @@ // ID: F9F204BD2F8DB167A76F17F3FB1B3335 (SwiftUICore) import OpenSwiftUI_SPI -package import OpenGraphShims +package import OpenAttributeGraphShims import Foundation // MARK: - GraphDelegate diff --git a/Sources/OpenSwiftUICore/Graph/GraphInputs.swift b/Sources/OpenSwiftUICore/Graph/GraphInputs.swift index aac66cdd8..712fd1a27 100644 --- a/Sources/OpenSwiftUICore/Graph/GraphInputs.swift +++ b/Sources/OpenSwiftUICore/Graph/GraphInputs.swift @@ -5,7 +5,7 @@ // Status: Complete // ID: 9FF97745734808976F608CE0DC13C39C (SwiftUICore) -package import OpenGraphShims +package import OpenAttributeGraphShims // MARK: - GraphInput [6.4.41] diff --git a/Sources/OpenSwiftUICore/Graph/GraphReuse.swift b/Sources/OpenSwiftUICore/Graph/GraphReuse.swift index e9fa89b0c..1f6988c29 100644 --- a/Sources/OpenSwiftUICore/Graph/GraphReuse.swift +++ b/Sources/OpenSwiftUICore/Graph/GraphReuse.swift @@ -7,7 +7,7 @@ // ID: 3E2D3733C4CBF57EC1EA761D02CE8317 (SwiftUICore) import Foundation -package import OpenGraphShims +package import OpenAttributeGraphShims #if OPENSWIFTUI_SWIFT_LOG import Logging #else diff --git a/Sources/OpenSwiftUICore/Graph/GraphValue.swift b/Sources/OpenSwiftUICore/Graph/GraphValue.swift index e58ec05d1..9d48e10f0 100644 --- a/Sources/OpenSwiftUICore/Graph/GraphValue.swift +++ b/Sources/OpenSwiftUICore/Graph/GraphValue.swift @@ -5,7 +5,7 @@ // Audited for 6.5.4 // Status: Complete -public import OpenGraphShims +public import OpenAttributeGraphShims /// A transient reference to a value in the view hierarchy's dataflow /// graph. "Transient" means that these values must never be stored, diff --git a/Sources/OpenSwiftUICore/Graphic/Color/ColorScheme.swift b/Sources/OpenSwiftUICore/Graphic/Color/ColorScheme.swift index 6ff48f3b5..4ac41299d 100644 --- a/Sources/OpenSwiftUICore/Graphic/Color/ColorScheme.swift +++ b/Sources/OpenSwiftUICore/Graphic/Color/ColorScheme.swift @@ -7,7 +7,7 @@ // ID: 387C753F3FFD2899BCB77252214CFCC6 (SwiftUI) // ID: 0E72AB1FBE33AED1E73FF06F3DA3A071 (SwiftUICore) -package import OpenGraphShims +package import OpenAttributeGraphShims // MARK: - ColorScheme diff --git a/Sources/OpenSwiftUICore/Layout/Direction/LayoutDirection.swift b/Sources/OpenSwiftUICore/Layout/Direction/LayoutDirection.swift index 701dd595e..6d7245ccf 100644 --- a/Sources/OpenSwiftUICore/Layout/Direction/LayoutDirection.swift +++ b/Sources/OpenSwiftUICore/Layout/Direction/LayoutDirection.swift @@ -8,7 +8,7 @@ // ID: 54C853EF26D00A0E6B1785C3902A74F4 (SwiftUICore) package import Foundation -package import OpenGraphShims +package import OpenAttributeGraphShims // MARK: - LayoutDirection diff --git a/Sources/OpenSwiftUICore/Layout/Geometry/GeometryReader.swift b/Sources/OpenSwiftUICore/Layout/Geometry/GeometryReader.swift index 9eb9ee82c..bdc1deee5 100644 --- a/Sources/OpenSwiftUICore/Layout/Geometry/GeometryReader.swift +++ b/Sources/OpenSwiftUICore/Layout/Geometry/GeometryReader.swift @@ -7,7 +7,7 @@ // ID: 7D6D22DF7076CCC1FC5284D8E2D1B049 (SwiftUICore) public import Foundation -package import OpenGraphShims +package import OpenAttributeGraphShims import OpenSwiftUI_SPI // MARK: - GeometryReader [WIP] diff --git a/Sources/OpenSwiftUICore/Layout/Layout.swift b/Sources/OpenSwiftUICore/Layout/Layout.swift index a841a12c4..7d0f61c6b 100644 --- a/Sources/OpenSwiftUICore/Layout/Layout.swift +++ b/Sources/OpenSwiftUICore/Layout/Layout.swift @@ -12,7 +12,7 @@ import Foundation #else public import Foundation #endif -package import OpenGraphShims +package import OpenAttributeGraphShims import OpenSwiftUI_SPI // MARK: - Layout diff --git a/Sources/OpenSwiftUICore/Layout/LayoutComputer/LayoutComputer.swift b/Sources/OpenSwiftUICore/Layout/LayoutComputer/LayoutComputer.swift index 94681a534..7dc38fe2a 100644 --- a/Sources/OpenSwiftUICore/Layout/LayoutComputer/LayoutComputer.swift +++ b/Sources/OpenSwiftUICore/Layout/LayoutComputer/LayoutComputer.swift @@ -7,7 +7,7 @@ // ID: 91FCB5522C30220AE13689E45789FEF2 (SwiftUICore) package import Foundation -package import OpenGraphShims +package import OpenAttributeGraphShims package struct LayoutComputer: Equatable { fileprivate var box: AnyLayoutEngineBox diff --git a/Sources/OpenSwiftUICore/Layout/LayoutComputer/UnaryLayoutComputer.swift b/Sources/OpenSwiftUICore/Layout/LayoutComputer/UnaryLayoutComputer.swift index 190636c6e..7f9048e60 100644 --- a/Sources/OpenSwiftUICore/Layout/LayoutComputer/UnaryLayoutComputer.swift +++ b/Sources/OpenSwiftUICore/Layout/LayoutComputer/UnaryLayoutComputer.swift @@ -6,7 +6,7 @@ // ID: 1C3B77B617AD058A6802F719E38F5D79 (SwiftUICore?) import Foundation -package import OpenGraphShims +package import OpenAttributeGraphShims // MARK: - UnaryLayout + _PositionAwarePlacementContext [6.4.41] [TODO] diff --git a/Sources/OpenSwiftUICore/Layout/LayoutProxy.swift b/Sources/OpenSwiftUICore/Layout/LayoutProxy.swift index 65d8efba2..13ca67540 100644 --- a/Sources/OpenSwiftUICore/Layout/LayoutProxy.swift +++ b/Sources/OpenSwiftUICore/Layout/LayoutProxy.swift @@ -6,7 +6,7 @@ // Status: Complete package import Foundation -package import OpenGraphShims +package import OpenAttributeGraphShims /// A collection of attributes that can be applied to layout calculations. /// diff --git a/Sources/OpenSwiftUICore/Layout/Modifier/DefaultPadding.swift b/Sources/OpenSwiftUICore/Layout/Modifier/DefaultPadding.swift index 3f7a1a573..054fe8e63 100644 --- a/Sources/OpenSwiftUICore/Layout/Modifier/DefaultPadding.swift +++ b/Sources/OpenSwiftUICore/Layout/Modifier/DefaultPadding.swift @@ -7,7 +7,7 @@ // ID: 47C1BD8C61550BB60F4F3D12F752D53D (SwiftUICore) import Foundation -import OpenGraphShims +import OpenAttributeGraphShims @available(OpenSwiftUI_v3_0, *) extension EnvironmentValues { diff --git a/Sources/OpenSwiftUICore/Layout/Modifier/InsetViewModifier.swift b/Sources/OpenSwiftUICore/Layout/Modifier/InsetViewModifier.swift index 483b96a53..2dfee2109 100644 --- a/Sources/OpenSwiftUICore/Layout/Modifier/InsetViewModifier.swift +++ b/Sources/OpenSwiftUICore/Layout/Modifier/InsetViewModifier.swift @@ -7,7 +7,7 @@ // ID: 9508EA06E054356A38E761213D9FFC07 (SwiftUICore) public import Foundation -import OpenGraphShims +import OpenAttributeGraphShims // MARK: - View + _InsetViewModifier diff --git a/Sources/OpenSwiftUICore/Layout/PlacementContext.swift b/Sources/OpenSwiftUICore/Layout/PlacementContext.swift index a45952187..84afc95f2 100644 --- a/Sources/OpenSwiftUICore/Layout/PlacementContext.swift +++ b/Sources/OpenSwiftUICore/Layout/PlacementContext.swift @@ -7,7 +7,7 @@ // ID: BA60BF7120E939C5C25B2A488163D4AC (SwiftUICore) package import Foundation -package import OpenGraphShims +package import OpenAttributeGraphShims // MARK: - EnvironmentFetch diff --git a/Sources/OpenSwiftUICore/Layout/SafeAreaInsets.swift b/Sources/OpenSwiftUICore/Layout/SafeAreaInsets.swift index 166565c21..bac3e7581 100644 --- a/Sources/OpenSwiftUICore/Layout/SafeAreaInsets.swift +++ b/Sources/OpenSwiftUICore/Layout/SafeAreaInsets.swift @@ -7,7 +7,7 @@ // ID: C4DC82F2A500E9B6DEA3064A36584B42 (SwiftUICore) import Foundation -package import OpenGraphShims +package import OpenAttributeGraphShims // MARK: - SafeAreaRegions [6.4.41] diff --git a/Sources/OpenSwiftUICore/Layout/Separator/Spacer.swift b/Sources/OpenSwiftUICore/Layout/Separator/Spacer.swift index 2a1f409c6..034855771 100644 --- a/Sources/OpenSwiftUICore/Layout/Separator/Spacer.swift +++ b/Sources/OpenSwiftUICore/Layout/Separator/Spacer.swift @@ -7,7 +7,7 @@ // ID: 81D5572A9475F8358655E25B09BAFBA9 (SwiftUICore) public import Foundation -import OpenGraphShims +import OpenAttributeGraphShims // MARK: - Spacer diff --git a/Sources/OpenSwiftUICore/Layout/UnaryLayout.swift b/Sources/OpenSwiftUICore/Layout/UnaryLayout.swift index b1e8b8069..7939fdc32 100644 --- a/Sources/OpenSwiftUICore/Layout/UnaryLayout.swift +++ b/Sources/OpenSwiftUICore/Layout/UnaryLayout.swift @@ -6,7 +6,7 @@ // ID: A7DFBD5AC47BCDAAE5525781FBD33CF6 (SwiftUICore?) package import Foundation -package import OpenGraphShims +package import OpenAttributeGraphShims // MARK: - UnaryLayout [6.4.41] diff --git a/Sources/OpenSwiftUICore/Layout/View/ViewGeometry.swift b/Sources/OpenSwiftUICore/Layout/View/ViewGeometry.swift index d33b5a84e..b47d8f763 100644 --- a/Sources/OpenSwiftUICore/Layout/View/ViewGeometry.swift +++ b/Sources/OpenSwiftUICore/Layout/View/ViewGeometry.swift @@ -6,7 +6,7 @@ // Status: Complete package import Foundation -package import OpenGraphShims +package import OpenAttributeGraphShims /// A type that represents the position and dimensions of a view in its parent's coordinate space. /// diff --git a/Sources/OpenSwiftUICore/Layout/View/ViewSize.swift b/Sources/OpenSwiftUICore/Layout/View/ViewSize.swift index c7c2b1268..9593db23f 100644 --- a/Sources/OpenSwiftUICore/Layout/View/ViewSize.swift +++ b/Sources/OpenSwiftUICore/Layout/View/ViewSize.swift @@ -6,7 +6,7 @@ // Status: Complete package import Foundation -package import OpenGraphShims +package import OpenAttributeGraphShims /// A structure that represents the size of a view and its associated size proposal. /// diff --git a/Sources/OpenSwiftUICore/Log/CycleDetector.swift b/Sources/OpenSwiftUICore/Log/CycleDetector.swift index 8bd21e10b..4cb7cf1eb 100644 --- a/Sources/OpenSwiftUICore/Log/CycleDetector.swift +++ b/Sources/OpenSwiftUICore/Log/CycleDetector.swift @@ -5,7 +5,7 @@ // Audited for 6.5.4 // Status: Complete -import OpenGraphShims +import OpenAttributeGraphShims // MARK: - UpdateCycleDetector diff --git a/Sources/OpenSwiftUICore/Log/Signpost.swift b/Sources/OpenSwiftUICore/Log/Signpost.swift index 120eaa29d..344537a74 100644 --- a/Sources/OpenSwiftUICore/Log/Signpost.swift +++ b/Sources/OpenSwiftUICore/Log/Signpost.swift @@ -8,7 +8,7 @@ // ID: 59349949219F590F26B6A55CEC9D59A2 (SwiftUICore) import OpenSwiftUI_SPI -import OpenGraphShims +import OpenAttributeGraphShims #if canImport(os) package import os.signpost #endif diff --git a/Sources/OpenSwiftUICore/Modifier/CustomViewModifier.swift b/Sources/OpenSwiftUICore/Modifier/CustomViewModifier.swift index f1116ebef..c3037414b 100644 --- a/Sources/OpenSwiftUICore/Modifier/CustomViewModifier.swift +++ b/Sources/OpenSwiftUICore/Modifier/CustomViewModifier.swift @@ -7,7 +7,7 @@ // ID: 0EAFD5A78D9C0B607C3C0964CF3A3038 (SwiftUI) // ID: 2BA0A33A15B7F322F46AFB9D0D1A262D (SwiftUICore) -import OpenGraphShims +import OpenAttributeGraphShims // MARK: - _ViewModifier_Content diff --git a/Sources/OpenSwiftUICore/Modifier/ViewModifier.swift b/Sources/OpenSwiftUICore/Modifier/ViewModifier.swift index f975fd299..8194813c2 100644 --- a/Sources/OpenSwiftUICore/Modifier/ViewModifier.swift +++ b/Sources/OpenSwiftUICore/Modifier/ViewModifier.swift @@ -5,7 +5,7 @@ // Audited for iOS 18.0 // Status: Complete -import OpenGraphShims +import OpenAttributeGraphShims // MARK: - ViewModifier diff --git a/Sources/OpenSwiftUICore/Modifier/ViewModifier/AppearanceActionModifier.swift b/Sources/OpenSwiftUICore/Modifier/ViewModifier/AppearanceActionModifier.swift index fa38ee8ea..68342a14b 100644 --- a/Sources/OpenSwiftUICore/Modifier/ViewModifier/AppearanceActionModifier.swift +++ b/Sources/OpenSwiftUICore/Modifier/ViewModifier/AppearanceActionModifier.swift @@ -7,7 +7,7 @@ // ID: 8817D3B1C81ADA2B53E3500D727F785A (SwiftUI) // ID: 3EDE22C3B37C9BBEF12EC9D1A4B340F3 (SwiftUICore) -package import OpenGraphShims +package import OpenAttributeGraphShims // MARK: - _AppearanceActionModifier [WIP] diff --git a/Sources/OpenSwiftUICore/Modifier/ViewModifier/OverlayModifier.swift b/Sources/OpenSwiftUICore/Modifier/ViewModifier/OverlayModifier.swift index 1beae4108..bb0b3957e 100644 --- a/Sources/OpenSwiftUICore/Modifier/ViewModifier/OverlayModifier.swift +++ b/Sources/OpenSwiftUICore/Modifier/ViewModifier/OverlayModifier.swift @@ -5,7 +5,7 @@ // Status: WIP import Foundation -package import OpenGraphShims +package import OpenAttributeGraphShims // MARK: - makeSecondaryLayerView [6.4.41] diff --git a/Sources/OpenSwiftUICore/Modifier/ViewModifier/ValueActionModifier.swift b/Sources/OpenSwiftUICore/Modifier/ViewModifier/ValueActionModifier.swift index 9f89f02c8..80b669095 100644 --- a/Sources/OpenSwiftUICore/Modifier/ViewModifier/ValueActionModifier.swift +++ b/Sources/OpenSwiftUICore/Modifier/ViewModifier/ValueActionModifier.swift @@ -6,7 +6,7 @@ // Status: Complete // ID: 4B528D9D60F208F316B29B7D53AC1FB9 (SwiftUICore) -import OpenGraphShims +import OpenAttributeGraphShims // MARK: - View + onChange diff --git a/Sources/OpenSwiftUICore/OpenGraph/AnyAttributeFix.swift b/Sources/OpenSwiftUICore/OpenGraph/AnyAttributeFix.swift index 829e22a3d..7fe20215b 100644 --- a/Sources/OpenSwiftUICore/OpenGraph/AnyAttributeFix.swift +++ b/Sources/OpenSwiftUICore/OpenGraph/AnyAttributeFix.swift @@ -3,7 +3,7 @@ // OpenSwiftUICore #if OPENSWIFTUI_ANY_ATTRIBUTE_FIX -package import OpenGraphShims +package import OpenAttributeGraphShims // This is a workaround to partially "fix" the Swift compiler bug on non-Darwin platforms. // "Fix" here means we do not have to write #if canImport(Darwin) everywhere. @@ -99,11 +99,11 @@ extension AnyAttribute { preconditionFailure("#39") } - package func addInput(_ attribute: AnyAttribute, options: OGInputOptions = [], token: Int) { + package func addInput(_ attribute: AnyAttribute, options: OAGInputOptions = [], token: Int) { preconditionFailure("#39") } - package func addInput(_ attribute: Attribute, options: OGInputOptions = [], token: Int) { + package func addInput(_ attribute: Attribute, options: OAGInputOptions = [], token: Int) { preconditionFailure("#39") } @@ -211,7 +211,7 @@ extension Subgraph { extension Rule where Self: Hashable { package func cachedValue( - options: OGCachedValueOptions = [], + options: OAGCachedValueOptions = [], owner: AnyAttribute? ) -> Value { preconditionFailure("#39") diff --git a/Sources/OpenSwiftUICore/OpenGraph/OpenGraphAdditions.swift b/Sources/OpenSwiftUICore/OpenGraph/OpenGraphAdditions.swift index c1a3afbff..aff0ba357 100644 --- a/Sources/OpenSwiftUICore/OpenGraph/OpenGraphAdditions.swift +++ b/Sources/OpenSwiftUICore/OpenGraph/OpenGraphAdditions.swift @@ -1,11 +1,11 @@ // -// OpenGraphAdditions.swift +// OpenAttributeGraphAdditions.swift // OpenSwiftUICore // // Status: WIP // ID: 372497ED4F569296C4450147CA418CD0 (SwiftUICore) -package import OpenGraphShims +package import OpenAttributeGraphShims // MARK: - Defaultable [6.5.4] diff --git a/Sources/OpenSwiftUICore/Render/DisplayList/DisplayList.swift b/Sources/OpenSwiftUICore/Render/DisplayList/DisplayList.swift index 5bf294c55..ab4f0a737 100644 --- a/Sources/OpenSwiftUICore/Render/DisplayList/DisplayList.swift +++ b/Sources/OpenSwiftUICore/Render/DisplayList/DisplayList.swift @@ -8,7 +8,7 @@ package import OpenCoreGraphicsShims package import Foundation -package import OpenGraphShims +package import OpenAttributeGraphShims // MARK: - _DisplayList_Identity diff --git a/Sources/OpenSwiftUICore/Render/DisplayList/DisplayListTransforms.swift b/Sources/OpenSwiftUICore/Render/DisplayList/DisplayListTransforms.swift index e67c3e071..7dead1697 100644 --- a/Sources/OpenSwiftUICore/Render/DisplayList/DisplayListTransforms.swift +++ b/Sources/OpenSwiftUICore/Render/DisplayList/DisplayListTransforms.swift @@ -6,7 +6,7 @@ // Status: WIP // ID: 8C82E31DBCFF23E23B8937F47207F4D1 (SwiftUICore) -package import OpenGraphShims +package import OpenAttributeGraphShims extension DisplayList { // package mutating func insertLayerFilters(matrices: [_ForegroundLayerLevel : _ColorMatrix], version: DisplayList.Version, premultiplied: Bool) { diff --git a/Sources/OpenSwiftUICore/Render/DisplayList/DisplayList_StableIdentity.swift b/Sources/OpenSwiftUICore/Render/DisplayList/DisplayList_StableIdentity.swift index b0918b7dd..a73a187c8 100644 --- a/Sources/OpenSwiftUICore/Render/DisplayList/DisplayList_StableIdentity.swift +++ b/Sources/OpenSwiftUICore/Render/DisplayList/DisplayList_StableIdentity.swift @@ -6,7 +6,7 @@ // Status: WIP // ID: 6C8682BE0755616E63B02969BA08C92E -package import OpenGraphShims +package import OpenAttributeGraphShims package struct _DisplayList_StableIdentity: Hashable, Codable { package var hash: StrongHash diff --git a/Sources/OpenSwiftUICore/Render/GeometryEffect/GeometryEffect.swift b/Sources/OpenSwiftUICore/Render/GeometryEffect/GeometryEffect.swift index 3e44b96ab..2c93df7bf 100644 --- a/Sources/OpenSwiftUICore/Render/GeometryEffect/GeometryEffect.swift +++ b/Sources/OpenSwiftUICore/Render/GeometryEffect/GeometryEffect.swift @@ -7,7 +7,7 @@ // ID: 9ED0B9F1F6CE74691B78276C750FEDD3 (SwiftUICore) public import Foundation -package import OpenGraphShims +package import OpenAttributeGraphShims // MARK: - GeometryEffect diff --git a/Sources/OpenSwiftUICore/Render/GeometryEffect/OffsetEffect.swift b/Sources/OpenSwiftUICore/Render/GeometryEffect/OffsetEffect.swift index fab52565b..55e01e2bd 100644 --- a/Sources/OpenSwiftUICore/Render/GeometryEffect/OffsetEffect.swift +++ b/Sources/OpenSwiftUICore/Render/GeometryEffect/OffsetEffect.swift @@ -6,7 +6,7 @@ // ID: 72FB21917F353796516DFC9915156779 (SwiftUICore) public import OpenCoreGraphicsShims -import OpenGraphShims +import OpenAttributeGraphShims /// Allows you to redefine origin of the child within its coordinate /// space diff --git a/Sources/OpenSwiftUICore/Render/RendererLeafView.swift b/Sources/OpenSwiftUICore/Render/RendererLeafView.swift index 5ef6ffe6b..36235cb40 100644 --- a/Sources/OpenSwiftUICore/Render/RendererLeafView.swift +++ b/Sources/OpenSwiftUICore/Render/RendererLeafView.swift @@ -7,7 +7,7 @@ // Status: WIP package import Foundation -import OpenGraphShims +import OpenAttributeGraphShims // MARK: - RendererLeafView [TODO] diff --git a/Sources/OpenSwiftUICore/Runtime/ConditionalMetadata.swift b/Sources/OpenSwiftUICore/Runtime/ConditionalMetadata.swift index 9baa6182c..0a76364ce 100644 --- a/Sources/OpenSwiftUICore/Runtime/ConditionalMetadata.swift +++ b/Sources/OpenSwiftUICore/Runtime/ConditionalMetadata.swift @@ -6,7 +6,7 @@ // Status: Complete // ID: 2319071E64CA2FA820BFB26F46C6ECC6 (SwiftUICore) -import OpenGraphShims +import OpenAttributeGraphShims // MARK: - ConditionalProtocolDescriptor diff --git a/Sources/OpenSwiftUICore/Runtime/TupleTypeDescription.swift b/Sources/OpenSwiftUICore/Runtime/TupleTypeDescription.swift index 77dfa8e39..f75586a47 100644 --- a/Sources/OpenSwiftUICore/Runtime/TupleTypeDescription.swift +++ b/Sources/OpenSwiftUICore/Runtime/TupleTypeDescription.swift @@ -5,7 +5,7 @@ // Audited for iOS 18.0 // Status: Complete -package import OpenGraphShims +package import OpenAttributeGraphShims // MARK: - TupleDescriptor diff --git a/Sources/OpenSwiftUICore/Runtime/TypeConformance.swift b/Sources/OpenSwiftUICore/Runtime/TypeConformance.swift index 3a0661171..01081a481 100644 --- a/Sources/OpenSwiftUICore/Runtime/TypeConformance.swift +++ b/Sources/OpenSwiftUICore/Runtime/TypeConformance.swift @@ -6,7 +6,7 @@ // Status: Complete import OpenSwiftUI_SPI -import OpenGraphShims +import OpenAttributeGraphShims // MARK: - ProtocolDescriptor diff --git a/Sources/OpenSwiftUICore/Shape/Path.swift b/Sources/OpenSwiftUICore/Shape/Path.swift index 7ac487fc3..a6cb4c3c7 100644 --- a/Sources/OpenSwiftUICore/Shape/Path.swift +++ b/Sources/OpenSwiftUICore/Shape/Path.swift @@ -8,7 +8,7 @@ // ID: 3591905F51357E95FA93E39751507471 (SwiftUICore) public import Foundation -package import OpenBoxShims +package import OpenRenderBoxShims import OpenSwiftUI_SPI public import OpenCoreGraphicsShims @@ -44,7 +44,7 @@ public struct Path: Equatable, LosslessStringConvertible, @unchecked Sendable { } #endif - package init(takingPath path: OBPath) { + package init(takingPath path: ORBPath) { kind = .obPath //data = PathData(path) _openSwiftUIUnimplementedFailure() @@ -52,18 +52,18 @@ public struct Path: Equatable, LosslessStringConvertible, @unchecked Sendable { #if canImport(CoreGraphics) private func prepareBuffer() { - let obPath: OBPath + let obPath: ORBPath switch kind { case .cgPath: // data.cgPath - // let rbPath = OBPathMakeWithCGPath + // let rbPath = ORBPathMakeWithCGPath _openSwiftUIUnimplementedFailure() case .obPath: - obPath = data.obPath.assumingMemoryBound(to: OBPath.self).pointee + obPath = data.obPath.assumingMemoryBound(to: ORBPath.self).pointee case .buffer: return } - // OBPath.Storage.init + // ORBPath.Storage.init // storage.appendPath obPath.release() } @@ -303,7 +303,7 @@ public struct Path: Equatable, LosslessStringConvertible, @unchecked Sendable { } #endif - package func retainOBPath() -> OBPath { + package func retainORBPath() -> ORBPath { _openSwiftUIUnimplementedFailure() } diff --git a/Sources/OpenSwiftUICore/Shape/RoundedCorner.swift b/Sources/OpenSwiftUICore/Shape/RoundedCorner.swift index a57388109..122b31f18 100644 --- a/Sources/OpenSwiftUICore/Shape/RoundedCorner.swift +++ b/Sources/OpenSwiftUICore/Shape/RoundedCorner.swift @@ -70,10 +70,10 @@ package struct FixedRoundedRect: Equatable { } // TODO: RenderBox - // package func withTemporaryPath(_ body: (OBPath) -> R) -> R + // package func withTemporaryPath(_ body: (ORBPath) -> R) -> R package func contains(_ point: CGPoint) -> Bool { - // TODO: OBPath + // TODO: ORBPath _openSwiftUIUnimplementedFailure() } diff --git a/Sources/OpenSwiftUICore/Shape/ShapeStyle/AnyShapeStyle.swift b/Sources/OpenSwiftUICore/Shape/ShapeStyle/AnyShapeStyle.swift index adbba6864..ec9b23654 100644 --- a/Sources/OpenSwiftUICore/Shape/ShapeStyle/AnyShapeStyle.swift +++ b/Sources/OpenSwiftUICore/Shape/ShapeStyle/AnyShapeStyle.swift @@ -8,7 +8,7 @@ // ID: C5308685324599C90E2F7A588812BB29 (SwiftUICore) import Foundation -import OpenGraphShims +import OpenAttributeGraphShims /// A type-erased ShapeStyle value. @frozen diff --git a/Sources/OpenSwiftUICore/Shape/ShapeStyle/ShapeStyleResolver.swift b/Sources/OpenSwiftUICore/Shape/ShapeStyle/ShapeStyleResolver.swift index 7ab93d454..bd70b7a6e 100644 --- a/Sources/OpenSwiftUICore/Shape/ShapeStyle/ShapeStyleResolver.swift +++ b/Sources/OpenSwiftUICore/Shape/ShapeStyle/ShapeStyleResolver.swift @@ -5,7 +5,7 @@ // Audited for iOS 18.0 // Status: WIP -package import OpenGraphShims +package import OpenAttributeGraphShims package struct ShapeStyleResolver