Skip to content

Upgrade to protobuf v25.6 #1712

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

Closed
wants to merge 2 commits into from
Closed

Upgrade to protobuf v25.6 #1712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71971b1
Upgrade to `protobuf` v25.6
mbland Mar 6, 2025
3c351f1
Downgrade to `protobuf` v25.5
mbland Mar 6, 2025
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
12 changes: 6 additions & 6 deletions .bazelci/presubmit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.5.0
7.5.0
2 changes: 1 addition & 1 deletion dt_patches/compiler_sources/.bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.5.0
7.5.0
2 changes: 1 addition & 1 deletion dt_patches/test_dt_patches/.bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.5.0
7.5.0
2 changes: 1 addition & 1 deletion dt_patches/test_dt_patches_user_srcjar/.bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.5.0
7.5.0
2 changes: 1 addition & 1 deletion examples/crossbuild/.bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.5.0
7.5.0
2 changes: 1 addition & 1 deletion examples/scala3/.bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.5.0
7.5.0
2 changes: 1 addition & 1 deletion examples/semanticdb/.bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.5.0
7.5.0
2 changes: 1 addition & 1 deletion examples/testing/multi_frameworks_toolchain/.bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.5.0
7.5.0
2 changes: 1 addition & 1 deletion examples/testing/scalatest_repositories/.bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.5.0
7.5.0
2 changes: 1 addition & 1 deletion examples/testing/specs2_junit_repositories/.bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.5.0
7.5.0
15 changes: 7 additions & 8 deletions scala/deps.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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 = "3cf7d5b17c4ff04fe9f038104e9d0cae6da09b8ce271c13e44f8ac69f51e4e0f",
strip_prefix = "protobuf-25.5",
url = "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v25.5.tar.gz",
)

maybe(
Expand Down
2 changes: 1 addition & 1 deletion test/proto_cross_repo_boundary/repo/.bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.5.0
7.5.0
2 changes: 1 addition & 1 deletion test_cross_build/.bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.5.0
7.5.0
2 changes: 1 addition & 1 deletion third_party/test/example_external_workspace/.bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.5.0
7.5.0
2 changes: 1 addition & 1 deletion third_party/test/new_local_repo/.bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.5.0
7.5.0
2 changes: 1 addition & 1 deletion third_party/test/proto/.bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.5.0
7.5.0