Partial rollback of commit 70970af9590a49b310312b2d01e85ac4fb72fff7. *** Reason for rollback *** The rules aren't ready to be used with any Bazel version other than HEAD. Unblocks https://github.com/bazelbuild/bazel/pull/23649 *** Original change description *** Switch `rules_java` rule macro redirects from `native.*` to those defined locally Using the rules requires a bazel version that contains all the changes in https://github.com/bazelbuild/bazel/pull/23591 PiperOrigin-RevId: 677675846 Change-Id: Ibfd5d59e1dbfa04b0f0d5117493662d06f40f557
diff --git a/java/java_binary.bzl b/java/java_binary.bzl index 18a3fed..7184ecb 100644 --- a/java/java_binary.bzl +++ b/java/java_binary.bzl
@@ -13,8 +13,6 @@ # limitations under the License. """java_binary rule""" -load("//java/bazel/rules:bazel_java_binary_wrapper.bzl", _java_binary = "java_binary") - def java_binary(**attrs): """Bazel java_binary rule. @@ -24,4 +22,5 @@ **attrs: Rule attributes """ - _java_binary(**attrs) + # buildifier: disable=native-java + native.java_binary(**attrs)
diff --git a/java/java_import.bzl b/java/java_import.bzl index 89f6030..926c37a 100644 --- a/java/java_import.bzl +++ b/java/java_import.bzl
@@ -13,8 +13,6 @@ # limitations under the License. """java_import rule""" -load("//java/bazel/rules:bazel_java_import.bzl", _java_import = "java_import") - def java_import(**attrs): """Bazel java_import rule. @@ -24,4 +22,5 @@ **attrs: Rule attributes """ - _java_import(**attrs) + # buildifier: disable=native-java + native.java_import(**attrs)
diff --git a/java/java_library.bzl b/java/java_library.bzl index 90c7267..9308bbc 100644 --- a/java/java_library.bzl +++ b/java/java_library.bzl
@@ -13,8 +13,6 @@ # limitations under the License. """java_library rule""" -load("//java/bazel/rules:bazel_java_library.bzl", _java_library = "java_library") - def java_library(**attrs): """Bazel java_library rule. @@ -24,4 +22,5 @@ **attrs: Rule attributes """ - _java_library(**attrs) + # buildifier: disable=native-java + native.java_library(**attrs)
diff --git a/java/java_plugin.bzl b/java/java_plugin.bzl index 130dc62..d12e0e1 100644 --- a/java/java_plugin.bzl +++ b/java/java_plugin.bzl
@@ -13,8 +13,6 @@ # limitations under the License. """java_plugin rule""" -load("//java/bazel/rules:bazel_java_plugin.bzl", _java_plugin = "java_plugin") - def java_plugin(**attrs): """Bazel java_plugin rule. @@ -24,4 +22,5 @@ **attrs: Rule attributes """ - _java_plugin(**attrs) + # buildifier: disable=native-java + native.java_plugin(**attrs)
diff --git a/java/java_test.bzl b/java/java_test.bzl index 48a6655..0aeac91 100644 --- a/java/java_test.bzl +++ b/java/java_test.bzl
@@ -13,8 +13,6 @@ # limitations under the License. """java_test rule""" -load("//java/bazel/rules:bazel_java_test.bzl", _java_test = "java_test") - def java_test(**attrs): """Bazel java_test rule. @@ -24,4 +22,5 @@ **attrs: Rule attributes """ - _java_test(**attrs) + # buildifier: disable=native-java + native.java_test(**attrs)