From 7f9ebfd6039a2daba9b071134b4c36157ce43fb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Tue, 5 Mar 2024 18:23:12 +0100 Subject: [PATCH] don't depend directly on oboe (#12316) - 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 --- crates/bevy_audio/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/bevy_audio/Cargo.toml b/crates/bevy_audio/Cargo.toml index cadc4a7fd43a4..0a4a3575e32b7 100644 --- a/crates/bevy_audio/Cargo.toml +++ b/crates/bevy_audio/Cargo.toml @@ -25,7 +25,7 @@ bevy_utils = { path = "../bevy_utils", version = "0.13.0" } rodio = { version = "0.17", default-features = false } [target.'cfg(target_os = "android")'.dependencies] -oboe = { version = "0.5", optional = true } +cpal = { version = "0.15", optional = true } [target.'cfg(target_arch = "wasm32")'.dependencies] rodio = { version = "0.17", default-features = false, features = [ @@ -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