Skip to content

Commit

Permalink
Add load() statements for the Bazel builtin top-level java symbols
Browse files Browse the repository at this point in the history
Loads are being added in preparation for moving the symbols out of Bazel and into `rules_java`.

PiperOrigin-RevId: 625252082
  • Loading branch information
java-team-github-bot authored and Google Java Core Libraries committed Apr 16, 2024
1 parent 5a98ecc commit 998614b
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 1 deletion.
1 change: 1 addition & 0 deletions .bazelversion
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5.4.1
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
env:
# Used by bazelisk: https://github.com/bazelbuild/bazelisk
USE_BAZEL_VERSION: '3.7.1'
USE_BAZEL_VERSION: '5.4.1'
steps:
- name: 'Check out repository'
uses: actions/checkout@v2
Expand Down
7 changes: 7 additions & 0 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,17 @@

workspace(name = "google_bazel_common")

load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("//:workspace_defs.bzl", "google_common_workspace_rules")

google_common_workspace_rules()

load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

bazel_skylib_workspace()

http_archive(
name = "rules_java",
url = "https://github.com/bazelbuild/rules_java/releases/download/5.3.5/rules_java-5.3.5.tar.gz",
sha256 = "c73336802d0b4882e40770666ad055212df4ea62cfa6edf9cb0f9d29828a0934",
)
2 changes: 2 additions & 0 deletions tools/jarjar/jarjar.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
"""Skylark rules for jarjar. See https://github.com/pantsbuild/jarjar
"""

load("@rules_java//java:defs.bzl", "java_common")

def _jarjar_library(ctx):
ctx.actions.write(
output = ctx.outputs._rules_file,
Expand Down
2 changes: 2 additions & 0 deletions tools/javadoc/javadoc.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

"""See javadoc_library."""

load("@rules_java//java:defs.bzl", "JavaInfo", "java_common")

def _android_jar(android_api_level):
if android_api_level == -1:
return None
Expand Down

0 comments on commit 998614b

Please sign in to comment.