Mirrors/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy synced 2024-12-12 06:12:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix duplicate dependencies on raw-window-handle (#12309)

Browse source 
# Objective

cpal has been updated to [0.15.3](https://crates.io/crates/cpal/0.15.3).
we can remove the skip to avoid check for cpal 0.15.2 dependencies in
deny.toml

cpal now uses ndk 8.0 and Oboe 6.0, so we only have a version for
raw-window-handle, version 0.6

## Solution

- Remove temporal fix that skipped the check for the cpal dependency.
- Update oboe to 0.6

Fixes https://github.com/bevyengine/bevy/issues/11917
This commit is contained in:
Ame 2024-03-05 02:24:37 -06:00 committed by GitHub
parent 5b69613e42
commit ee2fdc094c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/bevy_audio/Cargo.toml
View file

@ -25,7 +25,7 @@ bevy_utils = { path = "../bevy_utils", version = "0.14.0-dev" }
rodio = { version = "0.17", default-features = false } rodio = { version = "0.17", default-features = false }
[target.'cfg(target_os = "android")'.dependencies] [target.'cfg(target_os = "android")'.dependencies]
oboe = { version = "0.5", optional = true } oboe = { version = "0.6", optional = true }
[target.'cfg(target_arch = "wasm32")'.dependencies] [target.'cfg(target_arch = "wasm32")'.dependencies]
rodio = { version = "0.17", default-features = false, features = [ rodio = { version = "0.17", default-features = false, features = [

9
deny.toml
View file

@ -74,15 +74,6 @@ deny = [
{ name = "glam", deny-multiple-versions = true }, { name = "glam", deny-multiple-versions = true },
{ name = "raw-window-handle", deny-multiple-versions = true }, { name = "raw-window-handle", deny-multiple-versions = true },
] ]
# To avoid https://github.com/bevyengine/bevy/issues/11917
# = raw-window-handle v0.5.2
# └── ndk v0.7.0
# ├── cpal v0.15.2`
# │ └── rodio v0.17.3
# │ └── bevy_audio v0.14.0-dev
skip-tree = [
{ crate = "cpal@0.15.2", reason = "Waiting for new releases: https://github.com/bevyengine/bevy/issues/11917#issuecomment-1953629729" },
]
[sources] [sources]
unknown-registry = "deny" unknown-registry = "deny"