Skip to content

Commit 417c6b8

Browse files
sgowrojicopybara-github
sgowroji
authored and
copybara-github
committed
Wire up oneversion tool in java_tools
* 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
1 parent 4582011 commit 417c6b8

File tree

15 files changed

+447
-64
lines changed

15 files changed

+447
-64
lines changed

‎.bazelci/presubmit.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ tasks:
3030
- "//src/main/starlark/tests/builtins_bzl/..."
3131
- "//src/test/..."
3232
- "//src/tools/execlog/..."
33+
- "//src/tools/one_version/..."
3334
- "//src/tools/singlejar/..."
3435
- "//src/tools/workspacelog/..."
3536
- "//third_party/ijar/..."
@@ -90,6 +91,7 @@ tasks:
9091
- "//src/main/starlark/tests/builtins_bzl/..."
9192
- "//src/test/..."
9293
- "//src/tools/execlog/..."
94+
- "//src/tools/one_version/..."
9395
- "//src/tools/singlejar/..."
9496
- "//src/tools/workspacelog/..."
9597
- "//third_party/ijar/..."
@@ -149,6 +151,7 @@ tasks:
149151
- "//src/main/starlark/tests/builtins_bzl/..."
150152
- "//src/test/..."
151153
- "//src/tools/execlog/..."
154+
- "//src/tools/one_version/..."
152155
- "//src/tools/singlejar/..."
153156
- "//src/tools/workspacelog/..."
154157
- "//third_party/ijar/..."
@@ -183,6 +186,7 @@ tasks:
183186
- "//src/main/starlark/tests/builtins_bzl/..."
184187
- "//src/test/..."
185188
- "//src/tools/execlog/..."
189+
- "//src/tools/one_version/..."
186190
- "//src/tools/singlejar/..."
187191
- "//src/tools/workspacelog/..."
188192
- "//third_party/ijar/..."
@@ -282,6 +286,7 @@ tasks:
282286
- "//src/main/starlark/tests/builtins_bzl/..."
283287
- "//src/test/..."
284288
- "//src/tools/execlog/..."
289+
- "//src/tools/one_version/..."
285290
- "//src/tools/singlejar/..."
286291
- "//src/tools/workspacelog/..."
287292
- "//third_party/ijar/..."
@@ -329,6 +334,7 @@ tasks:
329334
- "//src/test/res/..."
330335
- "//src/test/shell/..."
331336
- "//src/tools/launcher/..."
337+
- "//src/tools/one_version/..."
332338
- "//src/tools/singlejar/..."
333339
- "//third_party/def_parser/..."
334340
- "//tools/android/..."
@@ -405,6 +411,7 @@ tasks:
405411
- "//src/main/starlark/tests/builtins_bzl/..."
406412
- "//src/test/..."
407413
- "//src/tools/execlog/..."
414+
- "//src/tools/one_version/..."
408415
- "//src/tools/singlejar/..."
409416
- "//src/tools/workspacelog/..."
410417
- "//third_party/ijar/..."

‎.bazelrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ build:ubuntu2004 --config=remote_shared
2323
# Alias
2424
build:remote --config=ubuntu2004
2525

26-
build:macos --macos_minimum_os=10.11
26+
build:macos --macos_minimum_os=10.13
2727

2828
# On Windows, we need pywin32 pip package, which doesn't work with the Python hermetic toolchain.
2929
# See https://github.com/bazelbuild/rules_python/issues/1356

‎MODULE.bazel‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
3030
bazel_dep(name = "rules_jvm_external", version = "6.0")
3131
bazel_dep(name = "rules_python", version = "0.28.0")
3232
bazel_dep(name = "rules_testing", version = "0.6.0")
33-
bazel_dep(name = "googletest", version = "1.14.0", repo_name = "com_google_googletest")
33+
bazel_dep(name = "googletest", version = "1.14.0.bcr.1", repo_name = "com_google_googletest")
3434
bazel_dep(name = "with_cfg.bzl", version = "0.2.4")
35-
bazel_dep(name = "abseil-cpp", version = "20230125.1")
35+
bazel_dep(name = "abseil-cpp", version = "20240116.2")
3636

3737
# TODO(fmeum): Remove the dependency on buildozer after Bazel is built with 7.2.0.
3838
bazel_dep(name = "buildozer", version = "7.1.2")

‎MODULE.bazel.lock‎

Lines changed: 131 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/BUILD‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,7 @@ filegroup(
379379
"//src/tools/bzlmod:srcs",
380380
"//src/tools/execlog:srcs",
381381
"//src/tools/launcher:srcs",
382+
"//src/tools/one_version:srcs",
382383
"//src/tools/remote:srcs",
383384
"//src/tools/singlejar:srcs",
384385
"//src/tools/starlark/java/com/google/devtools/starlark/common:srcs",
@@ -443,6 +444,7 @@ genrule(
443444
"//src/java_tools/buildjar:srcs",
444445
"//src/java_tools/junitrunner:srcs",
445446
"//src/java_tools/singlejar:srcs",
447+
"//src/tools/one_version:embedded_java_tools",
446448
"//src/tools/singlejar:embedded_java_tools",
447449
"//third_party/ijar:transitive_sources",
448450
"//third_party/java/jacoco:transitive_sources",
@@ -479,6 +481,7 @@ release_archive(
479481
visibility = ["//src/test/shell/bazel:__pkg__"],
480482
deps = [
481483
":jars_java_tools_zip",
484+
"//src/tools/one_version:one_version_transitive_zip",
482485
"//src/tools/singlejar:singlejar_transitive_zip",
483486
"//third_party/ijar:ijar_transitive_srcs_zip",
484487
"//third_party/java/jacoco:jacoco_jars_zip",
@@ -508,6 +511,7 @@ release_archive(
508511
visibility = ["//src/test/shell/bazel:__pkg__"],
509512
deps = [
510513
":turbine_direct_graal_zip",
514+
"//src/tools/one_version:one_version_deploy_zip",
511515
"//src/tools/singlejar:singlejar_deploy_zip",
512516
"//third_party/ijar:ijar_deploy_zip",
513517
],

0 commit comments

Comments
 (0)