Skip to content

Commit

Permalink
don't depend directly on oboe (#12316)
Browse files Browse the repository at this point in the history
# Objective

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

## Solution

- Use the same version of oboe as cpal by relying on it to re-export the
feature
  • Loading branch information
mockersf committed Mar 5, 2024
1 parent 4bed1b2 commit 212dc60
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions crates/bevy_audio/Cargo.toml
Expand Up @@ -25,7 +25,7 @@ bevy_utils = { path = "../bevy_utils", version = "0.14.0-dev" }
rodio = { version = "0.17", default-features = false }

[target.'cfg(target_os = "android")'.dependencies]
oboe = { version = "0.6", optional = true }
cpal = { version = "0.15", optional = true }

[target.'cfg(target_arch = "wasm32")'.dependencies]
rodio = { version = "0.17", default-features = false, features = [
Expand All @@ -45,7 +45,7 @@ symphonia-isomp4 = ["rodio/symphonia-isomp4"]
symphonia-vorbis = ["rodio/symphonia-vorbis"]
symphonia-wav = ["rodio/symphonia-wav"]
# Enable using a shared stdlib for cxx on Android.
android_shared_stdcxx = ["oboe/shared-stdcxx"]
android_shared_stdcxx = ["cpal/oboe-shared-stdcxx"]

[lints]
workspace = true

0 comments on commit 212dc60

Please sign in to comment.