Skip to content

Commit

Permalink
Wire up oneversion tool in java_tools
Browse files Browse the repository at this point in the history
* Add a prebuilt `one_version` tool as well as sources to `java_tools`.
* Avoid passing `--whitelist` to `one_version` if no allowlist is configured in the toolchain as it isn't supported by the Bazel version of `oneversion` yet.
* Document the `one_version` flags.
* Clean up tests not updated after recent rules_java releases.

Work towards #1071

Closes #22246.

PiperOrigin-RevId: 640177996
Change-Id: I0323154274bf2127a023184a67485783aa868461
  • Loading branch information
sgowroji authored and Copybara-Service committed Jun 4, 2024
1 parent 4582011 commit 417c6b8
Show file tree
Hide file tree
Showing 15 changed files with 447 additions and 64 deletions.
7 changes: 7 additions & 0 deletions .bazelci/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ tasks:
- "//src/main/starlark/tests/builtins_bzl/..."
- "//src/test/..."
- "//src/tools/execlog/..."
- "//src/tools/one_version/..."
- "//src/tools/singlejar/..."
- "//src/tools/workspacelog/..."
- "//third_party/ijar/..."
Expand Down Expand Up @@ -90,6 +91,7 @@ tasks:
- "//src/main/starlark/tests/builtins_bzl/..."
- "//src/test/..."
- "//src/tools/execlog/..."
- "//src/tools/one_version/..."
- "//src/tools/singlejar/..."
- "//src/tools/workspacelog/..."
- "//third_party/ijar/..."
Expand Down Expand Up @@ -149,6 +151,7 @@ tasks:
- "//src/main/starlark/tests/builtins_bzl/..."
- "//src/test/..."
- "//src/tools/execlog/..."
- "//src/tools/one_version/..."
- "//src/tools/singlejar/..."
- "//src/tools/workspacelog/..."
- "//third_party/ijar/..."
Expand Down Expand Up @@ -183,6 +186,7 @@ tasks:
- "//src/main/starlark/tests/builtins_bzl/..."
- "//src/test/..."
- "//src/tools/execlog/..."
- "//src/tools/one_version/..."
- "//src/tools/singlejar/..."
- "//src/tools/workspacelog/..."
- "//third_party/ijar/..."
Expand Down Expand Up @@ -282,6 +286,7 @@ tasks:
- "//src/main/starlark/tests/builtins_bzl/..."
- "//src/test/..."
- "//src/tools/execlog/..."
- "//src/tools/one_version/..."
- "//src/tools/singlejar/..."
- "//src/tools/workspacelog/..."
- "//third_party/ijar/..."
Expand Down Expand Up @@ -329,6 +334,7 @@ tasks:
- "//src/test/res/..."
- "//src/test/shell/..."
- "//src/tools/launcher/..."
- "//src/tools/one_version/..."
- "//src/tools/singlejar/..."
- "//third_party/def_parser/..."
- "//tools/android/..."
Expand Down Expand Up @@ -405,6 +411,7 @@ tasks:
- "//src/main/starlark/tests/builtins_bzl/..."
- "//src/test/..."
- "//src/tools/execlog/..."
- "//src/tools/one_version/..."
- "//src/tools/singlejar/..."
- "//src/tools/workspacelog/..."
- "//third_party/ijar/..."
Expand Down
2 changes: 1 addition & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ build:ubuntu2004 --config=remote_shared
# Alias
build:remote --config=ubuntu2004

build:macos --macos_minimum_os=10.11
build:macos --macos_minimum_os=10.13

# On Windows, we need pywin32 pip package, which doesn't work with the Python hermetic toolchain.
# See https://github.com/bazelbuild/rules_python/issues/1356
Expand Down
4 changes: 2 additions & 2 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
bazel_dep(name = "rules_jvm_external", version = "6.0")
bazel_dep(name = "rules_python", version = "0.28.0")
bazel_dep(name = "rules_testing", version = "0.6.0")
bazel_dep(name = "googletest", version = "1.14.0", repo_name = "com_google_googletest")
bazel_dep(name = "googletest", version = "1.14.0.bcr.1", repo_name = "com_google_googletest")
bazel_dep(name = "with_cfg.bzl", version = "0.2.4")
bazel_dep(name = "abseil-cpp", version = "20230125.1")
bazel_dep(name = "abseil-cpp", version = "20240116.2")

# TODO(fmeum): Remove the dependency on buildozer after Bazel is built with 7.2.0.
bazel_dep(name = "buildozer", version = "7.1.2")
Expand Down
164 changes: 131 additions & 33 deletions MODULE.bazel.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions src/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,7 @@ filegroup(
"//src/tools/bzlmod:srcs",
"//src/tools/execlog:srcs",
"//src/tools/launcher:srcs",
"//src/tools/one_version:srcs",
"//src/tools/remote:srcs",
"//src/tools/singlejar:srcs",
"//src/tools/starlark/java/com/google/devtools/starlark/common:srcs",
Expand Down Expand Up @@ -443,6 +444,7 @@ genrule(
"//src/java_tools/buildjar:srcs",
"//src/java_tools/junitrunner:srcs",
"//src/java_tools/singlejar:srcs",
"//src/tools/one_version:embedded_java_tools",
"//src/tools/singlejar:embedded_java_tools",
"//third_party/ijar:transitive_sources",
"//third_party/java/jacoco:transitive_sources",
Expand Down Expand Up @@ -479,6 +481,7 @@ release_archive(
visibility = ["//src/test/shell/bazel:__pkg__"],
deps = [
":jars_java_tools_zip",
"//src/tools/one_version:one_version_transitive_zip",
"//src/tools/singlejar:singlejar_transitive_zip",
"//third_party/ijar:ijar_transitive_srcs_zip",
"//third_party/java/jacoco:jacoco_jars_zip",
Expand Down Expand Up @@ -508,6 +511,7 @@ release_archive(
visibility = ["//src/test/shell/bazel:__pkg__"],
deps = [
":turbine_direct_graal_zip",
"//src/tools/one_version:one_version_deploy_zip",
"//src/tools/singlejar:singlejar_deploy_zip",
"//third_party/ijar:ijar_deploy_zip",
],
Expand Down
Loading

0 comments on commit 417c6b8

Please sign in to comment.