Switch rules_java back to more named params (quasi-rollback of unknown commit) PiperOrigin-RevId: 728089692 Change-Id: I76cbe64fbcb422c67db62e87f0bc5eba675191ee
diff --git a/java/common/rules/impl/basic_java_library_impl.bzl b/java/common/rules/impl/basic_java_library_impl.bzl index 35b1edd..a43b451 100644 --- a/java/common/rules/impl/basic_java_library_impl.bzl +++ b/java/common/rules/impl/basic_java_library_impl.bzl
@@ -126,23 +126,23 @@ java_info, compilation_info = compile_action( ctx, - ctx.outputs.classjar, - ctx.outputs.sourcejar, - source_files, - source_jars, - collect_deps(deps) + ([coverage_config.runner] if coverage_config and coverage_config.runner else []), - collect_deps(runtime_deps), - plugins_javaplugininfo, - collect_deps(exports), - _collect_plugins(exported_plugins), - resources, - resource_jars, - classpath_resources, - _collect_native_libraries(deps, runtime_deps, exports), - javacopts, - neverlink, - ctx.fragments.java.strict_java_deps, - enable_compile_jar_action, + output_class_jar = ctx.outputs.classjar, + output_source_jar = ctx.outputs.sourcejar, + source_files = source_files, + source_jars = source_jars, + deps = collect_deps(deps) + ([coverage_config.runner] if coverage_config and coverage_config.runner else []), + runtime_deps = collect_deps(runtime_deps), + plugins = plugins_javaplugininfo, + exports = collect_deps(exports), + exported_plugins = _collect_plugins(exported_plugins), + resources = resources, + resource_jars = resource_jars, + classpath_resources = classpath_resources, + native_libraries = _collect_native_libraries(deps, runtime_deps, exports), + javacopts = javacopts, + neverlink = neverlink, + strict_deps = ctx.fragments.java.strict_java_deps, + enable_compile_jar_action = enable_compile_jar_action, add_exports = add_exports, add_opens = add_opens, bootclasspath = bootclasspath[BootClassPathInfo] if bootclasspath else None,
diff --git a/java/common/rules/impl/bazel_java_library_impl.bzl b/java/common/rules/impl/bazel_java_library_impl.bzl index 04a020e..5c7fc5c 100644 --- a/java/common/rules/impl/bazel_java_library_impl.bzl +++ b/java/common/rules/impl/bazel_java_library_impl.bzl
@@ -67,17 +67,17 @@ target, base_info = basic_java_library( ctx, - srcs, - deps, - runtime_deps, - plugins, - exports, - exported_plugins, - resources, - [], # resource_jars - [], # class_pathresources - javacopts, - neverlink, + srcs = srcs, + deps = deps, + runtime_deps = runtime_deps, + plugins = plugins, + exports = exports, + exported_plugins = exported_plugins, + resources = resources, + resource_jars = [], + classpath_resources = [], + javacopts = javacopts, + neverlink = neverlink, proguard_specs = proguard_specs, add_exports = add_exports, add_opens = add_opens,
diff --git a/java/private/java_common.bzl b/java/private/java_common.bzl index ebaa35d..7046163 100644 --- a/java/private/java_common.bzl +++ b/java/private/java_common.bzl
@@ -70,8 +70,8 @@ add_opens = []): return _compile_internal( ctx, - output, - java_toolchain, + output = output, + java_toolchain = java_toolchain, source_jars = source_jars, source_files = source_files, output_source_jar = output_source_jar,