Upgrade to protobuf v25.6

Updates the `protobuf` version to one that's still compatible with Bazel 6.5.0 and 7.5.0 without updating `scalapb`. Broken out from bazelbuild#1710, and part of bazelbuild#1482 and bazelbuild#1652. Like bazelbuild#1711, updates `.bazelversion` files to 7.5.0 and the CI builds in `.bazelci/presubmit.yml` to use Bazel 7.5.0. Unlike bazelbuild#1711, contains only these updates: - `abseil-cpp`: 20220623.1 => 20250127.0 - `protobuf`: v21.7 => v25.6 This change aims make bazelbuild#1710 smaller and more focused, and should ultimately make that pull request smaller and/or easier to review. Specifically, this is an attempt to see whether MSVC will build successfully with `protobuf` v25.6. If it doesn't, I will update this change to include the protocol compiler toolchainization changes from bazelbuild#1710.
mbland · Mar 6, 2025 · 71971b1 · 71971b1
1 parent eadc090
commit 71971b1
Show file tree

Hide file tree

Showing 17 changed files with 28 additions and 29 deletions.
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -53,16 +53,16 @@ tasks:
     - "set PATH=/usr/bin;%PATH%" #Make sure bash uses msys commands over windows commands. (i.e. find).
     - "bash -lc \"pacman --noconfirm --needed -S libxml2\"" #tests require xmllint
     - "bash test_rules_scala.sh"
-  test_coverage_linux_6_5_0:
+  test_coverage_linux_7_5_0:
     name: "./test_coverage"
     platform: ubuntu2004
-    bazel: 6.5.0
+    bazel: 7.5.0
     shell_commands:
       - "./test_coverage.sh"
-  test_coverage_macos_6.5.0:
+  test_coverage_macos_7.5.0:
     name: "./test_coverage"
     platform: macos
-    bazel: 6.5.0
+    bazel: 7.5.0
     shell_commands:
       - "./test_coverage.sh"
   test_reproducibility_linux:
@@ -93,13 +93,13 @@ tasks:
   examples_linux:
     name: "./test_examples"
     platform: ubuntu2004
-    bazel: 6.5.0
+    bazel: 7.5.0
     shell_commands:
       - "./test_examples.sh"
   cross_build_linux:
     name: "./test_cross_build"
     platform: ubuntu2004
-    bazel: 6.5.0
+    bazel: 7.5.0
     shell_commands:
       - "./test_cross_build.sh"
   lint_linux:

diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-6.5.0
+7.5.0
diff --git a/dt_patches/compiler_sources/.bazelversion b/dt_patches/compiler_sources/.bazelversion
@@ -1 +1 @@
-6.5.0
+7.5.0
diff --git a/dt_patches/test_dt_patches/.bazelversion b/dt_patches/test_dt_patches/.bazelversion
@@ -1 +1 @@
-6.5.0
+7.5.0
diff --git a/dt_patches/test_dt_patches_user_srcjar/.bazelversion b/dt_patches/test_dt_patches_user_srcjar/.bazelversion
@@ -1 +1 @@
-6.5.0
+7.5.0
diff --git a/examples/crossbuild/.bazelversion b/examples/crossbuild/.bazelversion
@@ -1 +1 @@
-6.5.0
+7.5.0
diff --git a/examples/scala3/.bazelversion b/examples/scala3/.bazelversion
@@ -1 +1 @@
-6.5.0
+7.5.0
diff --git a/examples/semanticdb/.bazelversion b/examples/semanticdb/.bazelversion
@@ -1 +1 @@
-6.5.0
+7.5.0
diff --git a/examples/testing/multi_frameworks_toolchain/.bazelversion b/examples/testing/multi_frameworks_toolchain/.bazelversion
@@ -1 +1 @@
-6.5.0
+7.5.0
diff --git a/examples/testing/scalatest_repositories/.bazelversion b/examples/testing/scalatest_repositories/.bazelversion
@@ -1 +1 @@
-6.5.0
+7.5.0
diff --git a/examples/testing/specs2_junit_repositories/.bazelversion b/examples/testing/specs2_junit_repositories/.bazelversion
@@ -1 +1 @@
-6.5.0
+7.5.0
diff --git a/scala/deps.bzl b/scala/deps.bzl
@@ -23,13 +23,12 @@ def rules_scala_dependencies():
         strip_prefix = "rules_cc-0.0.9",
     )
 
-    # Needed by protobuf-21.7 and Bazel 6.5.0, as later versions require C++14.
     maybe(
         http_archive,
-        name = "com_google_absl",
-        sha256 = "91ac87d30cc6d79f9ab974c51874a704de9c2647c40f6932597329a282217ba8",
-        strip_prefix = "abseil-cpp-20220623.1",
-        url = "https://github.com/abseil/abseil-cpp/archive/refs/tags/20220623.1.tar.gz",
+        name = "abseil-cpp",
+        sha256 = "16242f394245627e508ec6bb296b433c90f8d914f73b9c026fddb905e27276e8",
+        strip_prefix = "abseil-cpp-20250127.0",
+        url = "https://github.com/abseil/abseil-cpp/archive/refs/tags/20250127.0.tar.gz",
     )
 
     maybe(
@@ -44,9 +43,9 @@ def rules_scala_dependencies():
     maybe(
         http_archive,
         name = "com_google_protobuf",
-        sha256 = "75be42bd736f4df6d702a0e4e4d30de9ee40eac024c4b845d17ae4cc831fe4ae",
-        strip_prefix = "protobuf-21.7",
-        url = "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v21.7.tar.gz",
+        sha256 = "ecfeb9f673e63321b4871c1cee6b5adeb0ef711d08a0c5bb1945271767df65bf",
+        strip_prefix = "protobuf-25.6",
+        url = "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v25.6.tar.gz",
     )
 
     maybe(

diff --git a/test/proto_cross_repo_boundary/repo/.bazelversion b/test/proto_cross_repo_boundary/repo/.bazelversion
@@ -1 +1 @@
-6.5.0
+7.5.0
diff --git a/test_cross_build/.bazelversion b/test_cross_build/.bazelversion
@@ -1 +1 @@
-6.5.0
+7.5.0
diff --git a/third_party/test/example_external_workspace/.bazelversion b/third_party/test/example_external_workspace/.bazelversion
@@ -1 +1 @@
-6.5.0
+7.5.0
diff --git a/third_party/test/new_local_repo/.bazelversion b/third_party/test/new_local_repo/.bazelversion
@@ -1 +1 @@
-6.5.0
+7.5.0
diff --git a/third_party/test/proto/.bazelversion b/third_party/test/proto/.bazelversion
@@ -1 +1 @@
-6.5.0
+7.5.0