Skip to content

Commit c45edc4

Browse files
committed
Update rules_java to 6.0.0
1 parent 375c198 commit c45edc4

File tree

4 files changed

+13
-17
lines changed

4 files changed

+13
-17
lines changed

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ bazel_dep(name = "stardoc", version = "0.5.3", repo_name = "io_bazel_skydoc")
1616
bazel_dep(name = "zstd-jni", version = "1.5.2-3")
1717
bazel_dep(name = "zlib", version = "1.2.13")
1818
bazel_dep(name = "rules_cc", version = "0.0.6")
19-
bazel_dep(name = "rules_java", version = "5.5.0")
19+
bazel_dep(name = "rules_java", version = "6.0.0")
2020
bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
2121
bazel_dep(name = "rules_jvm_external", version = "4.5")
2222
bazel_dep(name = "rules_python", version = "0.19.0")

distdir_deps.bzl

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,17 @@ DIST_DEPS = {
6262
"package_version": "0.0.6",
6363
"strip_prefix": "rules_cc-0.0.6",
6464
},
65-
# TODO(pcloudy): DO NOT SUBMIT: Switch to release version of rules_java
6665
"rules_java": {
67-
"archive": "fe9bd0703e255efcf9a27ee7dfe99aa20e3fb7aa.tar.gz",
68-
"sha256": "103306d728ff723e933c8fb34d09d145c0085bdbf8a804faeb46be67b122ae23",
69-
"strip_prefix": "rules_java-fe9bd0703e255efcf9a27ee7dfe99aa20e3fb7aa",
70-
"urls": [
71-
"https://github.com/meteorcloudy/rules_java/archive/fe9bd0703e255efcf9a27ee7dfe99aa20e3fb7aa.tar.gz",
72-
],
66+
"archive": "rules_java-6.0.0.tar.gz",
67+
"sha256": "469b7f3b580b4fcf8112f4d6d0d5a4ce8e1ad5e21fee67d8e8335d5f8b3debab",
68+
"urls": ["https://github.com/bazelbuild/rules_java/releases/download/6.0.0/rules_java-6.0.0.tar.gz"],
7369
"used_in": [
7470
"additional_distfiles",
7571
],
7672
"license_kinds": [
7773
"@rules_license//licenses/spdx:Apache-2.0",
7874
],
79-
"package_version": "5.4.1",
75+
"package_version": "6.0.0",
8076
},
8177
# Used in src/test/java/com/google/devtools/build/lib/blackbox/framework/blackbox.WORKSAPCE
8278
"rules_proto": {

src/MODULE.tools

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module(name = "bazel_tools")
22

33
bazel_dep(name = "rules_cc", version = "0.0.6")
4-
bazel_dep(name = "rules_java", version = "5.5.0")
4+
bazel_dep(name = "rules_java", version = "6.0.0")
55
bazel_dep(name = "rules_license", version = "0.0.3")
66
bazel_dep(name = "rules_proto", version = "4.0.0")
77
bazel_dep(name = "rules_python", version = "0.4.0")

src/test/shell/bazel/bazel_rules_java_test.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,14 @@ EOF
9090
}
9191

9292
# TODO(pcloudy): Probably don't need to exclude this test if we use a release version of rules_java
93-
# function test_rules_java_repository_builds_itself() {
94-
# write_default_bazelrc
95-
# setup_skylib_support
93+
function test_rules_java_repository_builds_itself() {
94+
write_default_bazelrc
95+
setup_skylib_support
9696

97-
# # We test that a built-in @rules_java repository is buildable.
98-
# bazel build -- @rules_java//... -@rules_java//toolchains/... &> $TEST_log \
99-
# || fail "Build failed unexpectedly"
100-
# }
97+
# We test that a built-in @rules_java repository is buildable.
98+
bazel build -- @rules_java//... -@rules_java//toolchains/... &> $TEST_log \
99+
|| fail "Build failed unexpectedly"
100+
}
101101

102102

103103
function test_experimental_java_library_export_do_not_use() {

0 commit comments

Comments
 (0)