Skip to content

Fix support framework linkage for binary consumers #959

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 5 commits into from
Aug 1, 2026
Merged

Fix support framework linkage for binary consumers #959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1d2bcd6
Remove redundant OpenSwiftUI support dependencies
Kyle-Ye Jul 29, 2026
c2a374f
Limit AttributeGraph linkage to OpenSwiftUICore
Kyle-Ye Jul 29, 2026
eeefc3f
Fix support framework linkage for binary consumers
Kyle-Ye Jul 29, 2026
768a703
Update Package.resolved
Kyle-Ye Aug 1, 2026
eb17682
Link C++ runtime for Compute frameworks
Kyle-Ye Aug 1, 2026
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
12 changes: 6 additions & 6 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 9 additions & 10 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,10 @@ let openSwiftUICoreTarget = Target.target(
] + (swiftUIRenderCondition && symbolLocatorCondition ? ["OpenSwiftUISymbolDualTestsSupport"] : []),
cSettings: sharedCSettings,
cxxSettings: sharedCxxSettings,
swiftSettings: sharedSwiftSettings
swiftSettings: sharedSwiftSettings,
linkerSettings: computeCondition ? [
.linkedLibrary("c++", .when(platforms: .darwinPlatforms)),
] : []
)

let openSwiftUICoreTestTarget = Target.testTarget(
Expand Down Expand Up @@ -629,10 +632,6 @@ let openSwiftUITarget = Target.target(
dependencies: [
"OpenSwiftUICore",
"COpenSwiftUI",
.product(name: "OpenCoreGraphicsShims", package: "OpenCoreGraphics"),
.product(name: "OpenQuartzCoreShims", package: "OpenCoreGraphics"),
.product(name: "OpenAttributeGraphShims", package: "OpenAttributeGraph"),
.product(name: "OpenRenderBoxShims", package: "OpenRenderBox"),
],
cSettings: sharedCSettings,
cxxSettings: sharedCxxSettings,
Expand Down Expand Up @@ -825,7 +824,6 @@ if symbolLocatorCondition {

if attributeGraphCondition {
openSwiftUICoreTarget.addAGSettings()
openSwiftUITarget.addAGSettings()

openSwiftUISPITestTarget.addAGSettings()
openSwiftUICoreTestTarget.addAGSettings()
Expand Down Expand Up @@ -983,10 +981,11 @@ let packageSettings = PackageSettings(
"OpenSwiftUITestsSupport": ProjectDescription.Product.staticFramework,
"OpenSwiftUISymbolDualTestsSupport": ProjectDescription.Product.staticFramework,
"OpenAttributeGraphShims": ProjectDescription.Product.staticFramework,
"OpenCoreGraphicsShims": ProjectDescription.Product.staticFramework,
"OpenObservation": ProjectDescription.Product.staticFramework,
"OpenQuartzCoreShims": ProjectDescription.Product.staticFramework,
"OpenRenderBoxShims": ProjectDescription.Product.staticFramework,
"OpenCoreGraphicsShims": ProjectDescription.Product.framework,
"OpenObservation": ProjectDescription.Product.framework,
"OpenObservationCxx": ProjectDescription.Product.staticFramework,
"OpenQuartzCoreShims": ProjectDescription.Product.framework,
"OpenRenderBoxShims": ProjectDescription.Product.framework,
"SymbolLocator": ProjectDescription.Product.staticFramework,
],
baseProductType: ProjectDescription.Product.staticFramework,
Expand Down
26 changes: 19 additions & 7 deletions Scripts/build_xcframework.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@ RUBY
# macro usages inline where needed. Avoid forcing generated macro tool targets to
# archive for simulator SDKs, where Xcode can try to build them for the target
# platform instead of the host platform.
remove_generated_macro_references "$PROJECT_ROOT/.build/tuist-derived/Projects/OpenObservation/OpenObservation.xcodeproj" "OpenObservation" "OpenObservationMacros"
remove_generated_macro_references "$PROJECT_ROOT/.build/tuist-derived/OpenObservation/OpenObservation.xcodeproj" "OpenObservation" "OpenObservationMacros"
remove_generated_macro_references "$PROJECT_ROOT/../OpenObservation/OpenObservation.xcodeproj" "OpenObservation" "OpenObservationMacros"
remove_generated_macro_references "$XCODEPROJ" "OpenSwiftUICore" "OpenSwiftUIMacros"
Expand Down Expand Up @@ -324,6 +325,17 @@ first_existing_project() {
echo "$1"
}

dependency_project_path() {
local local_project="$1"
shift

if [ "${OPENSWIFTUI_USE_LOCAL_DEPS:-0}" = "1" ]; then
echo "$local_project"
else

@augmentcode augmentcode Bot Aug 1, 2026 •
edited
Loading

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dependency_project_path echoes local_project unconditionally when OPENSWIFTUI_USE_LOCAL_DEPS=1; if the local checkout path is missing, the resulting xcodebuild failure can be hard to diagnose. Consider validating that the path exists (or emitting a targeted error) before returning it.

Severity: medium

Fix This in Augment

🤖 Was this useful? React with 👍 or 👎, or 🚀 if it prevented an incident/outage.

first_existing_project "$@"
fi
}

project_args_for_scheme() {
local scheme="$1"

Expand All @@ -332,22 +344,22 @@ project_args_for_scheme() {
echo "-workspace" "$XCODEWORKSPACE"
;;
_AttributeGraphDeviceSwiftShims)
echo "-project" "$(first_existing_project "$PROJECT_ROOT/../DarwinPrivateFrameworks/DarwinPrivateFrameworks.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/DarwinPrivateFrameworks/DarwinPrivateFrameworks.xcodeproj")"
echo "-project" "$(dependency_project_path "$PROJECT_ROOT/../DarwinPrivateFrameworks/DarwinPrivateFrameworks.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/Projects/DarwinPrivateFrameworks/DarwinPrivateFrameworks.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/DarwinPrivateFrameworks/DarwinPrivateFrameworks.xcodeproj")"
;;
OpenAttributeGraphShims)
echo "-project" "$(first_existing_project "$PROJECT_ROOT/../OpenAttributeGraph/OpenAttributeGraph.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/OpenAttributeGraph/OpenAttributeGraph.xcodeproj")"
echo "-project" "$(dependency_project_path "$PROJECT_ROOT/../OpenAttributeGraph/OpenAttributeGraph.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/Projects/OpenAttributeGraph/OpenAttributeGraph.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/OpenAttributeGraph/OpenAttributeGraph.xcodeproj")"
;;
OpenCoreGraphics|OpenCoreGraphicsShims|OpenQuartzCore|OpenQuartzCoreShims)
echo "-project" "$(first_existing_project "$PROJECT_ROOT/../OpenCoreGraphics/OpenCoreGraphics.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/OpenCoreGraphics/OpenCoreGraphics.xcodeproj")"
echo "-project" "$(dependency_project_path "$PROJECT_ROOT/../OpenCoreGraphics/OpenCoreGraphics.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/Projects/OpenCoreGraphics/OpenCoreGraphics.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/OpenCoreGraphics/OpenCoreGraphics.xcodeproj")"
;;
OpenObservation|OpenObservationCxx)
echo "-project" "$(first_existing_project "$PROJECT_ROOT/../OpenObservation/OpenObservation.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/OpenObservation/OpenObservation.xcodeproj")"
echo "-project" "$(dependency_project_path "$PROJECT_ROOT/../OpenObservation/OpenObservation.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/Projects/OpenObservation/OpenObservation.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/OpenObservation/OpenObservation.xcodeproj")"
;;
OpenRenderBoxShims)
echo "-project" "$(first_existing_project "$PROJECT_ROOT/../OpenRenderBox/OpenRenderBox.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/OpenRenderBox/OpenRenderBox.xcodeproj")"
echo "-project" "$(dependency_project_path "$PROJECT_ROOT/../OpenRenderBox/OpenRenderBox.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/Projects/OpenRenderBox/OpenRenderBox.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/OpenRenderBox/OpenRenderBox.xcodeproj")"
;;
SymbolLocator)
echo "-project" "$PROJECT_ROOT/.build/tuist-derived/SymbolLocator/SymbolLocator.xcodeproj"
echo "-project" "$(first_existing_project "$PROJECT_ROOT/.build/tuist-derived/Projects/SymbolLocator/SymbolLocator.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/SymbolLocator/SymbolLocator.xcodeproj")"
;;
*)
echo "Error: No Xcode project mapping for $scheme." >&2
Expand All @@ -362,7 +374,7 @@ compute_source_backend_enabled() {
}

compute_project_path() {
first_existing_project "$PROJECT_ROOT/../Compute/Compute.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/Compute/Compute.xcodeproj"
dependency_project_path "$PROJECT_ROOT/../Compute/Xcode/Compute.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/Projects/Compute/Compute.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/Compute/Compute.xcodeproj"
}

compute_archive_path() {
Expand Down
Loading