Skip to content

Commit 843447e

Browse files
committed
Upgrade to Protobuf 36.0-rc2
Per https://github.com/protocolbuffers/protobuf/releases ``` curl -sL https://github.com/protocolbuffers/protobuf/releases/download/v36.0-rc2/protobuf-36.0-rc2.tar.gz | shasum -a 256 b5647fd809e4dbd6523638287ff667e4df016d464267e2ed4f2e1951bfb092cf ```
1 parent 9ffa1e1 commit 843447e

6 files changed

Lines changed: 8 additions & 8 deletions

File tree

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ bazel_dep(name = "bazel_jar_jar", version = "0.1.11.bcr.1")
5454
bazel_dep(name = "bazel_skylib", version = "1.7.1")
5555
bazel_dep(name = "googleapis", version = "0.0.0-20260514-1dbb1a14", repo_name = "com_google_googleapis")
5656
bazel_dep(name = "grpc-proto", version = "0.0.0-20240627-ec30f58.bcr.1", repo_name = "io_grpc_grpc_proto")
57-
bazel_dep(name = "protobuf", version = "35.1", repo_name = "com_google_protobuf")
57+
bazel_dep(name = "protobuf", version = "36.0-rc2", repo_name = "com_google_protobuf")
5858
bazel_dep(name = "rules_proto", version = "7.1.0")
5959
bazel_dep(name = "rules_android", version = "0.7.3")
6060
bazel_dep(name = "rules_cc", version = "0.0.9")

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=35.1
28+
SET PROTOBUF_VER=36.0-rc2
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=35.1
27+
SET PROTOBUF_VER=36.0-rc2
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 --allow-empty-checksums
22
choco install -y openjdk --version=17.0
33
set PATH=%PATH%;"c:\Program Files\OpenJDK\jdk-17\bin"
4-
set PROTOBUF_VER=35.1
4+
set PROTOBUF_VER=36.0-rc2
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=35.1
6+
PROTOBUF_VERSION=36.0-rc2
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
@@ -127,9 +127,9 @@ def com_google_protobuf():
127127
# This statement defines the @com_google_protobuf repo.
128128
http_archive(
129129
name = "com_google_protobuf",
130-
sha256 = "f0b6838e7522a8da96126d487068c959bc624926368f3024ac8fd03abd0a1ac4",
131-
strip_prefix = "protobuf-35.1",
132-
urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v35.1/protobuf-35.1.tar.gz"],
130+
sha256 = "b5647fd809e4dbd6523638287ff667e4df016d464267e2ed4f2e1951bfb092cf",
131+
strip_prefix = "protobuf-36.0-rc2",
132+
urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v36.0-rc2/protobuf-36.0-rc2.tar.gz"],
133133
)
134134

135135
def io_grpc_grpc_proto():

0 commit comments

Comments
 (0)