Skip to content

Commit a156fe9

Browse files
hvadehrarules_java Copybara
authored andcommitted
Move (and enable) remaining java rules & providers out of @_builtins
PiperOrigin-RevId: 697997376 Change-Id: I1ef76949530cd89498826f2bae32b92d57c29f04
1 parent ba2744a commit a156fe9

39 files changed

+702
-208
lines changed

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ REMOTE_JDK_REPOS = [(("remote_jdk" if version == "8" else "remotejdk") + version
9090
[register_toolchains("@" + name + "_toolchain_config_repo//:all") for name in REMOTE_JDK_REPOS]
9191

9292
# Compatibility layer
93-
compat = use_extension("//java:extensions.bzl", "compatibility_proxy")
93+
compat = use_extension("//java:rules_java_deps.bzl", "compatibility_proxy")
9494
use_repo(compat, "compatibility_proxy")
9595

9696
# Dev dependencies

WORKSPACE

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,16 @@ http_archive(
3737
],
3838
)
3939

40-
load("//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains")
40+
load("//java:rules_java_deps.bzl", "rules_java_dependencies")
4141

4242
rules_java_dependencies()
4343

4444
load("@com_google_protobuf//bazel/private:proto_bazel_features.bzl", "proto_bazel_features") # buildifier: disable=bzl-visibility
4545

4646
proto_bazel_features(name = "proto_bazel_features")
4747

48+
load("//java:repositories.bzl", "rules_java_toolchains")
49+
4850
rules_java_toolchains()
4951

5052
load("@stardoc//:setup.bzl", "stardoc_repositories")

java/bazel/rules/bazel_java_binary.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
load("@bazel_skylib//lib:paths.bzl", "paths")
1717
load("@rules_cc//cc:find_cc_toolchain.bzl", "use_cc_toolchain")
18-
load("//java/common:java_info.bzl", "JavaInfo")
1918
load("//java/common:java_semantics.bzl", "semantics")
2019
load(
2120
"//java/common/rules:android_lint.bzl",
@@ -26,6 +25,7 @@ load("//java/common/rules:rule_util.bzl", "merge_attrs")
2625
load("//java/common/rules/impl:java_binary_deploy_jar.bzl", "create_deploy_archives")
2726
load("//java/common/rules/impl:java_binary_impl.bzl", "basic_java_binary")
2827
load("//java/common/rules/impl:java_helper.bzl", "helper")
28+
load("//java/private:java_info.bzl", "JavaInfo")
2929

3030
def _bazel_java_binary_impl(ctx):
3131
return bazel_base_binary_impl(ctx, is_test_rule_class = False) + helper.executable_providers(ctx)

java/bazel/rules/bazel_java_binary_wrapper.bzl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,19 @@ This is needed since the `executable` nature of the target must be computed from
1818
the supplied value of the `create_executable` attribute.
1919
"""
2020

21-
load("//java/common:java_common.bzl", "java_common")
2221
load(
2322
"//java/common/rules:java_binary_wrapper.bzl",
2423
"register_java_binary_rules",
2524
"register_legacy_java_binary_rules",
2625
)
26+
load("//java/private:native.bzl", "get_internal_java_common")
2727
load(":bazel_java_binary.bzl", java_bin_exec = "java_binary")
2828
load(":bazel_java_binary_nonexec.bzl", java_bin_nonexec = "java_binary")
2929

30-
_java_common_internal = java_common.internal_DO_NOT_USE()
31-
3230
# copybara: default visibility
3331

3432
def java_binary(**kwargs):
35-
if _java_common_internal.incompatible_disable_non_executable_java_binary():
33+
if get_internal_java_common().incompatible_disable_non_executable_java_binary():
3634
register_java_binary_rules(
3735
java_bin_exec,
3836
**kwargs

java/bazel/rules/bazel_java_import.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
Definition of java_import rule.
1717
"""
1818

19-
load("//java/common:java_info.bzl", "JavaInfo")
2019
load("//java/common:java_semantics.bzl", "semantics")
2120
load("//java/common/rules:java_import.bzl", "JAVA_IMPORT_ATTRS")
2221
load("//java/common/rules/impl:bazel_java_import_impl.bzl", "bazel_java_import_rule")
22+
load("//java/private:java_info.bzl", "JavaInfo")
2323

2424
def _proxy(ctx):
2525
return bazel_java_import_rule(

java/bazel/rules/bazel_java_library.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
Definition of java_library rule.
1717
"""
1818

19-
load("//java/common:java_info.bzl", "JavaInfo")
2019
load("//java/common:java_semantics.bzl", "semantics")
2120
load("//java/common/rules:android_lint.bzl", "android_lint_subrule")
2221
load("//java/common/rules:java_library.bzl", "JAVA_LIBRARY_ATTRS")
2322
load("//java/common/rules/impl:bazel_java_library_impl.bzl", "bazel_java_library_rule")
23+
load("//java/private:java_info.bzl", "JavaInfo")
2424

2525
def _proxy(ctx):
2626
return bazel_java_library_rule(

java/bazel/rules/bazel_java_plugin.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
Definition of java_plugin rule.
1717
"""
1818

19-
load("//java/common:java_plugin_info.bzl", "JavaPluginInfo")
2019
load("//java/common:java_semantics.bzl", "semantics")
2120
load("//java/common/rules:android_lint.bzl", "android_lint_subrule")
2221
load("//java/common/rules:java_library.bzl", "JAVA_LIBRARY_IMPLICIT_ATTRS")
2322
load("//java/common/rules:java_plugin.bzl", "JAVA_PLUGIN_ATTRS")
2423
load("//java/common/rules:rule_util.bzl", "merge_attrs")
2524
load("//java/common/rules/impl:basic_java_library_impl.bzl", "basic_java_library", "construct_defaultinfo")
25+
load("//java/private:java_info.bzl", "JavaPluginInfo")
2626

2727
def bazel_java_plugin_rule(
2828
ctx,

java/common/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ bzl_library(
1616
name = "common",
1717
srcs = glob(["*.bzl"]),
1818
visibility = ["//visibility:public"],
19-
deps = ["//java/private:native_bzl"],
19+
deps = ["//java/private:internals"],
2020
)
2121

2222
filegroup(

java/common/java_common.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
# limitations under the License.
1414
"""java_common module"""
1515

16-
load("//java/private:native.bzl", "native_java_common")
16+
load("@compatibility_proxy//:proxy.bzl", _java_common = "java_common")
1717

18-
java_common = native_java_common
18+
java_common = _java_common

java/common/java_info.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
# limitations under the License.
1414
"""JavaInfo provider"""
1515

16-
load("//java/private:native.bzl", "NativeJavaInfo")
16+
load("@compatibility_proxy//:proxy.bzl", _JavaInfo = "JavaInfo")
1717

18-
JavaInfo = NativeJavaInfo
18+
JavaInfo = _JavaInfo

0 commit comments

Comments
 (0)