Skip to content

Commit 5812cc3

Browse files
committed
Fix mixed_language_library resource propagation
Signed-off-by: Luis Padron <lpadron@squareup.com>
1 parent 1ba4483 commit 5812cc3

File tree

7 files changed

+10
-1
lines changed

7 files changed

+10
-1
lines changed

examples/integration/MixedLib/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ apple_precompiled_resource_bundle(
2323
bundle_name = "MixedLibResources",
2424
resources = glob(
2525
[
26-
"Model.xcdatamodeld/**",
26+
"Resources/**",
2727
],
2828
),
2929
)

examples/integration/MixedLib/Model.xcdatamodeld/.xccurrentversion renamed to examples/integration/MixedLib/Resources/Model.xcdatamodeld/.xccurrentversion

File renamed without changes.

examples/integration/MixedLib/Model.xcdatamodeld/Model 2.xcdatamodel/contents renamed to examples/integration/MixedLib/Resources/Model.xcdatamodeld/Model 2.xcdatamodel/contents

File renamed without changes.

examples/integration/MixedLib/Model.xcdatamodeld/Model.xcdatamodel/contents renamed to examples/integration/MixedLib/Resources/Model.xcdatamodeld/Model.xcdatamodel/contents

File renamed without changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
"rules_xcodeproj_key" = "rules_xcodeproj";
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
"rules_xcodeproj_key" = "rules_xcodeproj";

xcodeproj/internal/processed_targets/mixed_language_library_targets.bzl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,12 @@ def _process_mixed_language_library_target(
245245
)
246246
xcode_target = None
247247

248+
resource_bundle_ids = [
249+
rb_id
250+
for info in mixed_target_infos
251+
for rb_id in info.resource_bundle_ids.to_list()
252+
]
253+
248254
processed_target = processed_targets.make(
249255
compilation_providers = provider_compilation_providers,
250256
direct_dependencies = direct_dependencies,
@@ -253,6 +259,7 @@ def _process_mixed_language_library_target(
253259
merged_target_ids = merged_target_ids,
254260
outputs = provider_outputs,
255261
platform = platform.apple_platform,
262+
resource_bundle_ids = resource_bundle_ids if resource_bundle_ids else None,
256263
swift_debug_settings = swift_target_info.swift_debug_settings,
257264
target_output_groups = target_output_groups,
258265
transitive_dependencies = transitive_dependencies,

0 commit comments

Comments
 (0)