Skip to content

Commit

Permalink
Partial rollback of commit 70970af.
Browse files Browse the repository at this point in the history
*** Reason for rollback ***

The rules aren't ready to be used with any Bazel version other than HEAD. Unblocks bazelbuild/bazel#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 bazelbuild/bazel#23591

PiperOrigin-RevId: 677675846
Change-Id: Ibfd5d59e1dbfa04b0f0d5117493662d06f40f557
  • Loading branch information
hvadehra authored and rules_java Copybara committed Sep 23, 2024
1 parent 84cd7a3 commit e4d1f09
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 15 deletions.
5 changes: 2 additions & 3 deletions java/java_binary.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -24,4 +22,5 @@ def java_binary(**attrs):
**attrs: Rule attributes
"""

_java_binary(**attrs)
# buildifier: disable=native-java
native.java_binary(**attrs)
5 changes: 2 additions & 3 deletions java/java_import.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -24,4 +22,5 @@ def java_import(**attrs):
**attrs: Rule attributes
"""

_java_import(**attrs)
# buildifier: disable=native-java
native.java_import(**attrs)
5 changes: 2 additions & 3 deletions java/java_library.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -24,4 +22,5 @@ def java_library(**attrs):
**attrs: Rule attributes
"""

_java_library(**attrs)
# buildifier: disable=native-java
native.java_library(**attrs)
5 changes: 2 additions & 3 deletions java/java_plugin.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -24,4 +22,5 @@ def java_plugin(**attrs):
**attrs: Rule attributes
"""

_java_plugin(**attrs)
# buildifier: disable=native-java
native.java_plugin(**attrs)
5 changes: 2 additions & 3 deletions java/java_test.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -24,4 +22,5 @@ def java_test(**attrs):
**attrs: Rule attributes
"""

_java_test(**attrs)
# buildifier: disable=native-java
native.java_test(**attrs)

0 comments on commit e4d1f09

Please sign in to comment.