Skip to content

Commit 707b303

Browse files
committed
Update Bazel configuration and dependencies
Signed-off-by: Matthieu MOREL <[email protected]>
1 parent a6e226f commit 707b303

File tree

7 files changed

+93
-32
lines changed

7 files changed

+93
-32
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.1.0
1+
7.6.1

.gitignore

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# bazel build folders
2-
/bazel-bin
3-
/bazel-grpc-httpjson-transcoding
4-
/bazel-out
5-
/bazel-testlogs
2+
/bazel-*
3+
MODULE.bazel.lock
64

75
# IDE
86
.clwb/

MODULE.bazel

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
module(
2+
name = "grpc-httpjson-transcoding",
3+
version = "",
4+
)
5+
6+
bazel_dep(name = "abseil-cpp", version = "20240116.2", repo_name = "com_google_absl")
7+
bazel_dep(name = "bazel_skylib", version = "1.8.2")
8+
bazel_dep(name = "gazelle", version = "0.45.0", repo_name = "bazel_gazelle")
9+
bazel_dep(name = "google_benchmark", version = "1.8.3", repo_name = "com_google_benchmark")
10+
bazel_dep(name = "googleapis", version = "0.0.0-20250826-a92cee39", repo_name = "com_google_googleapis")
11+
bazel_dep(name = "googleapis-cc", version = "1.0.0")
12+
bazel_dep(name = "googletest", version = "1.14.0", repo_name = "com_google_googletest")
13+
bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "com_github_nlohmann_json")
14+
bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf")
15+
bazel_dep(name = "rules_cc", version = "0.1.1")
16+
bazel_dep(name = "rules_go", version = "0.57.0", repo_name = "io_bazel_rules_go")
17+
bazel_dep(name = "proto-converter", repo_name = "com_google_protoconverter")
18+
19+
git_override(
20+
module_name = "proto-converter",
21+
commit = "2458ed8ea405b47c1960f0b0af211efdf0e057a0",
22+
remote = "https://github.com/mmorel-35/proto-converter.git",
23+
)
24+
25+
bazel_dep(name = "rules_ruby", version = "0.20.1")
26+
bazel_dep(name = "rules_python", version = "1.6.3")
27+
28+
bazel_dep(name = "rules_fuzzing", version = "0.6.0", dev_dependency = True)
29+
30+
switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules")
31+
switched_rules.use_languages(
32+
cc = True,
33+
)
34+
use_repo(switched_rules, "com_google_googleapis_imports")
35+
36+
# -- bazel_dep definitions -- #
37+
38+
http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
39+
# -- use_repo_rule statements -- #
40+
41+
42+
http_archive(
43+
name = "io_bazel_rules_docker",
44+
urls = [
45+
"https://github.com/bazelbuild/rules_docker/releases/download/v0.25.0/rules_docker-v0.25.0.tar.gz"
46+
],
47+
sha256 = "b1e80761a8a8243d03ebca8845e9cc1ba6c82ce7c5179ce2b295cd36f7e394bf",
48+
)
49+
# -- repo definitions -- #

WORKSPACE

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,24 @@ load("@rules_fuzzing//fuzzing:init.bzl", "rules_fuzzing_init")
5252

5353
rules_fuzzing_init()
5454

55+
http_archive(
56+
name = "rules_cc",
57+
urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.1.1/rules_cc-0.1.1.tar.gz"],
58+
sha256 = "712d77868b3152dd618c4d64faaddefcc5965f90f5de6e6dd1d5ddcd0be82d42",
59+
strip_prefix = "rules_cc-0.1.1",
60+
)
61+
62+
http_archive(
63+
name = "rules_proto",
64+
sha256 = "6fb6767d1bef535310547e03247f7518b03487740c11b6c6adb7952033fe1295",
65+
strip_prefix = "rules_proto-6.0.2",
66+
url = "https://github.com/bazelbuild/rules_proto/releases/download/6.0.2/rules_proto-6.0.2.tar.gz",
67+
)
68+
69+
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
70+
71+
rules_proto_dependencies()
72+
5573
protobuf_repositories()
5674

5775
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
@@ -88,10 +106,6 @@ load(
88106
_cc_image_repos()
89107
# END io_bazel_rules_docker
90108

91-
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
92-
93-
rules_proto_toolchains()
94-
95109
load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
96110

97111
switched_rules_by_language(

WORKSPACE.bzlmod

Whitespace-only changes.

perf_benchmark/BUILD

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@
1414
#
1515
################################################################################
1616
#
17-
load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
18-
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
17+
load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
18+
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
1919
load("@io_bazel_rules_docker//cc:image.bzl", "cc_image")
2020
load("@io_bazel_rules_docker//container:container.bzl", "container_push")
21+
load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
2122

2223
cc_proto_library(
2324
name = "benchmark_cc_proto",

repositories.bzl

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,19 @@
1515
################################################################################
1616
#
1717
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
18-
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
1918

20-
def absl_repositories(bind = True):
19+
def absl_repositories():
2120
http_archive(
2221
name = "com_google_absl",
23-
sha256 = "ea1d31db00eb37e607bfda17ffac09064670ddf05da067944c4766f517876390",
24-
strip_prefix = "abseil-cpp-c2435f8342c2d0ed8101cb43adfd605fdc52dca2", # May 04, 2023.
25-
urls = ["https://github.com/abseil/abseil-cpp/archive/c2435f8342c2d0ed8101cb43adfd605fdc52dca2.zip"],
22+
sha256 = "f49929d22751bf70dd61922fb1fd05eb7aec5e7a7f870beece79a6e28f0a06c1",
23+
strip_prefix = "abseil-cpp-4a2c63365eff8823a5221db86ef490e828306f9d", # Abseil LTS 20240116.0
24+
urls = ["https://github.com/abseil/abseil-cpp/archive/4a2c63365eff8823a5221db86ef490e828306f9d.zip"],
2625
)
2726

28-
PROTOBUF_COMMIT = "315ffb5be89460f2857387d20aefc59b76b8bdc3" # May 31, 2023
29-
PROTOBUF_SHA256 = "aa61db6ff113a1c76eac9408144c6e996c5e2d6b2410818fd7f1b0d222a50bf8"
27+
PROTOBUF_COMMIT = "b407e8416e3893036aee5af9a12bd9b6a0e2b2e6" # v29.3: Oct 2, 2025
28+
PROTOBUF_SHA256 = "55912546338433f465a552e9ef09930c63b9eb697053937416890cff83a8622d"
3029

31-
def protobuf_repositories(bind = True):
30+
def protobuf_repositories():
3231
http_archive(
3332
name = "com_google_protobuf",
3433
strip_prefix = "protobuf-" + PROTOBUF_COMMIT,
@@ -41,37 +40,37 @@ def protobuf_repositories(bind = True):
4140
GOOGLETEST_COMMIT = "f8d7d77c06936315286eb55f8de22cd23c188571" # v1.14.0: Aug 2, 2023
4241
GOOGLETEST_SHA256 = "7ff5db23de232a39cbb5c9f5143c355885e30ac596161a6b9fc50c4538bfbf01"
4342

44-
def googletest_repositories(bind = True):
43+
def googletest_repositories():
4544
http_archive(
4645
name = "com_google_googletest",
4746
strip_prefix = "googletest-" + GOOGLETEST_COMMIT,
4847
url = "https://github.com/google/googletest/archive/" + GOOGLETEST_COMMIT + ".tar.gz",
4948
sha256 = GOOGLETEST_SHA256,
5049
)
5150

52-
GOOGLEAPIS_COMMIT = "1d5522ad1056f16a6d593b8f3038d831e64daeea" # Sept 03, 2020
53-
GOOGLEAPIS_SHA256 = "cd13e547cffaad217c942084fd5ae0985a293d0cce3e788c20796e5e2ea54758"
51+
GOOGLEAPIS_COMMIT = "a92cee399e0fc8afa2d460373b1085f543bc8d3f" # Aug 26, 2025
52+
GOOGLEAPIS_SHA256 = "468056c3244b7a4f6a575a135b6b6dde280a3f219203a01c4a09d0cf504a4ba6"
5453

55-
def googleapis_repositories(bind = True):
54+
def googleapis_repositories():
5655
http_archive(
5756
name = "com_google_googleapis",
5857
strip_prefix = "googleapis-" + GOOGLEAPIS_COMMIT,
5958
url = "https://github.com/googleapis/googleapis/archive/" + GOOGLEAPIS_COMMIT + ".tar.gz",
6059
sha256 = GOOGLEAPIS_SHA256,
6160
)
6261

63-
GOOGLEBENCHMARK_COMMIT = "1.7.0" # Jul 25, 2022
64-
GOOGLEBENCHMARK_SHA256 = "3aff99169fa8bdee356eaa1f691e835a6e57b1efeadb8a0f9f228531158246ac"
62+
GOOGLEBENCHMARK_COMMIT = "1.8.3" # Jan 11, 2024
63+
GOOGLEBENCHMARK_SHA256 = "6bc180a57d23d4d9515519f92b0c83d61b05b5bab188961f36ac7b06b0d9e9ce"
6564

66-
def googlebenchmark_repositories(bind = True):
65+
def googlebenchmark_repositories():
6766
http_archive(
6867
name = "com_google_benchmark",
6968
strip_prefix = "benchmark-" + GOOGLEBENCHMARK_COMMIT,
7069
url = "https://github.com/google/benchmark/archive/v" + GOOGLEBENCHMARK_COMMIT + ".tar.gz",
7170
sha256 = GOOGLEBENCHMARK_SHA256,
7271
)
7372

74-
def nlohmannjson_repositories(bind = True):
73+
def nlohmannjson_repositories():
7574
http_archive(
7675
name = "com_github_nlohmann_json",
7776
strip_prefix = "json-3.11.3",
@@ -82,17 +81,17 @@ def nlohmannjson_repositories(bind = True):
8281
RULES_DOCKER_COMMIT = "0.25.0" # Jun 22, 2022
8382
RULES_DOCKER_SHA256 = "b1e80761a8a8243d03ebca8845e9cc1ba6c82ce7c5179ce2b295cd36f7e394bf"
8483

85-
def io_bazel_rules_docker(bind = True):
84+
def io_bazel_rules_docker():
8685
http_archive(
8786
name = "io_bazel_rules_docker",
8887
sha256 = RULES_DOCKER_SHA256,
8988
urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v" + RULES_DOCKER_COMMIT + "/rules_docker-v" + RULES_DOCKER_COMMIT + ".tar.gz"],
9089
)
9190

92-
def protoconverter_repositories(bind = True):
91+
def protoconverter_repositories():
9392
http_archive(
9493
name = "com_google_protoconverter",
95-
sha256 = "6081836fa3838ebb1aa15089a5c3e20f877a0244c7a39b92a2000efb40408dcb",
96-
strip_prefix = "proto-converter-d77ff301f48bf2e7a0f8935315e847c1a8e00017",
97-
urls = ["https://github.com/grpc-ecosystem/proto-converter/archive/d77ff301f48bf2e7a0f8935315e847c1a8e00017.zip"],
94+
sha256 = "17c49df769dcd505a57fc99136075f1a1f8418ab03914faf7af692772ce54d54",
95+
strip_prefix = "proto-converter-2458ed8ea405b47c1960f0b0af211efdf0e057a0",
96+
urls = ["https://github.com/mmorel-35/proto-converter/archive/2458ed8ea405b47c1960f0b0af211efdf0e057a0.zip"],
9897
)

0 commit comments

Comments
 (0)