Skip to content

Commit f25389b

Browse files
Upgrade rules_java and remove experimental_google_legacy_api flag (#18889)
The upgrade of rules_java also upgrades error prone and this resulted in some additional errors reported in Protobuf's tests. Set the flag to report those as warning, but they should be cleaned up eventually. PiperOrigin-RevId: 687070204 Co-authored-by: Protobuf Team Bot <[email protected]>
1 parent 3a78fcc commit f25389b

File tree

5 files changed

+7
-13
lines changed

5 files changed

+7
-13
lines changed

.bazelrc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
build --cxxopt=-std=c++17 --host_cxxopt=-std=c++17
22

3-
# Needed for java_lite_proto_library, that's using ProguardSpecProvider
4-
# Once the provider is ported to Starlark the flag may be removed.
5-
common --experimental_google_legacy_api
3+
# TODO: ErrorProne's SelfAssertions are violated in protobuf's test
4+
build --javacopt=-Xep:SelfAssertion:WARN
65

76
build:dbg --compilation_mode=dbg
87

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ bazel_dep(
4040

4141
bazel_dep(
4242
name = "rules_java",
43-
version = "7.11.1",
43+
version = "7.12.2",
4444
)
4545

4646
bazel_dep(

ci/common.bazelrc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
# Needed for java_lite_proto_library, that's using ProguardSpecProvider
2-
# TODO: Once the provider is ported to Starlark the flag may be removed.
3-
common --experimental_google_legacy_api
1+
# TODO: ErrorProne's SelfAssertions are violated in tests
2+
build --javacopt=-Xep:SelfAssertion:WARN
43

54
build:dbg --compilation_mode=dbg
65

examples/.bazelrc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
common --enable_platform_specific_config
22

3-
# Needed for java_lite_proto_library, that's using ProguardSpecProvider
4-
# TODO: Once the provider is ported to Starlark the flag may be removed.
5-
common --experimental_google_legacy_api
6-
73
build:linux --cxxopt=-std=c++14 --host_cxxopt=-std=c++14
84
build:macos --cxxopt=-std=c++14 --host_cxxopt=-std=c++14
95

protobuf_deps.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ def protobuf_deps():
100100
if not native.existing_rule("rules_java"):
101101
http_archive(
102102
name = "rules_java",
103-
url = "https://github.com/bazelbuild/rules_java/releases/download/7.11.1/rules_java-7.11.1.tar.gz",
104-
sha256 = "6f3ce0e9fba979a844faba2d60467843fbf5191d8ca61fa3d2ea17655b56bb8c",
103+
url = "https://github.com/bazelbuild/rules_java/releases/download/7.12.2/rules_java-7.12.2.tar.gz",
104+
sha256 = "a9690bc00c538246880d5c83c233e4deb83fe885f54c21bb445eb8116a180b83",
105105
)
106106

107107
if not native.existing_rule("rules_shell"):

0 commit comments

Comments
 (0)