Skip to content

fix: use apple_static_xcframework_import for binaryTarget in SPM #546

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
merged 3 commits into from
Sep 5, 2023
Merged

fix: use apple_static_xcframework_import for binaryTarget in SPM #546

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e58f54a
Use apple_static_xcframework_import for binary targets
cgrindel Aug 10, 2023
20f6af6
Remove code for dynamic xcframeworks
cgrindel Sep 1, 2023
3f2bb46
Merge branch 'main' into gh498_braze_validation_failure
cgrindel Sep 5, 2023
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
15 changes: 8 additions & 7 deletions swiftpkg/internal/swiftpkg_build_files.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ def _new_for_target(repository_ctx, pkg_ctx, target):
elif target.module_type == module_types.system_library:
return _system_library_build_file(target)
elif target.module_type == module_types.binary:
return _apple_dynamic_xcframework_import_build_file(target)
# GH559: Allow client to control how binary targets are exposed.
return _apple_static_xcframework_import_build_file(target)

# GH046: Support plugins.
return None
Expand Down Expand Up @@ -355,15 +356,15 @@ def _system_library_build_file(target):

# MARK: - Apple xcframework Targets

def _apple_dynamic_xcframework_import_build_file(target):
load_stmts = [apple_dynamic_xcframework_import_load_stmt]
def _apple_static_xcframework_import_build_file(target):
load_stmts = [apple_static_xcframework_import_load_stmt]
glob = scg.new_fn_call(
"glob",
["{tpath}/*.xcframework/**".format(tpath = target.path)],
)
decls = [
build_decls.new(
kind = apple_kinds.dynamic_xcframework_import,
kind = apple_kinds.static_xcframework_import,
name = pkginfo_targets.bazel_label_name(target),
attrs = {
"visibility": ["//visibility:public"],
Expand Down Expand Up @@ -640,17 +641,17 @@ swiftpkg_build_files = struct(
)

apple_kinds = struct(
dynamic_xcframework_import = "apple_dynamic_xcframework_import",
static_xcframework_import = "apple_static_xcframework_import",
resource_bundle = "apple_resource_bundle",
)

apple_apple_location = "@build_bazel_rules_apple//apple:apple.bzl"

apple_resources_location = "@build_bazel_rules_apple//apple:resources.bzl"

apple_dynamic_xcframework_import_load_stmt = load_statements.new(
apple_static_xcframework_import_load_stmt = load_statements.new(
apple_apple_location,
apple_kinds.dynamic_xcframework_import,
apple_kinds.static_xcframework_import,
)

apple_resource_bundle_load_stmt = load_statements.new(
Expand Down