forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't depend directly on oboe (#12316)

Browse Source 
- Avoid version mismatch
- When cpal updates oboe in a patch release, this breaks android support
for Bevy

- Use the same version of oboe as cpal by relying on it to re-export the
feature
This commit is contained in:
François 2024-03-05 18:23:12 +01:00
parent cb76dbbe97
commit 7f9ebfd603
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/bevy_audio/Cargo.toml
View File

@ -25,7 +25,7 @@ bevy_utils = { path = "../bevy_utils", version = "0.13.0" }
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 } cpal = { version = "0.15", 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 = [
@ -45,7 +45,7 @@ symphonia-isomp4 = ["rodio/symphonia-isomp4"]
symphonia-vorbis = ["rodio/symphonia-vorbis"] symphonia-vorbis = ["rodio/symphonia-vorbis"]
symphonia-wav = ["rodio/symphonia-wav"] symphonia-wav = ["rodio/symphonia-wav"]
# Enable using a shared stdlib for cxx on Android. # Enable using a shared stdlib for cxx on Android.
android_shared_stdcxx = ["oboe/shared-stdcxx"] android_shared_stdcxx = ["cpal/oboe-shared-stdcxx"]
[lints] [lints]
workspace = true workspace = true