Skip to content
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

Forward package_name to swift_library part of apple_library #853

Merged
merged 1 commit into from
Mar 26, 2024
Merged

Forward package_name to swift_library part of apple_library #853

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
26 changes: 13 additions & 13 deletions rules/library.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ GLOBAL_INDEX_STORE_PATH = "bazel-out/_global_index_store"

_MANUAL = ["manual"]

_SWIFT_LIBRARY_KWARGS = [
"always_include_developer_search_paths",
"package_name",
"plugins",
]

def _private_headers_impl(ctx):
return [
PrivateHeadersInfo(
Expand Down Expand Up @@ -578,8 +584,10 @@ def apple_library(
defines = kwargs.pop("defines", [])
testonly = kwargs.pop("testonly", False)
features = kwargs.pop("features", [])
plugins = kwargs.pop("plugins", None)
always_include_developer_search_paths = kwargs.pop("always_include_developer_search_paths", None)

# Collect the swift_library related kwargs, these are typically only set when provided to allow
# for wider compatibility with rule_swift versions.
swift_kwargs = {arg: kwargs.pop(arg) for arg in _SWIFT_LIBRARY_KWARGS if arg in kwargs}

for (k, v) in {"momc_copts": momc_copts, "mapc_copts": mapc_copts, "ibtool_copts": ibtool_copts}.items():
if v:
Expand Down Expand Up @@ -958,16 +966,8 @@ def apple_library(
)

if swift_sources:
swift_kwargs = kwargs

# To be backward compatible with rules_apple 2.x
if plugins:
swift_kwargs = dicts.add(swift_kwargs, {"plugins": plugins})

# Allow consumers to opt-in to https://github.com/bazelbuild/rules_swift/pull/1162
if always_include_developer_search_paths:
swift_kwargs = dicts.add(swift_kwargs, {"always_include_developer_search_paths": always_include_developer_search_paths})

# Forward the kwargs and the swift specific kwargs to the swift_library
swift_library_kwargs = dicts.add(kwargs, swift_kwargs)
swift_library(
name = swift_libname,
module_name = module_name,
Expand All @@ -993,7 +993,7 @@ def apple_library(
tags = tags_manual,
defines = defines + swift_defines,
testonly = testonly,
**swift_kwargs
**swift_library_kwargs
)
lib_names.append(swift_libname)

Expand Down