Skip to content

Commit 1a2c184

Browse files
dwsrules_java Copybara
authored andcommitted
use DefaultInfo in rules_java (#303)
We here address the following obstacles in `rules_java` to using Bazel's `--incompatible_disable_target_default_provider_fields` flag: ERROR: /private/var/tmp/_bazel_dws/7fd3cd5077fbf76d9e2ae421c39ef7ed/external/rules_java+/toolchains/BUILD:359:27: in java_toolchain rule @@rules_java+//toolchains:toolchain_jdk_21: Traceback (most recent call last): File "/private/var/tmp/_bazel_dws/7fd3cd5077fbf76d9e2ae421c39ef7ed/external/rules_java+/java/common/rules/java_toolchain.bzl", line 100, column 45, in _java_toolchain_impl jacocorunner = ctx.attr.jacocorunner.files_to_run if ctx.attr.jacocorunner else None, Error: Accessing the default provider in this manner is deprecated and will be removed soon. It may be temporarily re-enabled by setting --incompatible_disable_target_default_provider_fields=false. See bazelbuild/bazel#20183 for details. ERROR: /private/var/tmp/_bazel_dws/7fd3cd5077fbf76d9e2ae421c39ef7ed/external/rules_java+/toolchains/BUILD:359:27: Analysis of target '@@rules_java+//toolchains:toolchain_jdk_21' failed ERROR: Analysis of target '//src:bazel' failed; build aborted: Analysis failed ERROR: /Users/dws/src/bazel-dws/third_party/BUILD:578:20: in java_import rule //third_party:netty_tcnative_checked_in: Traceback (most recent call last): File "/private/var/tmp/_bazel_dws/7fd3cd5077fbf76d9e2ae421c39ef7ed/external/rules_java+/java/bazel/rules/bazel_java_import.bzl", line 25, column 34, in _proxy return bazel_java_import_rule( File "/private/var/tmp/_bazel_dws/7fd3cd5077fbf76d9e2ae421c39ef7ed/external/rules_java+/java/common/rules/impl/bazel_java_import_impl.bzl", line 132, column 35, in bazel_java_import_rule collected_jars = _collect_jars(ctx, jars) File "/private/var/tmp/_bazel_dws/7fd3cd5077fbf76d9e2ae421c39ef7ed/external/rules_java+/java/common/rules/impl/bazel_java_import_impl.bzl", line 38, column 24, in _collect_jars for jar in info.files.to_list(): Error: Accessing the default provider in this manner is deprecated and will be removed soon. It may be temporarily re-enabled by setting --incompatible_disable_target_default_provider_fields=false. See bazelbuild/bazel#20183 for details. ERROR: /Users/dws/src/bazel-dws/third_party/BUILD:578:20: Analysis of target '//third_party:netty_tcnative_checked_in' failed ERROR: Analysis of target '//src:bazel' failed; build aborted: Analysis failed Closes #303 COPYBARA_INTEGRATE_REVIEW=#303 from dws:DefaultInfo c02b772 PiperOrigin-RevId: 770652076 Change-Id: Icc8a698ac66d76b47d9793a0c448d98d05e7186f
1 parent 1947744 commit 1a2c184

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

java/common/rules/impl/bazel_java_import_impl.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def _collect_jars(ctx, jars):
3535
for info in jars:
3636
if JavaInfo in info:
3737
fail("'jars' attribute cannot contain labels of Java targets")
38-
for jar in info.files.to_list():
38+
for jar in info[DefaultInfo].files.to_list():
3939
jar_path = jar.dirname + jar.basename
4040
if jars_dict.get(jar_path) != None:
4141
fail("in jars attribute of java_import rule //" + ctx.label.package + ":" + ctx.attr.name + ": " + jar.basename + " is a duplicate")
@@ -179,7 +179,7 @@ def bazel_java_import_rule(
179179
# TODO(kotlaja): Revise if collected_runtimes can be added into construct_defaultinfo directly.
180180
collected_runtimes = []
181181
for runtime_dep in ctx.attr.runtime_deps:
182-
collected_runtimes.extend(runtime_dep.files.to_list())
182+
collected_runtimes.extend(runtime_dep[DefaultInfo].files.to_list())
183183

184184
target["DefaultInfo"] = construct_defaultinfo(
185185
ctx,

java/common/rules/java_toolchain.bzl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,13 @@ def _java_toolchain_impl(ctx):
9696
oneversion_allowlist = ctx.file.oneversion_allowlist if ctx.file.oneversion_allowlist else ctx.file.oneversion_whitelist
9797
java_toolchain_info = _new_javatoolchaininfo(
9898
bootclasspath = bootclasspath_info.bootclasspath,
99-
ijar = ctx.attr.ijar.files_to_run if ctx.attr.ijar else None,
100-
jacocorunner = ctx.attr.jacocorunner.files_to_run if ctx.attr.jacocorunner else None,
99+
ijar = ctx.attr.ijar[DefaultInfo].files_to_run if ctx.attr.ijar else None,
100+
jacocorunner = ctx.attr.jacocorunner[DefaultInfo].files_to_run if ctx.attr.jacocorunner else None,
101101
java_runtime = java_runtime,
102102
jvm_opt = depset(get_internal_java_common().expand_java_opts(ctx, "jvm_opts", tokenize = False, exec_paths = True)),
103103
label = ctx.label,
104-
proguard_allowlister = ctx.attr.proguard_allowlister.files_to_run if ctx.attr.proguard_allowlister else None,
105-
single_jar = ctx.attr.singlejar.files_to_run,
104+
proguard_allowlister = ctx.attr.proguard_allowlister[DefaultInfo].files_to_run if ctx.attr.proguard_allowlister else None,
105+
single_jar = ctx.attr.singlejar[DefaultInfo].files_to_run,
106106
source_version = ctx.attr.source_version,
107107
target_version = ctx.attr.target_version,
108108
tools = depset(ctx.files.tools),
@@ -131,7 +131,7 @@ def _java_toolchain_impl(ctx):
131131
_javac_supports_worker_multiplex_sandboxing = ctx.attr.javac_supports_worker_multiplex_sandboxing,
132132
_jspecify_info = _get_jspecify_info(ctx),
133133
_local_java_optimization_config = ctx.files._local_java_optimization_configuration,
134-
_one_version_tool = ctx.attr.oneversion.files_to_run if ctx.attr.oneversion else None,
134+
_one_version_tool = ctx.attr.oneversion[DefaultInfo].files_to_run if ctx.attr.oneversion else None,
135135
_one_version_allowlist = oneversion_allowlist,
136136
_one_version_allowlist_for_tests = ctx.file.oneversion_allowlist_for_tests,
137137
_package_configuration = [dep[JavaPackageConfigurationInfo] for dep in ctx.attr.package_configuration],
@@ -171,7 +171,7 @@ def _get_javac_opts(ctx):
171171
def _get_android_lint_tool(ctx):
172172
if not ctx.attr.android_lint_runner:
173173
return None
174-
files_to_run = ctx.attr.android_lint_runner.files_to_run
174+
files_to_run = ctx.attr.android_lint_runner[DefaultInfo].files_to_run
175175
if not files_to_run or not files_to_run.executable:
176176
fail(ctx.attr.android_lint_runner.label, "does not refer to a valid executable target")
177177
return struct(
@@ -186,7 +186,7 @@ def _get_tool_from_ctx(ctx, tool_attr, data_attr, opts_attr):
186186
dep = getattr(ctx.attr, tool_attr)
187187
if not dep:
188188
return None
189-
files_to_run = dep.files_to_run
189+
files_to_run = dep[DefaultInfo].files_to_run
190190
if not files_to_run or not files_to_run.executable:
191191
fail(dep.label, "does not refer to a valid executable target")
192192
data = getattr(ctx.attr, data_attr)
@@ -200,7 +200,7 @@ def _get_tool_from_executable(ctx, attr_name, data = [], jvm_opts = []):
200200
dep = getattr(ctx.attr, attr_name)
201201
if not dep:
202202
return None
203-
files_to_run = dep.files_to_run
203+
files_to_run = dep[DefaultInfo].files_to_run
204204
if not files_to_run or not files_to_run.executable:
205205
fail(dep.label, "does not refer to a valid executable target")
206206
return struct(tool = files_to_run, data = depset(data), jvm_opts = depset(jvm_opts))

0 commit comments

Comments
 (0)