Skip to content

Commit 669c4c3

Browse files
committed
buildscripts: sync Abseil version to 20250512.1 and protobuf in examples/MODULE.bazel
1 parent a0bc789 commit 669c4c3

3 files changed

Lines changed: 10 additions & 4 deletions

File tree

buildscripts/make_dependencies.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ 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"
44
set PROTOBUF_VER=36.0-rc2
5-
set ABSL_VERSION=20250127.1
5+
set ABSL_VERSION=20250512.1
66
set CMAKE_NAME=cmake-3.26.3-windows-x86_64
77

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

buildscripts/make_dependencies.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
set -evux -o pipefail
55

66
PROTOBUF_VERSION=36.0-rc2
7-
ABSL_VERSION=20250127.1
7+
ABSL_VERSION=20250512.1
88

99
# ARCH is x86_64 bit unless otherwise specified.
1010
ARCH="${ARCH:-x86_64}"
@@ -77,7 +77,7 @@ if [ -f ${INSTALL_DIR}/bin/protoc ]; then
7777
echo "Not building protobuf. Already built"
7878
# TODO(ejona): swap to `brew install --devel protobuf` once it is up-to-date
7979
else
80-
if [[ ! -d "protobuf-${PROTOBUF_VERSION}" ]]; then
80+
if [[ ! -d "protobuf-${PROTOBUF_VERSION}" || ! -d "abseil-cpp-${ABSL_VERSION}" ]]; then
8181
curl -Ls "https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/protobuf-${PROTOBUF_VERSION}.tar.gz" | tar xz
8282
curl -Ls "https://github.com/abseil/abseil-cpp/archive/refs/tags/${ABSL_VERSION}.tar.gz" | tar xz
8383
fi

examples/MODULE.bazel

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
bazel_dep(name = "grpc-java", version = "1.84.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-rc2", repo_name = "com_google_protobuf")
5+
archive_override(
6+
module_name = "protobuf",
7+
integrity = "sha256-tWR/2Ank29ZSNjgof/Zn5N8BbUZCZ+LtTy4ZUb+wks8=",
8+
strip_prefix = "protobuf-36.0-rc2",
9+
urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v36.0-rc2/protobuf-36.0-rc2.tar.gz"],
10+
)
511
bazel_dep(name = "rules_jvm_external", version = "6.0")
612

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

0 commit comments

Comments
 (0)