Automated rollback of commit e4d1f09aeb143d20a21008793cb46d4b91c8005c. *** Reason for rollback *** Rollforward of https://github.com/rules_java/bazel/commit/70970af9590a49b310312b2d01e85ac4fb72fff7, Bazel 7.3.2 is released and the rules are usable *** Original change description *** 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: 681344593 Change-Id: Idea53aea2a0569ff6e345edd6a1d1b44722117bf
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 179245e..4338311 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml
@@ -23,15 +23,14 @@ tasks: # TODO: add config for 8.0.0 once released # Bazel 7.x -# TODO: fix versions after 7.4.0 ubuntu2004: name: "Bazel 7.x" - bazel: "9e3fa2a2e98db4aa10918a981325cfa9473e4ed8" + bazel: "7.3.2" build_targets: *build_targets test_targets: *test_targets ubuntu2004_integration: name: "Bazel 7.x Integration" - bazel: "9e3fa2a2e98db4aa10918a981325cfa9473e4ed8" + bazel: "7.3.2" platform: ubuntu2004 working_directory: "test/repo" shell_commands: @@ -42,11 +41,11 @@ - "@rules_java//java/..." macos: name: "Bazel 7.x" - bazel: "9e3fa2a2e98db4aa10918a981325cfa9473e4ed8" + bazel: "7.3.2" build_targets: *build_targets windows: name: "Bazel 7.x" - bazel: "9e3fa2a2e98db4aa10918a981325cfa9473e4ed8" + bazel: "7.3.2" build_targets: *build_targets # Bazel@HEAD ubuntu2004_head:
diff --git a/java/java_binary.bzl b/java/java_binary.bzl index 7184ecb..18a3fed 100644 --- a/java/java_binary.bzl +++ b/java/java_binary.bzl
@@ -13,6 +13,8 @@ # 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. @@ -22,5 +24,4 @@ **attrs: Rule attributes """ - # buildifier: disable=native-java - native.java_binary(**attrs) + _java_binary(**attrs)
diff --git a/java/java_import.bzl b/java/java_import.bzl index 926c37a..89f6030 100644 --- a/java/java_import.bzl +++ b/java/java_import.bzl
@@ -13,6 +13,8 @@ # 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. @@ -22,5 +24,4 @@ **attrs: Rule attributes """ - # buildifier: disable=native-java - native.java_import(**attrs) + _java_import(**attrs)
diff --git a/java/java_library.bzl b/java/java_library.bzl index 9308bbc..90c7267 100644 --- a/java/java_library.bzl +++ b/java/java_library.bzl
@@ -13,6 +13,8 @@ # 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. @@ -22,5 +24,4 @@ **attrs: Rule attributes """ - # buildifier: disable=native-java - native.java_library(**attrs) + _java_library(**attrs)
diff --git a/java/java_plugin.bzl b/java/java_plugin.bzl index d12e0e1..130dc62 100644 --- a/java/java_plugin.bzl +++ b/java/java_plugin.bzl
@@ -13,6 +13,8 @@ # 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. @@ -22,5 +24,4 @@ **attrs: Rule attributes """ - # buildifier: disable=native-java - native.java_plugin(**attrs) + _java_plugin(**attrs)
diff --git a/java/java_test.bzl b/java/java_test.bzl index 0aeac91..48a6655 100644 --- a/java/java_test.bzl +++ b/java/java_test.bzl
@@ -13,6 +13,8 @@ # 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. @@ -22,5 +24,4 @@ **attrs: Rule attributes """ - # buildifier: disable=native-java - native.java_test(**attrs) + _java_test(**attrs)