diff --git a/MODULE.bazel b/MODULE.bazel index 254416a57b4..02bf668721b 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -54,7 +54,7 @@ bazel_dep(name = "bazel_jar_jar", version = "0.1.11.bcr.1") bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "googleapis", version = "0.0.0-20260514-1dbb1a14", repo_name = "com_google_googleapis") bazel_dep(name = "grpc-proto", version = "0.0.0-20240627-ec30f58.bcr.1", repo_name = "io_grpc_grpc_proto") -bazel_dep(name = "protobuf", version = "35.1", repo_name = "com_google_protobuf") +bazel_dep(name = "protobuf", version = "36.0", repo_name = "com_google_protobuf") bazel_dep(name = "rules_proto", version = "7.1.0") bazel_dep(name = "rules_android", version = "0.7.3") bazel_dep(name = "rules_cc", version = "0.0.9") diff --git a/buildscripts/kokoro/windows32.bat b/buildscripts/kokoro/windows32.bat index 90c74a57f1a..d6618b14a61 100644 --- a/buildscripts/kokoro/windows32.bat +++ b/buildscripts/kokoro/windows32.bat @@ -25,7 +25,7 @@ cd "%WORKSPACE%" SET TARGET_ARCH=x86_32 SET FAIL_ON_WARNINGS=true -SET PROTOBUF_VER=35.1 +SET PROTOBUF_VER=36.0 SET PKG_CONFIG_PATH=%ESCWORKSPACE%\\grpc-java-helper32\\protobuf-%PROTOBUF_VER%\\build\\protobuf-%PROTOBUF_VER%\\lib\\pkgconfig SET VC_PROTOBUF_LIBS=/LIBPATH:%ESCWORKSPACE%\\grpc-java-helper32\\protobuf-%PROTOBUF_VER%\\build\\protobuf-%PROTOBUF_VER%\\lib SET VC_PROTOBUF_INCLUDE=%ESCWORKSPACE%\\grpc-java-helper32\\protobuf-%PROTOBUF_VER%\\build\\protobuf-%PROTOBUF_VER%\\include diff --git a/buildscripts/kokoro/windows64.bat b/buildscripts/kokoro/windows64.bat index dba07807d03..0fc28104994 100644 --- a/buildscripts/kokoro/windows64.bat +++ b/buildscripts/kokoro/windows64.bat @@ -24,7 +24,7 @@ cd "%WORKSPACE%" SET TARGET_ARCH=x86_64 SET FAIL_ON_WARNINGS=true -SET PROTOBUF_VER=35.1 +SET PROTOBUF_VER=36.0 SET PKG_CONFIG_PATH=%ESCWORKSPACE%\\grpc-java-helper64\\protobuf-%PROTOBUF_VER%\\build\\protobuf-%PROTOBUF_VER%\\lib\\pkgconfig SET VC_PROTOBUF_LIBS=/LIBPATH:%ESCWORKSPACE%\\grpc-java-helper64\\protobuf-%PROTOBUF_VER%\\build\\protobuf-%PROTOBUF_VER%\\lib SET VC_PROTOBUF_INCLUDE=%ESCWORKSPACE%\\grpc-java-helper64\\protobuf-%PROTOBUF_VER%\\build\\protobuf-%PROTOBUF_VER%\\include diff --git a/buildscripts/make_dependencies.bat b/buildscripts/make_dependencies.bat index 9a1c85115f9..def5b0dfbba 100644 --- a/buildscripts/make_dependencies.bat +++ b/buildscripts/make_dependencies.bat @@ -15,8 +15,8 @@ if %ERRORLEVEL% neq 0 ( choco install -y openjdk --version=17.0 set PATH=%PATH%;"c:\Program Files\OpenJDK\jdk-17\bin" -set PROTOBUF_VER=35.1 -set ABSL_VERSION=20250127.1 +set PROTOBUF_VER=36.0 +set ABSL_VERSION=20250512.1 set CMAKE_NAME=cmake-3.26.3-windows-x86_64 if not exist "protobuf-%PROTOBUF_VER%\build\Release\" ( diff --git a/buildscripts/make_dependencies.sh b/buildscripts/make_dependencies.sh index 600e2d40a1b..c9f42bbf443 100755 --- a/buildscripts/make_dependencies.sh +++ b/buildscripts/make_dependencies.sh @@ -3,8 +3,8 @@ # Build protoc set -evux -o pipefail -PROTOBUF_VERSION=35.1 -ABSL_VERSION=20250127.1 +PROTOBUF_VERSION=36.0 +ABSL_VERSION=20250512.1 # ARCH is x86_64 bit unless otherwise specified. ARCH="${ARCH:-x86_64}" @@ -79,6 +79,8 @@ if [ -f ${INSTALL_DIR}/bin/protoc ]; then else if [[ ! -d "protobuf-${PROTOBUF_VERSION}" ]]; then curl -Ls "https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/protobuf-${PROTOBUF_VERSION}.tar.gz" | tar xz + fi + if [[ ! -d "abseil-cpp-${ABSL_VERSION}" ]]; then curl -Ls "https://github.com/abseil/abseil-cpp/archive/refs/tags/${ABSL_VERSION}.tar.gz" | tar xz fi # the same source dir is used for 32 and 64 bit builds, so we need to clean stale data first diff --git a/examples/MODULE.bazel b/examples/MODULE.bazel index ded3e6bd35e..d899ef8d07a 100644 --- a/examples/MODULE.bazel +++ b/examples/MODULE.bazel @@ -1,7 +1,7 @@ bazel_dep(name = "grpc-java", version = "1.85.0-SNAPSHOT", repo_name = "io_grpc_grpc_java") # CURRENT_GRPC_VERSION bazel_dep(name = "rules_java", version = "9.3.0") bazel_dep(name = "grpc-proto", version = "0.0.0-20240627-ec30f58", repo_name = "io_grpc_grpc_proto") -bazel_dep(name = "protobuf", version = "33.1", repo_name = "com_google_protobuf") +bazel_dep(name = "protobuf", version = "36.0", repo_name = "com_google_protobuf") bazel_dep(name = "rules_jvm_external", version = "6.0") # Do not use this override in your own MODULE.bazel. It is unnecessary when diff --git a/repositories.bzl b/repositories.bzl index 22bb6cac5b0..a00a0a85f65 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -127,9 +127,9 @@ def com_google_protobuf(): # This statement defines the @com_google_protobuf repo. http_archive( name = "com_google_protobuf", - sha256 = "f0b6838e7522a8da96126d487068c959bc624926368f3024ac8fd03abd0a1ac4", - strip_prefix = "protobuf-35.1", - urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v35.1/protobuf-35.1.tar.gz"], + sha256 = "399931c793f4ac6db81045b00b06dd07c877b48aeecf36c797f65c541fb533e7", + strip_prefix = "protobuf-36.0", + urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v36.0/protobuf-36.0.tar.gz"], ) def io_grpc_grpc_proto():