Skip to content

Commit beb8a4e

Browse files
authored
chore: update protobuf to v33.2 (#483)
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
1 parent 3d38331 commit beb8a4e

2 files changed

Lines changed: 23 additions & 13 deletions

File tree

WORKSPACE

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,19 @@ load("@proxy_wasm_cpp_host//bazel:dependencies.bzl", "proxy_wasm_cpp_host_depend
88

99
proxy_wasm_cpp_host_dependencies()
1010

11+
# Setup rules_java as required by protobuf 33.2+
12+
# Must be done as direct loads in WORKSPACE (not in a .bzl file) to avoid load-time cycles.
13+
# rules_java_dependencies() creates the @compatibility_proxy repository which is needed by
14+
# rules_java's java_binary and other rules. Loading these in a .bzl file would create a cycle
15+
# because the .bzl load would transitively reference @compatibility_proxy before it exists.
16+
load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
17+
18+
rules_java_dependencies()
19+
20+
load("@rules_java//java:repositories.bzl", "rules_java_toolchains")
21+
22+
rules_java_toolchains()
23+
1124
# Setup bazel_features internal repos (required for aspect_rules_lint)
1225
load("@proxy_wasm_cpp_host//bazel:setup_features.bzl", "setup_bazel_features")
1326

bazel/repositories.bzl

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ def proxy_wasm_cpp_host_repositories():
2222
maybe(
2323
http_archive,
2424
name = "bazel_features",
25-
sha256 = "af3d4fb1cf4f25942cb4a933b1ad93a0ea9fe9ee70c2af7f369fb72a67c266e5",
26-
strip_prefix = "bazel_features-1.21.0",
27-
urls = ["https://github.com/bazel-contrib/bazel_features/releases/download/v1.21.0/bazel_features-v1.21.0.tar.gz"],
25+
sha256 = "c41853e3b636c533b86bf5ab4658064e6cc9db0a3bce52cbff0629e094344ca9",
26+
strip_prefix = "bazel_features-1.33.0",
27+
urls = ["https://github.com/bazel-contrib/bazel_features/releases/download/v1.33.0/bazel_features-v1.33.0.tar.gz"],
2828
)
2929

3030
# Update platforms for crate_universe. Can remove when we update Bazel version.
@@ -147,16 +147,13 @@ def proxy_wasm_cpp_host_repositories():
147147

148148
# Note: we depend on Abseil via rules_fuzzing. Remove this pin when we update that.
149149
#
150-
# This is the latest LTS release, which picks up:
151-
# - Build fix: https://github.com/abseil/abseil-cpp/pull/1187
152-
# - A bugfix found in local fuzzing:
153-
# https://github.com/abseil/abseil-cpp/commit/e7858c73279d81cbc005d9c76a385ab535520635
150+
# This is the latest LTS release (20250512.1), required by protobuf 33.2
154151
maybe(
155152
http_archive,
156153
name = "com_google_absl",
157-
sha256 = "733726b8c3a6d39a4120d7e45ea8b41a434cdacde401cba500f14236c49b39dc",
158-
strip_prefix = "abseil-cpp-20240116.2",
159-
urls = ["https://github.com/abseil/abseil-cpp/archive/20240116.2.tar.gz"],
154+
sha256 = "9b7a064305e9fd94d124ffa6cc358592eb42b5da588fb4e07d09254aa40086db",
155+
strip_prefix = "abseil-cpp-20250512.1",
156+
urls = ["https://github.com/abseil/abseil-cpp/archive/refs/tags/20250512.1.tar.gz"],
160157
)
161158

162159
maybe(
@@ -203,9 +200,9 @@ def proxy_wasm_cpp_host_repositories():
203200
maybe(
204201
http_archive,
205202
name = "com_google_protobuf",
206-
sha256 = "3d32940e975c4ad9b8ba69640e78f5527075bae33ca2890275bf26b853c0962c",
207-
strip_prefix = "protobuf-29.1",
208-
url = "https://github.com/protocolbuffers/protobuf/releases/download/v29.1/protobuf-29.1.tar.gz",
203+
sha256 = "6b6599b54c88d75904b7471f5ca34a725fa0af92e134dd1a32d5b395aa4b4ca8",
204+
strip_prefix = "protobuf-33.2",
205+
url = "https://github.com/protocolbuffers/protobuf/releases/download/v33.2/protobuf-33.2.tar.gz",
209206
repo_mapping = {
210207
"@abseil-cpp": "@com_google_absl",
211208
},

0 commit comments

Comments
 (0)