Skip to content

Commit 259fc2e

Browse files
authored
Merge branch 'trunk' into pinned-browser-updates
2 parents af1b5c8 + 35ae2bb commit 259fc2e

File tree

3 files changed

+20
-39
lines changed

3 files changed

+20
-39
lines changed

MODULE.bazel

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
module(name = "selenium")
22

33
bazel_dep(name = "apple_rules_lint", version = "0.4.0")
4-
bazel_dep(name = "aspect_bazel_lib", version = "2.13.0")
4+
bazel_dep(name = "aspect_bazel_lib", version = "2.14.0")
55
bazel_dep(name = "aspect_rules_esbuild", version = "0.21.0")
66
bazel_dep(name = "aspect_rules_js", version = "2.3.7")
77
bazel_dep(name = "aspect_rules_ts", version = "3.6.0")
8-
bazel_dep(name = "bazel_features", version = "1.23.0")
9-
bazel_dep(name = "bazel_skylib", version = "1.7.1")
10-
bazel_dep(name = "buildifier_prebuilt", version = "6.4.0")
8+
bazel_dep(name = "bazel_features", version = "1.32.0")
9+
bazel_dep(name = "bazel_skylib", version = "1.8.2")
10+
bazel_dep(name = "buildifier_prebuilt", version = "7.3.1")
1111
bazel_dep(name = "contrib_rules_jvm", version = "0.27.0")
12-
bazel_dep(name = "platforms", version = "0.0.11")
12+
bazel_dep(name = "platforms", version = "1.0.0")
1313

1414
# Required for the closure rules
1515
bazel_dep(name = "protobuf", version = "29.2", dev_dependency = True, repo_name = "com_google_protobuf")
1616

1717
# Required for rules_rust to import the crates properly
18-
bazel_dep(name = "rules_cc", version = "0.2.0", dev_dependency = True)
18+
bazel_dep(name = "rules_cc", version = "0.2.8", dev_dependency = True)
1919

2020
bazel_dep(name = "rules_dotnet", version = "0.17.5")
2121
bazel_dep(name = "rules_java", version = "8.7.1")
@@ -27,6 +27,7 @@ bazel_dep(name = "rules_pkg", version = "1.0.1")
2727
bazel_dep(name = "rules_python", version = "1.6.3")
2828
bazel_dep(name = "rules_proto", version = "7.0.2")
2929
bazel_dep(name = "rules_ruby", version = "0.19.0")
30+
bazel_dep(name = "rules_rust", version = "0.67.0")
3031

3132
# Until `rules_jvm_external` 6.8 ships
3233
single_version_override(
@@ -367,6 +368,18 @@ use_repo(ruby, "bundle", "ruby", "ruby_toolchains")
367368

368369
register_toolchains("@ruby_toolchains//:all")
369370

371+
rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
372+
rust.toolchain(versions = ["1.89.0"])
373+
374+
crate = use_extension("@rules_rust//crate_universe:extensions.bzl", "crate")
375+
crate.from_cargo(
376+
name = "crates",
377+
cargo_lockfile = "//rust:Cargo.lock",
378+
lockfile = "//rust:Cargo.Bazel.lock",
379+
manifests = ["//rust:Cargo.toml"],
380+
)
381+
use_repo(crate, "crates")
382+
370383
selenium_manager_artifacts = use_extension("//common:selenium_manager.bzl", "selenium_manager_artifacts")
371384
use_repo(
372385
selenium_manager_artifacts,

WORKSPACE

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -20,35 +20,3 @@ rules_closure_dependencies(
2020
)
2121

2222
rules_closure_toolchains()
23-
24-
# rules_rust fails to compile zstd on Windows when used with Bzlmod
25-
# so we keep it in WORKSPACE for now
26-
27-
http_archive(
28-
name = "rules_rust",
29-
integrity = "sha256-YrnH/f8jCpEqGAU+keNqauc+QSde9egtcFXqPtJuee4=",
30-
urls = ["https://github.com/bazelbuild/rules_rust/releases/download/0.65.0/rules_rust-0.65.0.tar.gz"],
31-
)
32-
33-
load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains")
34-
35-
rules_rust_dependencies()
36-
37-
rust_register_toolchains(versions = ["1.89.0"])
38-
39-
load("@rules_rust//crate_universe:defs.bzl", "crates_repository")
40-
41-
crates_repository(
42-
name = "crates",
43-
cargo_lockfile = "//rust:Cargo.lock",
44-
lockfile = "//rust:Cargo.Bazel.lock",
45-
manifests = ["//rust:Cargo.toml"],
46-
)
47-
48-
load("@crates//:defs.bzl", "crate_repositories")
49-
50-
crate_repositories()
51-
52-
load("@rules_rust//cargo:deps.bzl", "cargo_dependencies")
53-
54-
cargo_dependencies()

rust/Cargo.Bazel.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"checksum": "369365c5089394be8f6fd5d834b8acd8fe568305faff5cca5d29342d01697bd7",
2+
"checksum": "c2f6ce33acb9a60d2a50182bd219781cb613c02f03cb33e317ad0f9341fc4606",
33
"crates": {
44
"addr2line 0.25.1": {
55
"name": "addr2line",

0 commit comments

Comments
 (0)