From cf88f3f68cd4b65704526c4ddc2ec9e5371a535d Mon Sep 17 00:00:00 2001 From: Kyle Date: Sun, 27 Jul 2025 02:45:20 +0800 Subject: [PATCH 1/2] Fix ViewGraph.instantiateOutputs issue --- Sources/OpenSwiftUICore/View/Graph/ViewGraph.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/OpenSwiftUICore/View/Graph/ViewGraph.swift b/Sources/OpenSwiftUICore/View/Graph/ViewGraph.swift index 4688d0c6..241591ab 100644 --- a/Sources/OpenSwiftUICore/View/Graph/ViewGraph.swift +++ b/Sources/OpenSwiftUICore/View/Graph/ViewGraph.swift @@ -210,7 +210,7 @@ package final class ViewGraph: GraphHost { } override package func instantiateOutputs() { - let outputs = globalSubgraph.apply { + let outputs = rootSubgraph.apply { // Audited for 6.5.4 var inputs = _ViewInputs( graphInputs, From 5d846d8fcaa6b2b68fa8a4352cbd09d48aada2f2 Mon Sep 17 00:00:00 2001 From: Kyle Date: Sun, 27 Jul 2025 12:02:29 +0800 Subject: [PATCH 2/2] Update OG dependency to fix release issue --- Package.resolved | 6 +++--- Package.swift | 11 ++++++----- .../Data/DynamicProperty/ChangedBodyProperty.swift | 4 ++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Package.resolved b/Package.resolved index c1d888e2..dcc3eeda 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "a3dc41df481d73cc67f9505849d9d97e74487ac6cad2e6073234fa34232de511", + "originHash" : "ffb60a481be264ebb7244d0c1a22ec37d0a3c49feecb12d3ba2e2dd2ed755b6e", "pins" : [ { "identity" : "darwinprivateframeworks", @@ -7,7 +7,7 @@ "location" : "https://github.com/OpenSwiftUIProject/DarwinPrivateFrameworks.git", "state" : { "branch" : "main", - "revision" : "10da520855bab3b61edc93a7ff172856ea6b8ff4" + "revision" : "2af08467b97287e94093e41b8737916a8f383870" } }, { @@ -25,7 +25,7 @@ "location" : "https://github.com/OpenSwiftUIProject/OpenGraph", "state" : { "branch" : "main", - "revision" : "b6259dcd7ca77ff136a7c565d717ba28ca3be68f" + "revision" : "e32d95d42bf2855daa7cffa0067d1e96c2c3bd87" } }, { diff --git a/Package.swift b/Package.swift index d33435fb..46e62595 100644 --- a/Package.swift +++ b/Package.swift @@ -432,13 +432,13 @@ if renderGTKCondition { } if !compatibilityTestCondition { - package.targets.append(contentsOf: [ + package.targets += [ coreGraphicsShimsTestTarget, openSwiftUISPITestTarget, openSwiftUICoreTestTarget, openSwiftUITestTarget, openSwiftUIBridgeTestTarget, - ]) + ] } if buildForDarwinPlatform { @@ -451,11 +451,12 @@ if symbolLocatorCondition { package.dependencies.append( .package(url: "https://github.com/OpenSwiftUIProject/SymbolLocator.git", from: "0.2.0") ) - package.targets += [ - openSwiftUISymbolDualTestsSupportTarget, - openSwiftUISymbolDualTestsTarget, + openSwiftUISymbolDualTestsSupportTarget ] + if !compatibilityTestCondition { + package.targets.append(openSwiftUISymbolDualTestsTarget) + } } extension Target { diff --git a/Sources/OpenSwiftUICore/Data/DynamicProperty/ChangedBodyProperty.swift b/Sources/OpenSwiftUICore/Data/DynamicProperty/ChangedBodyProperty.swift index 5efcf743..ce7ad39c 100644 --- a/Sources/OpenSwiftUICore/Data/DynamicProperty/ChangedBodyProperty.swift +++ b/Sources/OpenSwiftUICore/Data/DynamicProperty/ChangedBodyProperty.swift @@ -15,11 +15,11 @@ package func changedBodyProperties(of type: Body.Type) -> [String] { var index = 0 repeat { let options = [ - Graph.descriptionFormat.takeUnretainedValue(): "stack/frame", + Graph.descriptionFormat: "stack/frame", "frame_index": index, ] as NSDictionary guard let description = Graph.description(nil, options: options), - let dict = description.takeUnretainedValue() as? [String: Any], + let dict = description as? [String: Any], let nodeID = dict["node-id"] as? UInt32, let selfType = dict["self-type"] as? BodyAccessorRule.Type, selfType.container == Body.self