diff --git a/Package.resolved b/Package.resolved index ccb3212db..c1d888e22 100644 --- a/Package.resolved +++ b/Package.resolved @@ -7,7 +7,7 @@ "location" : "https://github.com/OpenSwiftUIProject/DarwinPrivateFrameworks.git", "state" : { "branch" : "main", - "revision" : "af7ef1c0a0e2c2b87e287743997a22ab3678924c" + "revision" : "10da520855bab3b61edc93a7ff172856ea6b8ff4" } }, { @@ -25,7 +25,7 @@ "location" : "https://github.com/OpenSwiftUIProject/OpenGraph", "state" : { "branch" : "main", - "revision" : "83bedb98f5e54f75f225c003da7eaa9f7871ccab" + "revision" : "b6259dcd7ca77ff136a7c565d717ba28ca3be68f" } }, { diff --git a/Sources/OpenSwiftUICore/Data/Environment/EnvironmentKeyTransformModifier.swift b/Sources/OpenSwiftUICore/Data/Environment/EnvironmentKeyTransformModifier.swift index 46eaeb086..daf7612c5 100644 --- a/Sources/OpenSwiftUICore/Data/Environment/EnvironmentKeyTransformModifier.swift +++ b/Sources/OpenSwiftUICore/Data/Environment/EnvironmentKeyTransformModifier.swift @@ -73,7 +73,7 @@ private struct ChildEnvironment: StatefulRule, AsyncAttribute, CustomStri modifier.transform(&newValue) } guard !environmentChanged, - let valueChanged = oldValue.map({ compareValues($0, newValue, mode: ._2) }), !valueChanged, + let valueChanged = oldValue.map({ compareValues($0, newValue, mode: .equatableUnlessPOD) }), !valueChanged, let keyPathChanged = oldKeyPath.map({ $0 == keyPath }), !keyPathChanged, hasValue else { diff --git a/Tests/OpenSwiftUICoreTests/Data/Environment/EnvironmentKeyTests.swift b/Tests/OpenSwiftUICoreTests/Data/Environment/EnvironmentKeyTests.swift index 25d3cbab1..31b951c6c 100644 --- a/Tests/OpenSwiftUICoreTests/Data/Environment/EnvironmentKeyTests.swift +++ b/Tests/OpenSwiftUICoreTests/Data/Environment/EnvironmentKeyTests.swift @@ -33,7 +33,7 @@ struct EnvironmentKeyTests { #expect(OptionalStringEnvironmentKey._valuesEqual(nil, "test") == false) } - #if canImport(Darwin) // FIXME: compareValues is not implemented on OG yet + #if OPENGRAPH_ATTRIBUTEGRAPH // FIXME: compareValues is not implemented on OG yet @Test func nonEquatableValuesComparison() { let struct1 = CustomStructEnvironmentKey.CustomStruct(value: 100)