From ff4174008c46c6a0648aad677d187566930b9fa8 Mon Sep 17 00:00:00 2001 From: Simon Mavi Stewart Date: Wed, 12 Jun 2024 17:52:20 +0100 Subject: [PATCH 1/2] Bump bazel to 7.2.0 --- .bazelversion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bazelversion b/.bazelversion index a8a188756826d..0ee843cc60466 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -7.1.2 +7.2.0 From 86d115c97229670cb3da2c26b85d4ddac7a8959c Mon Sep 17 00:00:00 2001 From: Simon Mavi Stewart Date: Wed, 12 Jun 2024 19:35:47 +0100 Subject: [PATCH 2/2] [bazel] Update rulesets we use --- MODULE.bazel | 31 +++++++++++++++++++------------ WORKSPACE | 8 -------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 4694837797677..b206f169464f7 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,24 +1,31 @@ module(name = "selenium") bazel_dep(name = "apple_rules_lint", version = "0.3.2") -bazel_dep(name = "aspect_bazel_lib", version = "2.7.6") -bazel_dep(name = "aspect_rules_esbuild", version = "0.20.0") +bazel_dep(name = "aspect_bazel_lib", version = "2.7.7") +bazel_dep(name = "aspect_rules_esbuild", version = "0.20.1") bazel_dep(name = "aspect_rules_js", version = "1.42.3") -bazel_dep(name = "aspect_rules_ts", version = "2.1.0") -bazel_dep(name = "bazel_features", version = "1.12.0") -bazel_dep(name = "bazel_skylib", version = "1.5.0") +bazel_dep(name = "aspect_rules_ts", version = "2.4.2") +bazel_dep(name = "bazel_features", version = "1.13.0") +bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "buildifier_prebuilt", version = "6.4.0") bazel_dep(name = "contrib_rules_jvm", version = "0.27.0") bazel_dep(name = "platforms", version = "0.0.10") + +# Required for the closure rules +bazel_dep(name = "protobuf", version = "21.7", dev_dependency = True, repo_name = "com_google_protobuf") + +# Required for rules_rust to import the crates properly +bazel_dep(name = "rules_cc", version = "0.0.9", dev_dependency = True) + bazel_dep(name = "rules_dotnet", version = "0.15.1") -bazel_dep(name = "rules_java", version = "7.4.0") +bazel_dep(name = "rules_java", version = "7.6.3") bazel_dep(name = "rules_jvm_external", version = "6.1") -bazel_dep(name = "rules_nodejs", version = "6.0.5") -bazel_dep(name = "rules_oci", version = "1.0.0") -bazel_dep(name = "rules_pkg", version = "0.9.1") -bazel_dep(name = "rules_python", version = "0.31.0") -bazel_dep(name = "rules_proto", version = "5.3.0-21.7") -bazel_dep(name = "rules_ruby", version = "0.8.1") +bazel_dep(name = "rules_nodejs", version = "6.2.0") +bazel_dep(name = "rules_oci", version = "1.7.6") +bazel_dep(name = "rules_pkg", version = "0.10.1") +bazel_dep(name = "rules_python", version = "0.33.0") +bazel_dep(name = "rules_proto", version = "6.0.0") +bazel_dep(name = "rules_ruby", version = "0.11.0") linter = use_extension("@apple_rules_lint//lint:extensions.bzl", "linter") linter.configure( diff --git a/WORKSPACE b/WORKSPACE index 4cf1c70bc3f8f..32f2305a9727f 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -2,14 +2,6 @@ workspace(name = "selenium") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -# This gets us a pre-compiled `protoc` - -load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains") - -rules_proto_dependencies() - -rules_proto_toolchains() - # rules_closure are not published to BCR. http_archive(