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

[6.4.0] Update rules_java 5.5.1 #19701

Merged
merged 9 commits into from
Oct 5, 2023
Merged

[6.4.0] Update rules_java 5.5.1 #19701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
42a3529
Update rules_java 6.3.2
keertk Oct 2, 2023
1e4ee9a
Update distdir_deps.bzl
keertk Oct 2, 2023
f088e07
Update distdir_deps.bzl
keertk Oct 2, 2023
faf84b3
Update rules_java 5.5.1
keertk Oct 2, 2023
59a39fe
Add back strip_prefix
keertk Oct 4, 2023
0cad9ff
Update distdir_deps.bzl
keertk Oct 4, 2023
a9f0850
Update bazel_rules_java_test.sh
keertk Oct 4, 2023
29d0c05
Merge branch 'release-6.4.0' into rules_java-6.3.2
keertk Oct 4, 2023
0f1a222
Merge branch 'release-6.4.0' into rules_java-6.3.2
keertk Oct 5, 2023
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 @@ -21,7 +21,7 @@ bazel_dep(name = "zlib", version = "1.2.13")

# The following are required when building without WORKSPACE SUFFIX
bazel_dep(name = "rules_cc", version = "0.0.9")
bazel_dep(name = "rules_java", version = "5.5.0")
bazel_dep(name = "rules_java", version = "5.5.1")
bazel_dep(name = "rules_proto", version = "4.0.0")

# TODO(pcloudy): Add remoteapis and googleapis as Bazel modules in the BCR.
Expand Down
9 changes: 4 additions & 5 deletions distdir_deps.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,11 @@ DIST_DEPS = {
],
},
"rules_java": {
"archive": "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip",
"sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598",
"strip_prefix": "rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178",
"archive": "rules_java-5.5.1.tar.gz",
"sha256": "73b88f34dc251bce7bc6c472eb386a6c2b312ed5b473c81fe46855c248f792e0",
"strip_prefix": "",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip",
"https:/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip",
"https:/bazelbuild/rules_java/releases/download/5.5.1/rules_java-5.5.1.tar.gz",
],
"used_in": [
"additional_distfiles",
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
@@ -1,7 +1,7 @@
module(name = "bazel_tools")

bazel_dep(name = "rules_cc", version = "0.0.9")
bazel_dep(name = "rules_java", version = "5.5.0")
bazel_dep(name = "rules_java", version = "5.5.1")
bazel_dep(name = "rules_license", version = "0.0.3")
bazel_dep(name = "rules_proto", version = "4.0.0")
bazel_dep(name = "rules_python", version = "0.4.0")
Expand Down
3 changes: 2 additions & 1 deletion src/test/shell/bazel/bazel_rules_java_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,10 @@ EOF

function test_rules_java_repository_builds_itself() {
write_default_bazelrc
setup_skylib_support

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

Expand Down