From 479d18ebcdf74770ffa0c4573d56d5c9399212d3 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Fri, 19 Dec 2025 15:34:53 -0800 Subject: [PATCH] avoid loading from defs.bzl At least the example should use the preferred load paths. --- examples/hello_world/BUILD | 2 +- .../src/main/java/com/google/devtools/build/runfiles/BUILD | 3 ++- test/java/private/android_support_tests.bzl | 3 ++- .../testutil/rules/custom_library_with_wrong_plugins_type.bzl | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/examples/hello_world/BUILD b/examples/hello_world/BUILD index 2e951cc2..f8ee9577 100644 --- a/examples/hello_world/BUILD +++ b/examples/hello_world/BUILD @@ -1,4 +1,4 @@ -load("//java:defs.bzl", "java_binary") +load("//java:java_binary.bzl", "java_binary") package(default_applicable_licenses = ["@rules_java//:license"]) diff --git a/java/runfiles/src/main/java/com/google/devtools/build/runfiles/BUILD b/java/runfiles/src/main/java/com/google/devtools/build/runfiles/BUILD index 5b521a9b..11b8ae0f 100644 --- a/java/runfiles/src/main/java/com/google/devtools/build/runfiles/BUILD +++ b/java/runfiles/src/main/java/com/google/devtools/build/runfiles/BUILD @@ -1,4 +1,5 @@ -load("//java:defs.bzl", "java_library", "java_plugin") +load("//java:java_library.bzl", "java_library") +load("//java:java_plugin.bzl", "java_plugin") package(default_applicable_licenses = ["@rules_java//:license"]) diff --git a/test/java/private/android_support_tests.bzl b/test/java/private/android_support_tests.bzl index 95596de2..8f9bea64 100644 --- a/test/java/private/android_support_tests.bzl +++ b/test/java/private/android_support_tests.bzl @@ -15,7 +15,8 @@ load("@rules_testing//lib:analysis_test.bzl", "analysis_test", "test_suite") load("@rules_testing//lib:util.bzl", "util") -load("//java:defs.bzl", "java_library", "java_plugin") +load("//java:java_library.bzl", "java_library") +load("//java:java_plugin.bzl", "java_plugin") load("//java/common:java_info.bzl", "JavaInfo") load("//java/private:android_support.bzl", "android_support") # buildifier: disable=bzl-visibility load("//test/java/testutil:java_info_subject.bzl", "java_info_subject") diff --git a/test/java/testutil/rules/custom_library_with_wrong_plugins_type.bzl b/test/java/testutil/rules/custom_library_with_wrong_plugins_type.bzl index 12535307..dc58cee1 100644 --- a/test/java/testutil/rules/custom_library_with_wrong_plugins_type.bzl +++ b/test/java/testutil/rules/custom_library_with_wrong_plugins_type.bzl @@ -1,6 +1,7 @@ """Custom rule to test java_common.compile(plugins = ...) expects JavaPluginInfo""" -load("//java:defs.bzl", "JavaInfo", "java_common") +load("//java/common:java_common.bzl", "java_common") +load("//java/common:java_info.bzl", "JavaInfo") load("//java/common:java_semantics.bzl", "semantics") def _impl(ctx):