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.

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

Collect xccurrentversion files as unprocessed #752

Closed
Closed
Changes from all commits
Commits
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
10 changes: 3 additions & 7 deletions rules/precompiled_apple_resource_bundle.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,6 @@ def _precompiled_apple_resource_bundle_impl(ctx):
outputs = [output_bundle_dir],
)

# See https://github.com/bazel-ios/rules_ios/pull/747 for context
xccurrentversions = [
f
for resource_files in ctx.attr.resources
Expand All @@ -206,17 +205,11 @@ def _precompiled_apple_resource_bundle_impl(ctx):

return [
AppleResourceInfo(
datamodels = [
(None, None, depset(xccurrentversions)),
],
unowned_resources = depset(),
owners = depset(
[
(output_bundle_dir.short_path, ctx.label),
(output_plist.short_path, ctx.label),
] + [
(f.short_path, ctx.label)
for f in xccurrentversions
],
),
# This is a list of the resources to propagate without changing further
Expand All @@ -229,6 +222,9 @@ def _precompiled_apple_resource_bundle_impl(ctx):
# Foo.bundle directory that contains our real resources
unprocessed = [
(output_bundle_dir.basename, None, depset([output_bundle_dir, output_plist])),
# So the `.xccurrentversion` files are visible in the provider and can be picked
# up by other rule sets (e.g. Xcode project generation aspects)
(None, None, depset(xccurrentversions)),
],
),
AppleResourceBundleInfo(),
Expand Down