Skip to content

Commit 2722e29

Browse files
committed
try to use protobuf 29 in workspace for bazel 9
1 parent c500a69 commit 2722e29

File tree

5 files changed

+29
-17
lines changed

5 files changed

+29
-17
lines changed

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ bazel_dep(name = "rules_cc", version = "0.0.14")
1010
bazel_dep(name = "platforms", version = "0.0.4")
1111

1212
# Those are loaded only when using py_proto_library
13-
bazel_dep(name = "rules_proto", version = "6.0.2")
13+
bazel_dep(name = "rules_proto", version = "7.0.2")
1414
bazel_dep(name = "protobuf", version = "29.0-rc2", repo_name = "com_google_protobuf")
1515

1616
internal_deps = use_extension("//python/private:internal_deps.bzl", "internal_deps")

examples/bzlmod/MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ local_path_override(
1212
)
1313

1414
# (py_proto_library specific) We are using rules_proto to define rules_proto targets to be consumed by py_proto_library.
15-
bazel_dep(name = "rules_proto", version = "6.0.0-rc1")
15+
bazel_dep(name = "rules_proto", version = "6.0.2")
1616

1717
# (py_proto_library specific) Add the protobuf library for well-known types (e.g. `Any`, `Timestamp`, etc)
1818
bazel_dep(name = "protobuf", version = "27.0", repo_name = "com_google_protobuf")

internal_deps.bzl

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -234,13 +234,6 @@ def rules_python_internal_deps():
234234
sha256 = "0e124567fa85287874eff33a791c3bbdcc5343329a56faa828ef624380d4607c",
235235
url = "https://github.com/keith/rules_multirun/releases/download/0.9.0/rules_multirun.0.9.0.tar.gz",
236236
)
237-
# Needed by rules_cc, triggered by @rules_java_builtins from Bazel
238-
http_archive(
239-
name = "protobuf",
240-
sha256 = "da288bf1daa6c04d03a9051781caa52aceb9163586bff9aa6cfb12f69b9395aa",
241-
strip_prefix = "protobuf-27.0",
242-
url = "https://github.com/protocolbuffers/protobuf/releases/download/v27.0/protobuf-27.0.tar.gz",
243-
)
244237

245238
# Needed by rules_cc, triggered by @rules_java_builtins from Bazel
246239
http_archive(

python/private/py_repositories.bzl

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,6 @@ def py_repositories():
6060
urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.0.13/rules_cc-0.0.13.tar.gz"],
6161
)
6262

63-
# Needed by rules_cc, triggerred by @rules_java_prebuilt in Bazel by using @rules_cc//cc:defs.bzl
64-
http_archive(
65-
name = "protobuf",
66-
sha256 = "da288bf1daa6c04d03a9051781caa52aceb9163586bff9aa6cfb12f69b9395aa",
67-
strip_prefix = "protobuf-27.0",
68-
url = "https://github.com/protocolbuffers/protobuf/releases/download/v27.0/protobuf-27.0.tar.gz",
69-
)
70-
7163
# Needed by rules_cc, triggerred by @rules_java_prebuilt in Bazel by using @rules_cc//cc:defs.bzl
7264
http_archive(
7365
name = "protobuf",

tests/integration/py_cc_toolchain_registered/WORKSPACE

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,35 @@
1+
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
2+
13
local_repository(
24
name = "rules_python",
35
path = "../../..",
46
)
57

8+
http_archive(
9+
name = "proto_bazel_features",
10+
sha256 = "d7787da289a7fb497352211ad200ec9f698822a9e0757a4976fd9f713ff372b3",
11+
strip_prefix = "bazel_features-1.9.1",
12+
url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.9.1/bazel_features-v1.9.1.tar.gz",
13+
)
14+
15+
http_archive(
16+
name = "com_google_protobuf",
17+
##sha256 = "da288bf1daa6c04d03a9051781caa52aceb9163586bff9aa6cfb12f69b9395aa",
18+
strip_prefix = "protobuf-29.0-rc2",
19+
urls = [
20+
"https://github.com/protocolbuffers/protobuf/releases/download/v29.0-rc2/protobuf-29.0-rc2.tar.gz",
21+
],
22+
)
23+
24+
http_archive(
25+
name = "protobuf",
26+
##sha256 = "da288bf1daa6c04d03a9051781caa52aceb9163586bff9aa6cfb12f69b9395aa",
27+
strip_prefix = "protobuf-29.0-rc2",
28+
urls = [
29+
"https://github.com/protocolbuffers/protobuf/releases/download/v29.0-rc2/protobuf-29.0-rc2.tar.gz",
30+
],
31+
)
32+
633
load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains")
734

835
py_repositories()

0 commit comments

Comments
 (0)