Skip to content

Commit decc3a1

Browse files
authored
1 parent 893eb70 commit decc3a1

7 files changed

Lines changed: 13 additions & 11 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", 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
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
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ if %ERRORLEVEL% neq 0 (
1515

1616
choco install -y openjdk --version=17.0
1717
set PATH=%PATH%;"c:\Program Files\OpenJDK\jdk-17\bin"
18-
set PROTOBUF_VER=35.1
19-
set ABSL_VERSION=20250127.1
18+
set PROTOBUF_VER=36.0
19+
set ABSL_VERSION=20250512.1
2020
set CMAKE_NAME=cmake-3.26.3-windows-x86_64
2121

2222
if not exist "protobuf-%PROTOBUF_VER%\build\Release\" (

‎buildscripts/make_dependencies.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# Build protoc
44
set -evux -o pipefail
55

6-
PROTOBUF_VERSION=35.1
7-
ABSL_VERSION=20250127.1
6+
PROTOBUF_VERSION=36.0
7+
ABSL_VERSION=20250512.1
88

99
# ARCH is x86_64 bit unless otherwise specified.
1010
ARCH="${ARCH:-x86_64}"
@@ -79,6 +79,8 @@ if [ -f ${INSTALL_DIR}/bin/protoc ]; then
7979
else
8080
if [[ ! -d "protobuf-${PROTOBUF_VERSION}" ]]; then
8181
curl -Ls "https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/protobuf-${PROTOBUF_VERSION}.tar.gz" | tar xz
82+
fi
83+
if [[ ! -d "abseil-cpp-${ABSL_VERSION}" ]]; then
8284
curl -Ls "https://github.com/abseil/abseil-cpp/archive/refs/tags/${ABSL_VERSION}.tar.gz" | tar xz
8385
fi
8486
# the same source dir is used for 32 and 64 bit builds, so we need to clean stale data first

‎examples/MODULE.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
bazel_dep(name = "grpc-java", version = "1.85.0-SNAPSHOT", repo_name = "io_grpc_grpc_java") # CURRENT_GRPC_VERSION
22
bazel_dep(name = "rules_java", version = "9.3.0")
33
bazel_dep(name = "grpc-proto", version = "0.0.0-20240627-ec30f58", repo_name = "io_grpc_grpc_proto")
4-
bazel_dep(name = "protobuf", version = "33.1", repo_name = "com_google_protobuf")
4+
bazel_dep(name = "protobuf", version = "36.0", repo_name = "com_google_protobuf")
55
bazel_dep(name = "rules_jvm_external", version = "6.0")
66

77
# Do not use this override in your own MODULE.bazel. It is unnecessary when

‎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 = "399931c793f4ac6db81045b00b06dd07c877b48aeecf36c797f65c541fb533e7",
131+
strip_prefix = "protobuf-36.0",
132+
urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v36.0/protobuf-36.0.tar.gz"],
133133
)
134134

135135
def io_grpc_grpc_proto():

0 commit comments

Comments
 (0)