Upgrade rules_java and remove experimental_google_legacy_api flag

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
pull/18861/head
Protobuf Team Bot 1 month ago committed by Copybara-Service
parent 9a3c096b0c
commit 56219aa08b
  1. 5
      .bazelrc
  2. 2
      .bcr/presubmit.yml
  3. 2
      MODULE.bazel
  4. 5
      ci/common.bazelrc
  5. 4
      examples/.bazelrc
  6. 4
      protobuf_deps.bzl

@ -1,8 +1,7 @@
build --cxxopt=-std=c++17 --host_cxxopt=-std=c++17 build --cxxopt=-std=c++17 --host_cxxopt=-std=c++17
# Needed for java_lite_proto_library, that's using ProguardSpecProvider # TODO: ErrorProne's SelfAssertions are violated in protobuf's test
# Once the provider is ported to Starlark the flag may be removed. build --javacopt=-Xep:SelfAssertion:WARN
common --experimental_google_legacy_api
build:dbg --compilation_mode=dbg build:dbg --compilation_mode=dbg

@ -10,7 +10,6 @@ tasks:
build_flags: build_flags:
- '--host_cxxopt=-std=c++14' - '--host_cxxopt=-std=c++14'
- '--cxxopt=-std=c++14' - '--cxxopt=-std=c++14'
- '--experimental_google_legacy_api'
build_targets: build_targets:
- '@protobuf//:protobuf' - '@protobuf//:protobuf'
- '@protobuf//:protobuf_lite' - '@protobuf//:protobuf_lite'
@ -33,6 +32,5 @@ bcr_test_module:
build_flags: build_flags:
- '--host_cxxopt=-std=c++14' - '--host_cxxopt=-std=c++14'
- '--cxxopt=-std=c++14' - '--cxxopt=-std=c++14'
- '--experimental_google_legacy_api'
build_targets: build_targets:
- "//..." - "//..."

@ -17,7 +17,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.0")
bazel_dep(name = "jsoncpp", version = "1.9.5") bazel_dep(name = "jsoncpp", version = "1.9.5")
bazel_dep(name = "rules_cc", version = "0.0.13") bazel_dep(name = "rules_cc", version = "0.0.13")
bazel_dep(name = "rules_fuzzing", version = "0.5.2") bazel_dep(name = "rules_fuzzing", version = "0.5.2")
bazel_dep(name = "rules_java", version = "7.11.1") bazel_dep(name = "rules_java", version = "7.12.2")
bazel_dep(name = "rules_jvm_external", version = "6.3") bazel_dep(name = "rules_jvm_external", version = "6.3")
bazel_dep(name = "rules_kotlin", version = "1.9.6") bazel_dep(name = "rules_kotlin", version = "1.9.6")
bazel_dep(name = "rules_license", version = "1.0.0") bazel_dep(name = "rules_license", version = "1.0.0")

@ -1,6 +1,5 @@
# Needed for java_lite_proto_library, that's using ProguardSpecProvider # TODO: ErrorProne's SelfAssertions are violated in tests
# TODO: Once the provider is ported to Starlark the flag may be removed. build --javacopt=-Xep:SelfAssertion:WARN
common --experimental_google_legacy_api
build:dbg --compilation_mode=dbg build:dbg --compilation_mode=dbg

@ -1,9 +1,5 @@
common --enable_platform_specific_config common --enable_platform_specific_config
# Needed for java_lite_proto_library, that's using ProguardSpecProvider
# TODO: Once the provider is ported to Starlark the flag may be removed.
common --experimental_google_legacy_api
build:linux --cxxopt=-std=c++14 --host_cxxopt=-std=c++14 build:linux --cxxopt=-std=c++14 --host_cxxopt=-std=c++14
build:macos --cxxopt=-std=c++14 --host_cxxopt=-std=c++14 build:macos --cxxopt=-std=c++14 --host_cxxopt=-std=c++14

@ -100,8 +100,8 @@ def protobuf_deps():
if not native.existing_rule("rules_java"): if not native.existing_rule("rules_java"):
http_archive( http_archive(
name = "rules_java", name = "rules_java",
url = "https://github.com/bazelbuild/rules_java/releases/download/7.11.1/rules_java-7.11.1.tar.gz", url = "https://github.com/bazelbuild/rules_java/releases/download/7.12.2/rules_java-7.12.2.tar.gz",
sha256 = "6f3ce0e9fba979a844faba2d60467843fbf5191d8ca61fa3d2ea17655b56bb8c", sha256 = "a9690bc00c538246880d5c83c233e4deb83fe885f54c21bb445eb8116a180b83",
) )
if not native.existing_rule("rules_shell"): if not native.existing_rule("rules_shell"):

Loading…
Cancel
Save