Skip to content

Commit 5b63d10

Browse files
Fix handling of apple_resource_bundle in deps (#734)
1 parent db81cef commit 5b63d10

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

examples/ios_app/ExampleUITests/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ swift_library(
1414
name = "ExampleUITests.library",
1515
testonly = True,
1616
srcs = [":Sources"],
17-
data = ["@examples_ios_app_external//:ExternalResources"],
1817
module_name = "ExampleUITests",
1918
tags = ["manual"],
19+
deps = ["@examples_ios_app_external//:ExternalResources"],
2020
)
2121

2222
filegroup(

xcodeproj/internal/default_automatic_target_processing_aspect.bzl

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,20 +73,20 @@ def _default_automatic_target_processing_aspect_impl(target, ctx):
7373

7474
if ctx.rule.kind == "cc_library":
7575
xcode_targets = {
76-
"deps": [target_type.compile],
76+
"deps": [target_type.compile, None],
7777
"interface_deps": [target_type.compile],
7878
}
7979
elif ctx.rule.kind == "objc_library":
8080
xcode_targets = {
81-
"deps": [target_type.compile],
81+
"deps": [target_type.compile, None],
8282
"runtime_deps": [target_type.compile],
8383
}
8484
non_arc_srcs = ["non_arc_srcs"]
8585
pch = "pch"
8686
elif ctx.rule.kind == "swift_library":
8787
xcode_targets = {
88-
"deps": [target_type.compile],
89-
"private_deps": [target_type.compile],
88+
"deps": [target_type.compile, None],
89+
"private_deps": [target_type.compile, None],
9090
}
9191
elif ctx.rule.kind == "apple_resource_bundle":
9292
xcode_targets = {}
@@ -97,7 +97,7 @@ def _default_automatic_target_processing_aspect_impl(target, ctx):
9797
should_generate_target = False
9898
elif AppleBundleInfo in target:
9999
xcode_targets = {
100-
"deps": [target_type.compile],
100+
"deps": [target_type.compile, None],
101101
}
102102
if _is_test_target(target):
103103
xcode_targets["test_host"] = [target_type.compile]
@@ -126,7 +126,9 @@ def _default_automatic_target_processing_aspect_impl(target, ctx):
126126
infoplists = ["infoplists"]
127127
if "launchdplists" in attrs:
128128
launchdplists = ["launchdplists"]
129-
xcode_targets = {"deps": [target_type.compile]}
129+
xcode_targets = {
130+
"deps": [target_type.compile, None],
131+
}
130132
elif AppleFrameworkImportInfo in target:
131133
xcode_targets = {"deps": [target_type.compile]}
132134
if getattr(ctx.rule.attr, "bundle_only", False):
@@ -136,7 +138,9 @@ def _default_automatic_target_processing_aspect_impl(target, ctx):
136138

137139
should_generate_target = False
138140
else:
139-
xcode_targets = {"deps": [this_target_type]}
141+
xcode_targets = {
142+
"deps": [this_target_type, None],
143+
}
140144

141145
# Command-line tools
142146
executable = target[DefaultInfo].files_to_run.executable

0 commit comments

Comments
 (0)