Skip to content

Commit 0b2ae29

Browse files
mmorel-35mmorel-35
committed
Update Bazel workspace dependencies to 7.6.2 compatibility with MODULE.bazel support
Signed-off-by: Matthieu MOREL <[email protected]>
1 parent ba23ab4 commit 0b2ae29

21 files changed

+265
-74
lines changed

‎.bazelrc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
# Disable Bzlmod
2-
common --noenable_bzlmod
1+
# Enable Bzlmod for modern dependency management
2+
# To use legacy WORKSPACE instead, add: --noenable_bzlmod
3+
common --enable_bzlmod
34

45
# Force Bazel to use --target=wasm32-wasip1
56
build --platforms=@rules_rust//rust/platform:wasi

‎.bazelversion‎

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

‎MODULE.bazel‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Copyright 2020 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
module(
16+
name = "proxy_wasm_rust_sdk",
17+
version = "0.2.5-dev",
18+
)
19+
20+
# Regular dependencies (sorted alphabetically)
21+
bazel_dep(name = "bazel_features", version = "1.38.0")
22+
bazel_dep(name = "bazel_skylib", version = "1.8.2")
23+
bazel_dep(name = "rules_cc", version = "0.2.14")
24+
bazel_dep(name = "rules_rust", version = "0.67.0")
25+
26+
# Configure Rust toolchain
27+
rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
28+
rust.toolchain(edition = "2018")
29+
use_repo(rust, "rust_toolchains")
30+
31+
register_toolchains("@rust_toolchains//:all")

‎MODULE.bazel.lock‎

Lines changed: 95 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎WORKSPACE‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ load("@proxy_wasm_rust_sdk//bazel:repositories.bzl", "proxy_wasm_rust_sdk_reposi
44

55
proxy_wasm_rust_sdk_repositories()
66

7+
load("@bazel_features//:deps.bzl", "bazel_features_deps")
8+
9+
bazel_features_deps()
10+
11+
load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo")
12+
13+
compatibility_proxy_repo()
14+
715
load("@proxy_wasm_rust_sdk//bazel:dependencies.bzl", "proxy_wasm_rust_sdk_dependencies")
816

917
proxy_wasm_rust_sdk_dependencies()

‎bazel/cargo/Cargo.Bazel.lock‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
2222

2323
[[package]]
2424
name = "hashbrown"
25-
version = "0.16.0"
25+
version = "0.16.1"
2626
source = "registry+https://github.com/rust-lang/crates.io-index"
27-
checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
27+
checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
2828
dependencies = [
2929
"allocator-api2",
3030
"equivalent",
@@ -33,9 +33,9 @@ dependencies = [
3333

3434
[[package]]
3535
name = "log"
36-
version = "0.4.27"
36+
version = "0.4.28"
3737
source = "registry+https://github.com/rust-lang/crates.io-index"
38-
checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
38+
checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
3939

4040
[[package]]
4141
name = "mockalloc"
@@ -59,9 +59,9 @@ dependencies = [
5959

6060
[[package]]
6161
name = "proc-macro2"
62-
version = "1.0.101"
62+
version = "1.0.103"
6363
source = "registry+https://github.com/rust-lang/crates.io-index"
64-
checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
64+
checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
6565
dependencies = [
6666
"unicode-ident",
6767
]
@@ -77,9 +77,9 @@ dependencies = [
7777

7878
[[package]]
7979
name = "quote"
80-
version = "1.0.41"
80+
version = "1.0.42"
8181
source = "registry+https://github.com/rust-lang/crates.io-index"
82-
checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
82+
checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
8383
dependencies = [
8484
"proc-macro2",
8585
]
@@ -97,6 +97,6 @@ dependencies = [
9797

9898
[[package]]
9999
name = "unicode-ident"
100-
version = "1.0.19"
100+
version = "1.0.22"
101101
source = "registry+https://github.com/rust-lang/crates.io-index"
102-
checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
102+
checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"

‎bazel/cargo/remote/BUILD.allocator-api2-0.2.21.bazel‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,16 @@ rust_library(
7373
"@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
7474
"@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
7575
"@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
76+
"@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
7677
"@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
7778
"@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
7879
"@rules_rust//rust/platform:thumbv7em-none-eabi": [],
7980
"@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
81+
"@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
8082
"@rules_rust//rust/platform:wasm32-unknown-unknown": [],
8183
"@rules_rust//rust/platform:wasm32-wasip1": [],
84+
"@rules_rust//rust/platform:wasm32-wasip1-threads": [],
85+
"@rules_rust//rust/platform:wasm32-wasip2": [],
8286
"@rules_rust//rust/platform:x86_64-apple-darwin": [],
8387
"@rules_rust//rust/platform:x86_64-apple-ios": [],
8488
"@rules_rust//rust/platform:x86_64-linux-android": [],

‎bazel/cargo/remote/BUILD.bazel‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,26 +32,26 @@ filegroup(
3232

3333
# Workspace Member Dependencies
3434
alias(
35-
name = "hashbrown-0.16.0",
36-
actual = "@crates_vendor__hashbrown-0.16.0//:hashbrown",
35+
name = "hashbrown-0.16.1",
36+
actual = "@crates_vendor__hashbrown-0.16.1//:hashbrown",
3737
tags = ["manual"],
3838
)
3939

4040
alias(
4141
name = "hashbrown",
42-
actual = "@crates_vendor__hashbrown-0.16.0//:hashbrown",
42+
actual = "@crates_vendor__hashbrown-0.16.1//:hashbrown",
4343
tags = ["manual"],
4444
)
4545

4646
alias(
47-
name = "log-0.4.27",
48-
actual = "@crates_vendor__log-0.4.27//:log",
47+
name = "log-0.4.28",
48+
actual = "@crates_vendor__log-0.4.28//:log",
4949
tags = ["manual"],
5050
)
5151

5252
alias(
5353
name = "log",
54-
actual = "@crates_vendor__log-0.4.27//:log",
54+
actual = "@crates_vendor__log-0.4.28//:log",
5555
tags = ["manual"],
5656
)
5757

‎bazel/cargo/remote/BUILD.equivalent-1.0.2.bazel‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,16 @@ rust_library(
7070
"@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
7171
"@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
7272
"@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
73+
"@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
7374
"@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
7475
"@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
7576
"@rules_rust//rust/platform:thumbv7em-none-eabi": [],
7677
"@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
78+
"@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
7779
"@rules_rust//rust/platform:wasm32-unknown-unknown": [],
7880
"@rules_rust//rust/platform:wasm32-wasip1": [],
81+
"@rules_rust//rust/platform:wasm32-wasip1-threads": [],
82+
"@rules_rust//rust/platform:wasm32-wasip2": [],
7983
"@rules_rust//rust/platform:x86_64-apple-darwin": [],
8084
"@rules_rust//rust/platform:x86_64-apple-ios": [],
8185
"@rules_rust//rust/platform:x86_64-linux-android": [],

‎bazel/cargo/remote/BUILD.foldhash-0.2.0.bazel‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,16 @@ rust_library(
7070
"@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
7171
"@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
7272
"@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
73+
"@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
7374
"@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
7475
"@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
7576
"@rules_rust//rust/platform:thumbv7em-none-eabi": [],
7677
"@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
78+
"@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
7779
"@rules_rust//rust/platform:wasm32-unknown-unknown": [],
7880
"@rules_rust//rust/platform:wasm32-wasip1": [],
81+
"@rules_rust//rust/platform:wasm32-wasip1-threads": [],
82+
"@rules_rust//rust/platform:wasm32-wasip2": [],
7983
"@rules_rust//rust/platform:x86_64-apple-darwin": [],
8084
"@rules_rust//rust/platform:x86_64-apple-ios": [],
8185
"@rules_rust//rust/platform:x86_64-linux-android": [],

0 commit comments

Comments
 (0)