Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update rules_java 7.11.1 / java_tools 13.8 #23571

Closed
wants to merge 2 commits into from
Closed

Update rules_java 7.11.1 / java_tools 13.8 #23571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
458ad53
Update rules_java 7.11.1 / java_tools 13.8
hvadehra Sep 10, 2024
6f4ecdb
Override `singlejar` during bootstrapping to avoid `remote_java_tools`
hvadehra Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ bazel_dep(name = "blake3", version = "1.5.1.bcr.1")
bazel_dep(name = "sqlite3", version = "3.42.0.bcr.1")
bazel_dep(name = "zlib", version = "1.3.1.bcr.3")
bazel_dep(name = "rules_cc", version = "0.0.9")
bazel_dep(name = "rules_java", version = "7.9.0")
bazel_dep(name = "rules_java", version = "7.11.1")
bazel_dep(name = "rules_graalvm", version = "0.11.1")
bazel_dep(name = "rules_proto", version = "6.0.0")
bazel_dep(name = "rules_jvm_external", version = "6.0")
Expand Down
4 changes: 2 additions & 2 deletions MODULE.bazel.lock
View file
Open in desktop

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

1 change: 1 addition & 0 deletions scripts/bootstrap/BUILD.bootstrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ default_java_toolchain(
"-XX:+TieredCompilation",
"-XX:TieredStopAtLevel=1",
],
oneversion = None, # avoid remote_java_tools dependency
singlejar = ["//src/tools/singlejar:singlejar"],
source_version = "21",
tags = ["manual"],
Expand Down
2 changes: 1 addition & 1 deletion src/MODULE.tools
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ use_repo(buildozer_binary, "buildozer_binary")
# Dependencies used to auto-load removed symbols and rules from Bazel (due to Starlarkification)
# See also: --incompatible_autoload_externally, AutoloadSymbols
bazel_dep(name = "protobuf", version = "3.19.6", repo_name = "com_google_protobuf")
bazel_dep(name = "rules_java", version = "7.9.0")
bazel_dep(name = "rules_java", version = "7.11.1")
bazel_dep(name = "rules_cc", version = "0.0.9")
bazel_dep(name = "rules_python", version = "0.22.1")
# add rules_android
Expand Down
1 change: 1 addition & 0 deletions src/test/shell/bazel/bazel_bootstrap_distfile_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ default_java_toolchain(
jacocorunner = ":dummy.jar",
java_runtime = "@local_jdk//:jdk",
javabuilder = [":dummy.jar"],
oneversion = ":dummy.jar",
singlejar = [":dummy.jar"],
source_version = "${JAVA_VERSION}",
target_version = "${JAVA_VERSION}",
Expand Down
13 changes: 9 additions & 4 deletions src/test/tools/bzlmod/MODULE.bazel.lock
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions workspace_deps.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ WORKSPACE_REPOS = {
"strip_prefix": "rules_cc-0.0.9",
},
"rules_java": {
"archive": "rules_java-7.9.0.tar.gz",
"sha256": "41131de4417de70b9597e6ebd515168ed0ba843a325dc54a81b92d7af9a7b3ea",
"urls": ["https://github.com/bazelbuild/rules_java/releases/download/7.9.0/rules_java-7.9.0.tar.gz"],
"archive": "rules_java-7.11.1.tar.gz",
"sha256": "6f3ce0e9fba979a844faba2d60467843fbf5191d8ca61fa3d2ea17655b56bb8c",
"urls": ["https://github.com/bazelbuild/rules_java/releases/download/7.11.1/rules_java-7.11.1.tar.gz"],
},
# Used in src/test/java/com/google/devtools/build/lib/blackbox/framework/blackbox.WORKSAPCE
"rules_proto": {
Expand Down
Loading