Merge #395 by ted-xie: Upgrade protobuf + various CI fixups

Closes #395

COPYBARA_INTEGRATE_REVIEW=#395 from ted-xie:test_just_protobuf 4df7e92
PiperOrigin-RevId: 792606003
Change-Id: I0107dd0a96ac7e477154a1ed5fa21dad988eb73b

Author: ted-xie

.bazelci/presubmit.yml

@@ -4,7 +4,7 @@ matrix:
   bazel: [
     7.4.1,
     8.2.1,
-    last_green,
+#    last_green, # Temporarily disable last_green until @bazel_tools//src/main/protobuf issues are fixed.
   ]
   platform: [
     ubuntu2004,
@@ -72,10 +72,10 @@ resource_rules: &resource_rules
     - "//test/rules/resources/..."
   build_flags:
     <<: *rules_flags
-    ? "//rules/flags:manifest_merge_order=legacy"
+    ? "--//rules/flags:manifest_merge_order=legacy"
   test_flags:
     <<: *rules_flags
-    ? "//rules/flags:manifest_merge_order=legacy"
+    ? "--//rules/flags:manifest_merge_order=legacy"
 rules_coverage: &rules_coverage
   coverage_targets:
     - "//test/rules/android_local_test/java/com/..."
@@ -115,18 +115,20 @@ tasks:
     platform: ${{ platform }}
     bazel: ${{ bazel }}
     <<: *rules
-  resource_rules:
-    platform: ${{ platform }}
-    bazel: ${{ bazel }}
-    <<: *resource_rules
+  # TODO(#397): Resource tests need some more debugging.
+  ## resource_rules:
+  ##   platform: ${{ platform }}
+  ##   bazel: ${{ bazel }}
+  ##   <<: *resource_rules
   tools_bzlmod:
     platform: ${{ platform }}
     bazel: ${{ bazel }}
     <<: *tools_bzlmod
-  resource_rules_bzlmod:
-    platform: ${{ platform }}
-    bazel: ${{ bazel }}
-    <<: *resource_rules_bzlmod
+  # TODO(#397): Resource tests need some more debugging.
+  ## resource_rules_bzlmod:
+  ##   platform: ${{ platform }}
+  ##   bazel: ${{ bazel }}
+  ##   <<: *resource_rules_bzlmod
   rules_bzlmod:
     platform: ${{ platform }}
     bazel: ${{ bazel }}

.bazelrc

@@ -7,3 +7,24 @@ common --tool_java_runtime_version=17
 # for bazel@HEAD and rolling releases.
 # https://github.com/bazelbuild/bazel/pull/26119
 common --repositories_without_autoloads=bazel_features_version,bazel_features_globals
+
+# Newer versions of protobuf require downstream transitive projects to set C++ language version flags.
+common:linux --cxxopt=-std=c++17
+common:linux --host_cxxopt=-std=c++17
+common:macos --cxxopt=-std=c++17
+common:macos --host_cxxopt=-std=c++17
+common:windows --cxxopt=/std:c++17
+common:windows --host_cxxopt=/std:c++17
+# Suppress warnings from external repos
+common:linux --per_file_copt=external/.*@-w
+common:linux --host_per_file_copt=external/.*@-w
+common:macos --per_file_copt=external/.*@-w
+common:macos --host_per_file_copt=external/.*@-w
+common:windows --per_file_copt=external/.*@/w
+common:windows --host_per_file_copt=external/.*@/w
+
+# Enable protobuf MSVC support on Windows
+build:windows --define=protobuf_allow_msvc=true
+
+common --enable_platform_specific_config
+

MODULE.bazel

@@ -15,7 +15,7 @@ bazel_dep(name = "stardoc", version = "0.7.2", dev_dependency = True)
 rules_java_toolchains = use_extension("@rules_java//java:extensions.bzl", "toolchains")
 use_repo(rules_java_toolchains, "remote_java_tools")
 
-bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf")
+bazel_dep(name = "protobuf", version = "31.1", repo_name = "com_google_protobuf")
 bazel_dep(name = "rules_jvm_external", version = "6.6")
 bazel_dep(name = "bazel_skylib", version = "1.0.3")
 bazel_dep(name = "rules_robolectric", version = "4.14.1.2", repo_name = "robolectric")
@@ -79,8 +79,8 @@ maven.install(
         # These technically aren't needed, but the protobuf version pulled
         # in by these older deps has compatibility issues with the newer
         # protobuf runtimes.
-        "com.google.protobuf:protobuf-java:4.29.3",
-        "com.google.protobuf:protobuf-java-util:4.29.3",
+        "com.google.protobuf:protobuf-java:4.31.1",
+        "com.google.protobuf:protobuf-java-util:4.31.1",
     ],
     repositories = [
         "https://maven.google.com",
@@ -117,8 +117,8 @@ maven.install(
         "jakarta.inject:jakarta.inject-api:2.0.1",
         "junit:junit:4.13.2",
         "com.beust:jcommander:1.82",
-        "com.google.protobuf:protobuf-java:4.29.3",
-        "com.google.protobuf:protobuf-java-util:4.29.3",
+        "com.google.protobuf:protobuf-java:4.31.1",
+        "com.google.protobuf:protobuf-java-util:4.31.1",
         "com.google.code.findbugs:jsr305:3.0.2",
         "androidx.databinding:databinding-compiler:8.7.0",
         "org.ow2.asm:asm:9.6",

defs.bzl

@@ -57,8 +57,8 @@ def rules_android_workspace():
             # These technically aren't needed, but the protobuf version pulled
             # in by these older deps has compatibility issues with the newer
             # protobuf runtimes.
-            "com.google.protobuf:protobuf-java:4.29.3",
-            "com.google.protobuf:protobuf-java-util:4.29.3",
+            "com.google.protobuf:protobuf-java:4.31.1",
+            "com.google.protobuf:protobuf-java-util:4.31.1",
         ],
         repositories = [
             "https://maven.google.com",
@@ -94,8 +94,8 @@ def rules_android_workspace():
             "jakarta.inject:jakarta.inject-api:2.0.1",
             "junit:junit:4.13.2",
             "com.beust:jcommander:1.82",
-            "com.google.protobuf:protobuf-java:4.29.3",
-            "com.google.protobuf:protobuf-java-util:4.29.3",
+            "com.google.protobuf:protobuf-java:4.31.1",
+            "com.google.protobuf:protobuf-java-util:4.31.1",
             "com.google.code.findbugs:jsr305:3.0.2",
             "androidx.databinding:databinding-compiler:8.7.0",
             "org.ow2.asm:asm:9.6",

examples/basicapp/.bazelrc

@@ -14,3 +14,24 @@ common --tool_java_runtime_version=17
 # for bazel@HEAD and rolling releases.
 # https://github.com/bazelbuild/bazel/pull/26119
 common --repositories_without_autoloads=bazel_features_version,bazel_features_globals
+
+# Newer versions of protobuf require downstream transitive projects to set C++ language version flags.
+common:linux --cxxopt=-std=c++17
+common:linux --host_cxxopt=-std=c++17
+common:macos --cxxopt=-std=c++17
+common:macos --host_cxxopt=-std=c++17
+common:windows --cxxopt=/std:c++17
+common:windows --host_cxxopt=/std:c++17
+# Suppress warnings from external repos
+common:linux --per_file_copt=external/.*@-w
+common:linux --host_per_file_copt=external/.*@-w
+common:macos --per_file_copt=external/.*@-w
+common:macos --host_per_file_copt=external/.*@-w
+common:windows --per_file_copt=external/.*@/w
+common:windows --host_per_file_copt=external/.*@/w
+
+# Enable protobuf MSVC support on Windows
+build:windows --define=protobuf_allow_msvc=true
+
+common --enable_platform_specific_config
+

prereqs.bzl

@@ -55,8 +55,8 @@ def rules_android_prereqs(dev_mode = False):
         url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (RULES_JVM_EXTERNAL_TAG, RULES_JVM_EXTERNAL_TAG),
     )
 
-    PROTOBUF_VERSION = "29.3"
-    PROTOBUF_HASH = "008a11cc56f9b96679b4c285fd05f46d317d685be3ab524b2a310be0fbad987e"
+    PROTOBUF_VERSION = "31.1"
+    PROTOBUF_HASH = "12bfd76d27b9ac3d65c00966901609e020481b9474ef75c7ff4601ac06fa0b82"
     maybe(
         http_archive,
         name = "com_google_protobuf",