Skip to content

Commit 50c18f1

Browse files
authored
Upgrade to protobuf 33.4 (#12615)
Per https://github.com/protocolbuffers/protobuf/releases ``` okshiva@okshiva-mac2 grpc-java % curl -sL https://github.com/protocolbuffers/protobuf/releases/download/v33.4/protobuf-33.4.tar.gz | shasum -a 256 bc670a4e34992c175137ddda24e76562bb928f849d712a0e3c2fb2e19249bea1 ```
1 parent 7a1c79e commit 50c18f1

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ bazel_dep(name = "bazel_jar_jar", version = "0.1.11.bcr.1")
5050
bazel_dep(name = "bazel_skylib", version = "1.7.1")
5151
bazel_dep(name = "googleapis", version = "0.0.0-20240326-1c8d509c5", repo_name = "com_google_googleapis")
5252
bazel_dep(name = "grpc-proto", version = "0.0.0-20240627-ec30f58.bcr.1", repo_name = "io_grpc_grpc_proto")
53-
bazel_dep(name = "protobuf", version = "33.1", repo_name = "com_google_protobuf")
53+
bazel_dep(name = "protobuf", version = "33.4", repo_name = "com_google_protobuf")
5454
bazel_dep(name = "rules_cc", version = "0.0.9")
5555
bazel_dep(name = "rules_java", version = "9.1.0")
5656
bazel_dep(name = "rules_jvm_external", version = "6.0")

buildscripts/kokoro/windows32.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ cd "%WORKSPACE%"
2525

2626
SET TARGET_ARCH=x86_32
2727
SET FAIL_ON_WARNINGS=true
28-
SET PROTOBUF_VER=33.1
28+
SET PROTOBUF_VER=33.4
2929
SET PKG_CONFIG_PATH=%ESCWORKSPACE%\\grpc-java-helper32\\protobuf-%PROTOBUF_VER%\\build\\protobuf-%PROTOBUF_VER%\\lib\\pkgconfig
3030
SET VC_PROTOBUF_LIBS=/LIBPATH:%ESCWORKSPACE%\\grpc-java-helper32\\protobuf-%PROTOBUF_VER%\\build\\protobuf-%PROTOBUF_VER%\\lib
3131
SET VC_PROTOBUF_INCLUDE=%ESCWORKSPACE%\\grpc-java-helper32\\protobuf-%PROTOBUF_VER%\\build\\protobuf-%PROTOBUF_VER%\\include

buildscripts/kokoro/windows64.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ cd "%WORKSPACE%"
2424

2525
SET TARGET_ARCH=x86_64
2626
SET FAIL_ON_WARNINGS=true
27-
SET PROTOBUF_VER=33.1
27+
SET PROTOBUF_VER=33.4
2828
SET PKG_CONFIG_PATH=%ESCWORKSPACE%\\grpc-java-helper64\\protobuf-%PROTOBUF_VER%\\build\\protobuf-%PROTOBUF_VER%\\lib\\pkgconfig
2929
SET VC_PROTOBUF_LIBS=/LIBPATH:%ESCWORKSPACE%\\grpc-java-helper64\\protobuf-%PROTOBUF_VER%\\build\\protobuf-%PROTOBUF_VER%\\lib
3030
SET VC_PROTOBUF_INCLUDE=%ESCWORKSPACE%\\grpc-java-helper64\\protobuf-%PROTOBUF_VER%\\build\\protobuf-%PROTOBUF_VER%\\include

buildscripts/make_dependencies.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
choco install -y pkgconfiglite
22
choco install -y openjdk --version=17.0
33
set PATH=%PATH%;"c:\Program Files\OpenJDK\jdk-17\bin"
4-
set PROTOBUF_VER=33.1
4+
set PROTOBUF_VER=33.4
55
set ABSL_VERSION=20250127.1
66
set CMAKE_NAME=cmake-3.26.3-windows-x86_64
77

buildscripts/make_dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Build protoc
44
set -evux -o pipefail
55

6-
PROTOBUF_VERSION=33.1
6+
PROTOBUF_VERSION=33.4
77
ABSL_VERSION=20250127.1
88

99
# ARCH is x86_64 bit unless otherwise specified.

repositories.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ def com_google_protobuf():
116116
# This statement defines the @com_google_protobuf repo.
117117
http_archive(
118118
name = "com_google_protobuf",
119-
sha256 = "fda132cb0c86400381c0af1fe98bd0f775cb566cb247cdcc105e344e00acc30e",
120-
strip_prefix = "protobuf-33.1",
121-
urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v33.1/protobuf-33.1.tar.gz"],
119+
sha256 = "bc670a4e34992c175137ddda24e76562bb928f849d712a0e3c2fb2e19249bea1",
120+
strip_prefix = "protobuf-33.4",
121+
urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v33.4/protobuf-33.4.tar.gz"],
122122
)
123123

124124
def io_grpc_grpc_proto():

0 commit comments

Comments
 (0)