From 998614b6b1554428212b97e7174297a527fc6b90 Mon Sep 17 00:00:00 2001 From: Google Java Core Libraries Date: Tue, 16 Apr 2024 02:18:40 -0700 Subject: [PATCH] Add `load()` statements for the Bazel builtin top-level java symbols Loads are being added in preparation for moving the symbols out of Bazel and into `rules_java`. PiperOrigin-RevId: 625252082 --- .bazelversion | 1 + .github/workflows/ci.yml | 2 +- WORKSPACE | 7 +++++++ tools/jarjar/jarjar.bzl | 2 ++ tools/javadoc/javadoc.bzl | 2 ++ 5 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 .bazelversion diff --git a/.bazelversion b/.bazelversion new file mode 100644 index 0000000..04edabd --- /dev/null +++ b/.bazelversion @@ -0,0 +1 @@ +5.4.1 \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ef5f043..ef7cb9e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/WORKSPACE b/WORKSPACE index 640fc8f..745aa08 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -14,6 +14,7 @@ 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() @@ -21,3 +22,9 @@ 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", +) diff --git a/tools/jarjar/jarjar.bzl b/tools/jarjar/jarjar.bzl index 6f5104a..43ebed1 100644 --- a/tools/jarjar/jarjar.bzl +++ b/tools/jarjar/jarjar.bzl @@ -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, diff --git a/tools/javadoc/javadoc.bzl b/tools/javadoc/javadoc.bzl index 5aad342..31abf7a 100644 --- a/tools/javadoc/javadoc.bzl +++ b/tools/javadoc/javadoc.bzl @@ -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