Skip to content

Remove obsolete AnyAttribute compiler workaround #938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kyle-Ye merged 1 commit into from
Jul 15, 2026
Merged

Remove obsolete AnyAttribute compiler workaround #938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,6 @@ let attributeGraphCondition = envBoolValue("OPENATTRIBUTESHIMS_ATTRIBUTEGRAPH",

let renderBoxCondition = envBoolValue("RENDERBOX", default: buildForDarwinPlatform && !isSPIBuild)

// For #39
let anyAttributeFix = envBoolValue("ANY_ATTRIBUTE_FIX", default: !buildForDarwinPlatform)

let linkCoreUI = envBoolValue("LINK_COREUI", default: buildForDarwinPlatform && !isSPIBuild)
let linkCoreSVG = envBoolValue("LINK_CORESVG", default: buildForDarwinPlatform && !isSPIBuild)
let linkSFSymbols = envBoolValue("LINK_SFSYMBOLS", default: buildForDarwinPlatform && !isSPIBuild)
Expand Down Expand Up @@ -244,10 +241,6 @@ if !compatibilityTestCondition {
sharedSwiftSettings.append(.define("OPENSWIFTUI"))
}

if anyAttributeFix {
sharedSwiftSettings.append(.define("OPENSWIFTUI_ANY_ATTRIBUTE_FIX"))
}

if development {
sharedSwiftSettings.append(.define("OPENSWIFTUI_DEVELOPMENT"))
}
Expand Down
197 changes: 0 additions & 197 deletions Sources/OpenSwiftUI/Util/AnyAttributeFix.swift
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions Sources/OpenSwiftUICore/Data/Preference/View_Indirect.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@
// Audited for 6.0.87
// Status: Complete

#if canImport(Darwin)
package import OpenAttributeGraphShims
#else
import OpenAttributeGraphShims
#endif

extension _ViewInputs {
package func makeIndirectOutputs() -> _ViewOutputs {
Expand Down
6 changes: 0 additions & 6 deletions Sources/OpenSwiftUICore/Render/RasterizationOptions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ package struct RasterizationOptions: Equatable {
set { flags.setValue(newValue, for: .allowsPackedDrawable) }
}

#if !OPENSWIFTUI_ANY_ATTRIBUTE_FIX
package var resolvedColorMode: ORBColor.Mode {
if let mode = rbColorMode {
return ORBColor.Mode(rawValue: mode)
Expand All @@ -152,14 +151,9 @@ package struct RasterizationOptions: Equatable {
}
}
}
#endif

package var colorSpace: ORBColor.ColorSpace {
#if OPENSWIFTUI_ANY_ATTRIBUTE_FIX
.default
#else
resolvedColorMode.workingColorSpace
#endif
}

package var alphaOnly: Bool {
Expand Down
Loading
Loading