Skip to content

Commit 624b208

Browse files
benjaminprules_java Copybara
authored andcommitted
avoid loading from defs.bzl (#341)
At least the example should use the preferred load paths. Closes #341 COPYBARA_INTEGRATE_REVIEW=#341 from benjaminp:no-defs 479d18e PiperOrigin-RevId: 853768220 Change-Id: Iee1770d77675a9bfb371894aaac0ac6b67320d09
1 parent aa0345c commit 624b208

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

examples/hello_world/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//java:defs.bzl", "java_binary")
1+
load("//java:java_binary.bzl", "java_binary")
22

33
package(default_applicable_licenses = ["@rules_java//:license"])
44

java/runfiles/src/main/java/com/google/devtools/build/runfiles/BUILD

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
load("//java:defs.bzl", "java_library", "java_plugin")
1+
load("//java:java_library.bzl", "java_library")
2+
load("//java:java_plugin.bzl", "java_plugin")
23

34
package(default_applicable_licenses = ["@rules_java//:license"])
45

test/java/private/android_support_tests.bzl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515

1616
load("@rules_testing//lib:analysis_test.bzl", "analysis_test", "test_suite")
1717
load("@rules_testing//lib:util.bzl", "util")
18-
load("//java:defs.bzl", "java_library", "java_plugin")
18+
load("//java:java_library.bzl", "java_library")
19+
load("//java:java_plugin.bzl", "java_plugin")
1920
load("//java/common:java_info.bzl", "JavaInfo")
2021
load("//java/private:android_support.bzl", "android_support") # buildifier: disable=bzl-visibility
2122
load("//test/java/testutil:java_info_subject.bzl", "java_info_subject")

test/java/testutil/rules/custom_library_with_wrong_plugins_type.bzl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
"""Custom rule to test java_common.compile(plugins = ...) expects JavaPluginInfo"""
22

3-
load("//java:defs.bzl", "JavaInfo", "java_common")
3+
load("//java/common:java_common.bzl", "java_common")
4+
load("//java/common:java_info.bzl", "JavaInfo")
45
load("//java/common:java_semantics.bzl", "semantics")
56

67
def _impl(ctx):

0 commit comments

Comments
 (0)