Skip to content

Commit 499c978

Browse files
authored
Update cargo deny (#12178)
# Objective Cargo-deny has being updated and now some keys are being deprecated. Fix these warnings: <details> ```rs warning[deprecated]: this key will be removed in a future update, see EmbarkStudios/cargo-deny#611 for details ┌─ /Users/ameknite/code/rust/repos/bevy/deny.toml:6:1 │ 6 │ vulnerability = "deny" │ ^^^^^^^^^^^^^ warning[deprecated]: this key will be removed in a future update, see EmbarkStudios/cargo-deny#611 for details ┌─ /Users/ameknite/code/rust/repos/bevy/deny.toml:7:1 │ 7 │ unmaintained = "deny" │ ^^^^^^^^^^^^ warning[deprecated]: this key will be removed in a future update, see EmbarkStudios/cargo-deny#611 for details ┌─ /Users/ameknite/code/rust/repos/bevy/deny.toml:9:1 │ 9 │ notice = "deny" │ ^^^^^^ warning[deprecated]: this key will be removed in a future update, see EmbarkStudios/cargo-deny#611 for details ┌─ /Users/ameknite/code/rust/repos/bevy/deny.toml:13:1 │ 13 │ unlicensed = "deny" │ ^^^^^^^^^^ warning[deprecated]: this key will be removed in a future update, see EmbarkStudios/cargo-deny#611 for details ┌─ /Users/ameknite/code/rust/repos/bevy/deny.toml:14:1 │ 14 │ copyleft = "deny" │ ^^^^^^^^ warning[deprecated]: this key will be removed in a future update, see EmbarkStudios/cargo-deny#611 for details ┌─ /Users/ameknite/code/rust/repos/bevy/deny.toml:15:1 │ 15 │ default = "deny" │ ^^^^^^^ warning[deprecated]: this key has been moved to [graph] ┌─ /Users/ameknite/code/rust/repos/bevy/deny.toml:1:1 │ 1 │ all-features = true │ ^^^^^^^^^^^^ ``` </details> This also fix ci by temporarily skipping the check for cpal dependencies. #11917 (comment) ## Solution - Remove keys deprecated. - Update the list of licenses allowed. (All these licenses are already being use for some dependencies) - Skip cpal dependencies to avoid falining in CI, while we wait for new releases #11917 (comment)
1 parent f8f8bdd commit 499c978

File tree

1 file changed

+25
-18
lines changed

1 file changed

+25
-18
lines changed

deny.toml

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,34 @@
1+
[graph]
12
all-features = true
23

34
[advisories]
4-
db-path = "~/.cargo/advisory-db"
5-
db-urls = ["https://github.com/rustsec/advisory-db"]
6-
vulnerability = "deny"
7-
unmaintained = "deny"
8-
yanked = "deny"
9-
notice = "deny"
5+
version = 2
106
ignore = []
117

128
[licenses]
13-
unlicensed = "deny"
14-
copyleft = "deny"
15-
default = "deny"
9+
version = 2
1610
allow = [
17-
"MIT",
18-
"MIT-0",
11+
"0BSD",
1912
"Apache-2.0",
13+
"Apache-2.0 WITH LLVM-exception",
14+
"BSD-2-Clause",
2015
"BSD-3-Clause",
16+
"BSL-1.0",
17+
"CC0-1.0",
2118
"ISC",
19+
"MIT",
20+
"MIT-0",
21+
"Unlicense",
2222
"Zlib",
23-
"0BSD",
24-
"BSD-2-Clause",
25-
"CC0-1.0",
2623
]
24+
2725
exceptions = [
2826
{ name = "unicode-ident", allow = [
2927
"Unicode-DFS-2016",
3028
] },
29+
{ name = "symphonia", allow = [
30+
"MPL-2.0",
31+
] },
3132
{ name = "symphonia-bundle-flac", allow = [
3233
"MPL-2.0",
3334
] },
@@ -52,7 +53,7 @@ exceptions = [
5253
{ name = "symphonia-format-isomp4", allow = [
5354
"MPL-2.0",
5455
] },
55-
{ name = "symphonia-format-wav", allow = [
56+
{ name = "symphonia-format-riff", allow = [
5657
"MPL-2.0",
5758
] },
5859
{ name = "symphonia-metadata", allow = [
@@ -61,9 +62,6 @@ exceptions = [
6162
{ name = "symphonia-utils-xiph", allow = [
6263
"MPL-2.0",
6364
] },
64-
{ name = "symphonia", allow = [
65-
"MPL-2.0",
66-
] },
6765
]
6866

6967
[bans]
@@ -76,6 +74,15 @@ deny = [
7674
{ name = "glam", deny-multiple-versions = true },
7775
{ name = "raw-window-handle", deny-multiple-versions = true },
7876
]
77+
# To avoid https://github.com/bevyengine/bevy/issues/11917
78+
# = raw-window-handle v0.5.2
79+
# └── ndk v0.7.0
80+
# ├── cpal v0.15.2`
81+
# │ └── rodio v0.17.3
82+
# │ └── bevy_audio v0.14.0-dev
83+
skip-tree = [
84+
{ crate = "[email protected]", reason = "Waiting for new releases: https://github.com/bevyengine/bevy/issues/11917#issuecomment-1953629729" },
85+
]
7986

8087
[sources]
8188
unknown-registry = "deny"

0 commit comments

Comments
 (0)