From 6d11574759ecfdb42c687bd92fc640cc46ffad9e Mon Sep 17 00:00:00 2001
From: Niklas Eicker <git@nikl.me>
Date: Sun, 9 Jun 2024 22:01:43 +0200
Subject: [PATCH 1/5] Update to Bevy 0.14.0-rc.2

---
 Cargo.toml                    |  6 +++---
 src/audio.rs                  |  6 ++----
 src/audio_output.rs           | 36 ++++++++++++++++++-----------------
 src/channel/dynamic.rs        | 33 +++++++++++---------------------
 src/channel/typed.rs          | 18 +++++-------------
 src/source/flac_loader.rs     | 23 +++++++++-------------
 src/source/mp3_loader.rs      | 23 +++++++++-------------
 src/source/ogg_loader.rs      | 23 +++++++++-------------
 src/source/settings_loader.rs | 32 ++++++++++++++-----------------
 src/source/wav_loader.rs      | 23 +++++++++-------------
 10 files changed, 90 insertions(+), 133 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 535ebb0..59b71eb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,7 +22,7 @@ wav = ["kira/wav"]
 settings_loader = ["dep:ron", "dep:serde", "kira/serde"]
 
 [dependencies]
-bevy = { version = "0.13", default-features = false, features = ["bevy_asset"] }
+bevy = { version = "0.14.0-rc.2", default-features = false, features = ["bevy_asset"] }
 anyhow = "1.0"
 uuid = { version = "1", features = ["fast-rng"] }
 kira = { version = "0.8", default-features = false, features = ["cpal"] }
@@ -32,7 +32,7 @@ parking_lot = "0.12"
 thiserror = "1.0"
 
 [dev-dependencies.bevy]
-version = "0.13"
+version = "0.14.0-rc.2"
 default-features = false
 features = [
     "bevy_asset",
@@ -49,7 +49,7 @@ features = [
     "tonemapping_luts",
     "ktx2",
     "zstd",
-    "multi-threaded",
+    "multi_threaded"
 ]
 
 [[example]]
diff --git a/src/audio.rs b/src/audio.rs
index e028e13..216c3fb 100644
--- a/src/audio.rs
+++ b/src/audio.rs
@@ -10,13 +10,13 @@ use bevy::app::{App, PreUpdate};
 use bevy::asset::{AssetId, Handle};
 use bevy::ecs::system::Resource;
 use bevy::prelude::{default, IntoSystemConfigs, PostUpdate};
-use bevy::utils::Uuid;
 use kira::sound::static_sound::{StaticSoundData, StaticSoundHandle};
 use kira::sound::EndPosition;
 use kira::tween::Value;
 use kira::Volume;
 use std::marker::PhantomData;
 use std::time::Duration;
+use uuid::Uuid;
 
 pub(crate) enum AudioCommand {
     Play(PlayAudioSettings),
@@ -186,9 +186,7 @@ impl<'a> Drop for PlayAudioCommand<'a> {
 
 impl<'a> PlayAudioCommand<'a> {
     pub(crate) fn new(source: Handle<AudioSource>, que: &'a dyn AudioCommandQue) -> Self {
-        let asset_id = AssetId::Uuid {
-            uuid: Uuid::new_v4(),
-        };
+        let asset_id = AssetId::from(Uuid::new_v4());
         Self {
             instance_handle: Handle::<AudioInstance>::Weak(asset_id),
             source,
diff --git a/src/audio_output.rs b/src/audio_output.rs
index dcf8030..353861d 100644
--- a/src/audio_output.rs
+++ b/src/audio_output.rs
@@ -464,18 +464,21 @@ mod test {
     use crate::{Audio, AudioPlugin};
     use bevy::asset::{AssetId, AssetPlugin};
     use bevy::prelude::*;
-    use bevy::utils::Uuid;
     use kira::manager::backend::mock::MockBackend;
     use kira::manager::AudioManagerSettings;
+    use uuid::Uuid;
 
     #[test]
     fn keeps_order_of_commands_to_retry() {
         // we only need this app to conveniently get a assets collection for `AudioSource`...
         let mut app = App::new();
         app.add_plugins((MinimalPlugins, AssetPlugin::default(), AudioPlugin));
-        let audio_source_assets = app.world.remove_resource::<Assets<AudioSource>>().unwrap();
+        let audio_source_assets = app
+            .world_mut()
+            .remove_resource::<Assets<AudioSource>>()
+            .unwrap();
         let mut audio_instance_assets = app
-            .world
+            .world_mut()
             .remove_resource::<Assets<AudioInstance>>()
             .unwrap();
 
@@ -484,12 +487,10 @@ mod test {
             instances: HashMap::default(),
             channels: HashMap::default(),
         };
-        let audio_handle_one: Handle<AudioSource> = Handle::<AudioSource>::Weak(AssetId::Uuid {
-            uuid: Uuid::from_u128(1758302748397294),
-        });
-        let audio_handle_two: Handle<AudioSource> = Handle::<AudioSource>::Weak(AssetId::Uuid {
-            uuid: Uuid::from_u128(2537024739048739),
-        });
+        let audio_handle_one: Handle<AudioSource> =
+            Handle::<AudioSource>::Weak(AssetId::from(Uuid::from_u128(1758302748397294)));
+        let audio_handle_two: Handle<AudioSource> =
+            Handle::<AudioSource>::Weak(AssetId::from(Uuid::from_u128(2537024739048739)));
 
         let channel = AudioChannel::<Audio>::default();
         channel.play(audio_handle_one.clone());
@@ -518,9 +519,12 @@ mod test {
         // we only need this app to conveniently get a assets collection for `AudioSource`...
         let mut app = App::new();
         app.add_plugins((MinimalPlugins, AssetPlugin::default(), AudioPlugin));
-        let audio_source_assets = app.world.remove_resource::<Assets<AudioSource>>().unwrap();
+        let audio_source_assets = app
+            .world_mut()
+            .remove_resource::<Assets<AudioSource>>()
+            .unwrap();
         let mut audio_instance_assets = app
-            .world
+            .world_mut()
             .remove_resource::<Assets<AudioInstance>>()
             .unwrap();
 
@@ -529,12 +533,10 @@ mod test {
             instances: HashMap::default(),
             channels: HashMap::default(),
         };
-        let audio_handle_one: Handle<AudioSource> = Handle::<AudioSource>::Weak(AssetId::Uuid {
-            uuid: Uuid::from_u128(13290473942075938),
-        });
-        let audio_handle_two: Handle<AudioSource> = Handle::<AudioSource>::Weak(AssetId::Uuid {
-            uuid: Uuid::from_u128(243290473942075938),
-        });
+        let audio_handle_one: Handle<AudioSource> =
+            Handle::<AudioSource>::Weak(AssetId::from(Uuid::from_u128(13290473942075938)));
+        let audio_handle_two: Handle<AudioSource> =
+            Handle::<AudioSource>::Weak(AssetId::from(Uuid::from_u128(243290473942075938)));
 
         let channel = AudioChannel::<Audio>::default();
         channel.play(audio_handle_one);
diff --git a/src/channel/dynamic.rs b/src/channel/dynamic.rs
index 327a291..97856f3 100644
--- a/src/channel/dynamic.rs
+++ b/src/channel/dynamic.rs
@@ -236,14 +236,13 @@ mod tests {
     use crate::channel::dynamic::DynamicAudioChannels;
     use crate::channel::*;
     use bevy::asset::AssetId;
-    use bevy::utils::Uuid;
+    use uuid::Uuid;
 
     #[test]
     fn state_is_queued_if_command_is_queued() {
         let mut audio = DynamicAudioChannels::default();
-        let audio_handle: Handle<AudioSource> = Handle::<AudioSource>::Weak(AssetId::Uuid {
-            uuid: Uuid::from_u128(43290473942075938),
-        });
+        let audio_handle: Handle<AudioSource> =
+            Handle::<AudioSource>::Weak(AssetId::from(Uuid::from_u128(43290473942075938)));
         let instance_handle = audio.create_channel("test").play(audio_handle).handle();
 
         assert_eq!(
@@ -255,9 +254,8 @@ mod tests {
     #[test]
     fn state_is_stopped_if_command_is_not_queued_and_id_not_in_state_map() {
         let mut audio = DynamicAudioChannels::default();
-        let instance_handle = Handle::<AudioInstance>::Weak(AssetId::Uuid {
-            uuid: Uuid::from_u128(43290473942075938),
-        });
+        let instance_handle =
+            Handle::<AudioInstance>::Weak(AssetId::from(Uuid::from_u128(43290473942075938)));
 
         assert_eq!(
             audio.create_channel("test").state(&instance_handle),
@@ -268,9 +266,8 @@ mod tests {
     #[test]
     fn state_is_fetched_from_state_map() {
         let mut audio = DynamicAudioChannels::default();
-        let instance_handle = Handle::<AudioInstance>::Weak(AssetId::Uuid {
-            uuid: Uuid::from_u128(43290473942075938),
-        });
+        let instance_handle =
+            Handle::<AudioInstance>::Weak(AssetId::from(Uuid::from_u128(43290473942075938)));
         audio.create_channel("test");
         audio.channels.get_mut("test").unwrap().states.insert(
             instance_handle.id(),
@@ -288,29 +285,21 @@ mod tests {
         let mut audio = DynamicAudioChannels::default();
         audio.create_channel("test");
         audio.channels.get_mut("test").unwrap().states.insert(
-            AssetId::Uuid {
-                uuid: Uuid::from_u128(143290473942075938),
-            },
+            AssetId::from(Uuid::from_u128(143290473942075938)),
             PlaybackState::Queued,
         );
         audio.channels.get_mut("test").unwrap().states.insert(
-            AssetId::Uuid {
-                uuid: Uuid::from_u128(243290473942075938),
-            },
+            AssetId::from(Uuid::from_u128(243290473942075938)),
             PlaybackState::Paused { position: 42. },
         );
         audio.channels.get_mut("test").unwrap().states.insert(
-            AssetId::Uuid {
-                uuid: Uuid::from_u128(343290473942075938),
-            },
+            AssetId::from(Uuid::from_u128(343290473942075938)),
             PlaybackState::Stopped,
         );
         assert!(!audio.channel("test").is_playing_sound());
 
         audio.channels.get_mut("test").unwrap().states.insert(
-            AssetId::Uuid {
-                uuid: Uuid::from_u128(43290473942075938),
-            },
+            AssetId::from(Uuid::from_u128(43290473942075938)),
             PlaybackState::Playing { position: 42. },
         );
         assert!(audio.channel("test").is_playing_sound());
diff --git a/src/channel/typed.rs b/src/channel/typed.rs
index 9df56a7..24c794c 100644
--- a/src/channel/typed.rs
+++ b/src/channel/typed.rs
@@ -191,7 +191,7 @@ mod test {
     use crate::channel::*;
     use crate::Audio;
     use bevy::asset::{AssetId, Handle};
-    use bevy::utils::Uuid;
+    use uuid::Uuid;
 
     #[test]
     fn state_is_queued_if_command_is_queued() {
@@ -230,29 +230,21 @@ mod test {
     fn finds_playing_sound() {
         let mut audio = AudioChannel::<Audio>::default();
         audio.states.insert(
-            AssetId::Uuid {
-                uuid: Uuid::from_u128(43290473942075938),
-            },
+            Uuid::from_u128(43290473942075938).into(),
             PlaybackState::Queued,
         );
         audio.states.insert(
-            AssetId::Uuid {
-                uuid: Uuid::from_u128(432952340473942075938),
-            },
+            Uuid::from_u128(432952340473942075938).into(),
             PlaybackState::Paused { position: 42. },
         );
         audio.states.insert(
-            AssetId::Uuid {
-                uuid: Uuid::from_u128(46254624324354345324),
-            },
+            Uuid::from_u128(46254624324354345324).into(),
             PlaybackState::Stopped,
         );
         assert!(!audio.is_playing_sound());
 
         audio.states.insert(
-            AssetId::Uuid {
-                uuid: Uuid::from_u128(70973842759324739),
-            },
+            Uuid::from_u128(70973842759324739).into(),
             PlaybackState::Playing { position: 42. },
         );
         assert!(audio.is_playing_sound());
diff --git a/src/source/flac_loader.rs b/src/source/flac_loader.rs
index 741e5aa..21d65d0 100644
--- a/src/source/flac_loader.rs
+++ b/src/source/flac_loader.rs
@@ -1,7 +1,6 @@
 use anyhow::Result;
 use bevy::asset::io::Reader;
 use bevy::asset::{AssetLoader, AsyncReadExt, LoadContext};
-use bevy::utils::BoxedFuture;
 use kira::sound::static_sound::{StaticSoundData, StaticSoundSettings};
 use kira::sound::FromFileError;
 use std::io::Cursor;
@@ -29,21 +28,17 @@ impl AssetLoader for FlacLoader {
     type Settings = ();
     type Error = FlacLoaderError;
 
-    fn load<'a>(
+    async fn load<'a>(
         &'a self,
-        reader: &'a mut Reader,
+        reader: &'a mut Reader<'_>,
         _settings: &'a (),
-        _load_context: &'a mut LoadContext,
-    ) -> BoxedFuture<'a, Result<Self::Asset, Self::Error>> {
-        Box::pin(async move {
-            let mut sound_bytes = vec![];
-            reader.read_to_end(&mut sound_bytes).await?;
-            let sound = StaticSoundData::from_cursor(
-                Cursor::new(sound_bytes),
-                StaticSoundSettings::default(),
-            )?;
-            Ok(AudioSource { sound })
-        })
+        _load_context: &'a mut LoadContext<'_>,
+    ) -> Result<Self::Asset, Self::Error> {
+        let mut sound_bytes = vec![];
+        reader.read_to_end(&mut sound_bytes).await?;
+        let sound =
+            StaticSoundData::from_cursor(Cursor::new(sound_bytes), StaticSoundSettings::default())?;
+        Ok(AudioSource { sound })
     }
 
     fn extensions(&self) -> &[&str] {
diff --git a/src/source/mp3_loader.rs b/src/source/mp3_loader.rs
index 1bbe78c..282cb0d 100644
--- a/src/source/mp3_loader.rs
+++ b/src/source/mp3_loader.rs
@@ -1,7 +1,6 @@
 use anyhow::Result;
 use bevy::asset::io::Reader;
 use bevy::asset::{AssetLoader, AsyncReadExt, LoadContext};
-use bevy::utils::BoxedFuture;
 use kira::sound::static_sound::{StaticSoundData, StaticSoundSettings};
 use kira::sound::FromFileError;
 use std::io::Cursor;
@@ -29,21 +28,17 @@ impl AssetLoader for Mp3Loader {
     type Settings = ();
     type Error = Mp3LoaderError;
 
-    fn load<'a>(
+    async fn load<'a>(
         &'a self,
-        reader: &'a mut Reader,
+        reader: &'a mut Reader<'_>,
         _settings: &'a (),
-        _load_context: &'a mut LoadContext,
-    ) -> BoxedFuture<'a, Result<Self::Asset, Self::Error>> {
-        Box::pin(async move {
-            let mut sound_bytes = vec![];
-            reader.read_to_end(&mut sound_bytes).await?;
-            let sound = StaticSoundData::from_cursor(
-                Cursor::new(sound_bytes),
-                StaticSoundSettings::default(),
-            )?;
-            Ok(AudioSource { sound })
-        })
+        _load_context: &'a mut LoadContext<'_>,
+    ) -> Result<Self::Asset, Self::Error> {
+        let mut sound_bytes = vec![];
+        reader.read_to_end(&mut sound_bytes).await?;
+        let sound =
+            StaticSoundData::from_cursor(Cursor::new(sound_bytes), StaticSoundSettings::default())?;
+        Ok(AudioSource { sound })
     }
 
     fn extensions(&self) -> &[&str] {
diff --git a/src/source/ogg_loader.rs b/src/source/ogg_loader.rs
index b9e43bc..f8b0c13 100644
--- a/src/source/ogg_loader.rs
+++ b/src/source/ogg_loader.rs
@@ -1,7 +1,6 @@
 use anyhow::Result;
 use bevy::asset::io::Reader;
 use bevy::asset::{AssetLoader, AsyncReadExt, LoadContext};
-use bevy::utils::BoxedFuture;
 use kira::sound::static_sound::{StaticSoundData, StaticSoundSettings};
 use kira::sound::FromFileError;
 use std::io::Cursor;
@@ -29,21 +28,17 @@ impl AssetLoader for OggLoader {
     type Settings = ();
     type Error = OggLoaderError;
 
-    fn load<'a>(
+    async fn load<'a>(
         &'a self,
-        reader: &'a mut Reader,
+        reader: &'a mut Reader<'_>,
         _settings: &'a (),
-        _load_context: &'a mut LoadContext,
-    ) -> BoxedFuture<'a, Result<Self::Asset, Self::Error>> {
-        Box::pin(async move {
-            let mut sound_bytes = vec![];
-            reader.read_to_end(&mut sound_bytes).await?;
-            let sound = StaticSoundData::from_cursor(
-                Cursor::new(sound_bytes),
-                StaticSoundSettings::default(),
-            )?;
-            Ok(AudioSource { sound })
-        })
+        _load_context: &'a mut LoadContext<'_>,
+    ) -> Result<Self::Asset, Self::Error> {
+        let mut sound_bytes = vec![];
+        reader.read_to_end(&mut sound_bytes).await?;
+        let sound =
+            StaticSoundData::from_cursor(Cursor::new(sound_bytes), StaticSoundSettings::default())?;
+        Ok(AudioSource { sound })
     }
 
     fn extensions(&self) -> &[&str] {
diff --git a/src/source/settings_loader.rs b/src/source/settings_loader.rs
index 16ef785..91a35bd 100644
--- a/src/source/settings_loader.rs
+++ b/src/source/settings_loader.rs
@@ -3,7 +3,6 @@ use std::{io::Cursor, path::PathBuf};
 
 use bevy::asset::io::Reader;
 use bevy::asset::{AssetLoader, AsyncReadExt, LoadContext, ReadAssetBytesError};
-use bevy::utils::BoxedFuture;
 use kira::sound::static_sound::{StaticSoundData, StaticSoundSettings};
 use kira::sound::{EndPosition, FromFileError, PlaybackPosition, PlaybackRate, Region};
 use kira::tween::Tween;
@@ -127,25 +126,22 @@ impl AssetLoader for SettingsLoader {
     type Settings = ();
     type Error = SettingsLoaderError;
 
-    fn load<'a>(
+    async fn load<'a>(
         &'a self,
-        reader: &'a mut Reader,
+        reader: &'a mut Reader<'_>,
         _settings: &'a (),
-        load_context: &'a mut LoadContext,
-    ) -> BoxedFuture<'a, Result<Self::Asset, Self::Error>> {
-        Box::pin(async move {
-            let mut bytes = Vec::new();
-            reader.read_to_end(&mut bytes).await?;
-            let sound_settings: SoundSettings = ron::de::from_bytes(&bytes)?;
-            let sound_bytes = load_context
-                .read_asset_bytes(sound_settings.file.clone())
-                .await?;
-
-            let sound =
-                StaticSoundData::from_cursor(Cursor::new(sound_bytes), sound_settings.into())?;
-
-            Ok(AudioSource { sound })
-        })
+        load_context: &'a mut LoadContext<'_>,
+    ) -> Result<Self::Asset, Self::Error> {
+        let mut bytes = Vec::new();
+        reader.read_to_end(&mut bytes).await?;
+        let sound_settings: SoundSettings = ron::de::from_bytes(&bytes)?;
+        let sound_bytes = load_context
+            .read_asset_bytes(sound_settings.file.clone())
+            .await?;
+
+        let sound = StaticSoundData::from_cursor(Cursor::new(sound_bytes), sound_settings.into())?;
+
+        Ok(AudioSource { sound })
     }
 
     fn extensions(&self) -> &[&str] {
diff --git a/src/source/wav_loader.rs b/src/source/wav_loader.rs
index 2b86da2..e841097 100644
--- a/src/source/wav_loader.rs
+++ b/src/source/wav_loader.rs
@@ -1,7 +1,6 @@
 use anyhow::Result;
 use bevy::asset::io::Reader;
 use bevy::asset::{AssetLoader, AsyncReadExt, LoadContext};
-use bevy::utils::BoxedFuture;
 use kira::sound::static_sound::{StaticSoundData, StaticSoundSettings};
 use kira::sound::FromFileError;
 use std::io::Cursor;
@@ -29,21 +28,17 @@ impl AssetLoader for WavLoader {
     type Settings = ();
     type Error = WavLoaderError;
 
-    fn load<'a>(
+    async fn load<'a>(
         &'a self,
-        reader: &'a mut Reader,
+        reader: &'a mut Reader<'_>,
         _settings: &'a (),
-        _load_context: &'a mut LoadContext,
-    ) -> BoxedFuture<'a, Result<Self::Asset, Self::Error>> {
-        Box::pin(async move {
-            let mut sound_bytes = vec![];
-            reader.read_to_end(&mut sound_bytes).await?;
-            let sound = StaticSoundData::from_cursor(
-                Cursor::new(sound_bytes),
-                StaticSoundSettings::default(),
-            )?;
-            Ok(AudioSource { sound })
-        })
+        _load_context: &'a mut LoadContext<'_>,
+    ) -> Result<Self::Asset, Self::Error> {
+        let mut sound_bytes = vec![];
+        reader.read_to_end(&mut sound_bytes).await?;
+        let sound =
+            StaticSoundData::from_cursor(Cursor::new(sound_bytes), StaticSoundSettings::default())?;
+        Ok(AudioSource { sound })
     }
     fn extensions(&self) -> &[&str] {
         &["wav"]

From b07fef13c7ae0c76c8b50e1749ffbded5598da41 Mon Sep 17 00:00:00 2001
From: Niklas Eicker <git@nikl.me>
Date: Mon, 17 Jun 2024 20:39:48 +0200
Subject: [PATCH 2/5] Update to Bevy 0.14 rc 3

---
 Cargo.toml                    |  4 +-
 examples/basic.rs             |  2 +-
 examples/channel_control.rs   |  2 +-
 examples/dynamic_channels.rs  |  2 +-
 examples/instance_control.rs  |  2 +-
 examples/multiple_channels.rs | 82 +++++++++++++++++------------------
 examples/spatial.rs           |  6 +--
 examples/status.rs            | 10 ++---
 examples/stress_test.rs       |  2 +-
 9 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 59b71eb..090ee41 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,7 +22,7 @@ wav = ["kira/wav"]
 settings_loader = ["dep:ron", "dep:serde", "kira/serde"]
 
 [dependencies]
-bevy = { version = "0.14.0-rc.2", default-features = false, features = ["bevy_asset"] }
+bevy = { version = "0.14.0-rc.3", default-features = false, features = ["bevy_asset"] }
 anyhow = "1.0"
 uuid = { version = "1", features = ["fast-rng"] }
 kira = { version = "0.8", default-features = false, features = ["cpal"] }
@@ -32,7 +32,7 @@ parking_lot = "0.12"
 thiserror = "1.0"
 
 [dev-dependencies.bevy]
-version = "0.14.0-rc.2"
+version = "0.14.0-rc.3"
 default-features = false
 features = [
     "bevy_asset",
diff --git a/examples/basic.rs b/examples/basic.rs
index 97dd5e5..740bc50 100644
--- a/examples/basic.rs
+++ b/examples/basic.rs
@@ -5,7 +5,7 @@ fn main() {
     App::new()
         .add_plugins((DefaultPlugins, AudioPlugin))
         .add_systems(Startup, play_loop)
-        .run()
+        .run();
 }
 
 // `Audio` is an alias for `AudioChannel<MainTrack>`, which is the default channel added by the audio plugin
diff --git a/examples/channel_control.rs b/examples/channel_control.rs
index 59e9588..bf0cf8c 100644
--- a/examples/channel_control.rs
+++ b/examples/channel_control.rs
@@ -12,7 +12,7 @@ fn main() {
         .add_plugins((DefaultPlugins, AudioPlugin))
         .add_systems(Startup, play_loop)
         .add_systems(Update, channel_control)
-        .run()
+        .run();
 }
 
 fn channel_control(input: Res<ButtonInput<MouseButton>>, audio: Res<Audio>) {
diff --git a/examples/dynamic_channels.rs b/examples/dynamic_channels.rs
index 63d380b..0051390 100644
--- a/examples/dynamic_channels.rs
+++ b/examples/dynamic_channels.rs
@@ -8,7 +8,7 @@ fn main() {
         .add_plugins((DefaultPlugins, AudioPlugin))
         .add_systems(Startup, start_background_audio)
         .add_systems(Update, plop)
-        .run()
+        .run();
 }
 
 fn start_background_audio(
diff --git a/examples/instance_control.rs b/examples/instance_control.rs
index 9e11115..031cccd 100644
--- a/examples/instance_control.rs
+++ b/examples/instance_control.rs
@@ -9,7 +9,7 @@ fn main() {
         .add_plugins((DefaultPlugins, AudioPlugin))
         .add_systems(Startup, play_loop)
         .add_systems(Update, instance_control)
-        .run()
+        .run();
 }
 
 fn instance_control(
diff --git a/examples/multiple_channels.rs b/examples/multiple_channels.rs
index aca596c..c9aa6af 100644
--- a/examples/multiple_channels.rs
+++ b/examples/multiple_channels.rs
@@ -36,16 +36,16 @@ fn play_pause_button<T: Component + Default>(
     mut channel_state: ResMut<ChannelAudioState<T>>,
     time: Res<Time>,
     mut last_action: ResMut<LastAction>,
-    mut interaction_query: Query<(&Interaction, &mut BackgroundColor), With<PlayPauseButton<T>>>,
+    mut interaction_query: Query<(&Interaction, &mut UiImage), With<PlayPauseButton<T>>>,
     mut play_pause_text: Query<&mut Text, With<PlayPauseButton<T>>>,
 ) {
-    let (interaction, mut color) = interaction_query.single_mut();
-    *color = if channel_state.stopped {
-        DISABLED_BUTTON.into()
+    let (interaction, mut image) = interaction_query.single_mut();
+    image.color = if channel_state.stopped {
+        DISABLED_BUTTON
     } else if interaction == &Interaction::Hovered {
-        HOVERED_BUTTON.into()
+        HOVERED_BUTTON
     } else {
-        NORMAL_BUTTON.into()
+        NORMAL_BUTTON
     };
     let mut text = play_pause_text.single_mut();
     text.sections.first_mut().unwrap().value = if channel_state.paused {
@@ -74,15 +74,15 @@ fn stop_button<T: Component + Default>(
     time: Res<Time>,
     mut last_action: ResMut<LastAction>,
     mut channel_state: ResMut<ChannelAudioState<T>>,
-    mut interaction_query: Query<(&Interaction, &mut BackgroundColor), With<StopButton<T>>>,
+    mut interaction_query: Query<(&Interaction, &mut UiImage), With<StopButton<T>>>,
 ) {
-    let (interaction, mut color) = interaction_query.single_mut();
-    *color = if channel_state.stopped {
-        DISABLED_BUTTON.into()
+    let (interaction, mut image) = interaction_query.single_mut();
+    image.color = if channel_state.stopped {
+        DISABLED_BUTTON
     } else if interaction == &Interaction::Hovered {
-        HOVERED_BUTTON.into()
+        HOVERED_BUTTON
     } else {
-        NORMAL_BUTTON.into()
+        NORMAL_BUTTON
     };
     if channel_state.stopped {
         return;
@@ -102,17 +102,17 @@ fn loop_button<T: Component + Default>(
     mut last_action: ResMut<LastAction>,
     mut channel_state: ResMut<ChannelAudioState<T>>,
     audio_handles: Res<AudioHandles>,
-    mut interaction_query: Query<(&Interaction, &mut BackgroundColor), With<StartLoopButton<T>>>,
+    mut interaction_query: Query<(&Interaction, &mut UiImage), With<StartLoopButton<T>>>,
 ) {
-    let (interaction, mut color) = interaction_query.single_mut();
-    *color = if !channel_state.loop_started {
+    let (interaction, mut image) = interaction_query.single_mut();
+    image.color = if !channel_state.loop_started {
         if interaction == &Interaction::Hovered {
-            HOVERED_BUTTON.into()
+            HOVERED_BUTTON
         } else {
-            NORMAL_BUTTON.into()
+            NORMAL_BUTTON
         }
     } else {
-        DISABLED_BUTTON.into()
+        DISABLED_BUTTON
     };
     if channel_state.loop_started {
         return;
@@ -133,13 +133,13 @@ fn play_sound_button<T: Component + Default>(
     mut last_action: ResMut<LastAction>,
     mut channel_state: ResMut<ChannelAudioState<T>>,
     audio_handles: Res<AudioHandles>,
-    mut interaction_query: Query<(&Interaction, &mut BackgroundColor), With<PlaySoundButton<T>>>,
+    mut interaction_query: Query<(&Interaction, &mut UiImage), With<PlaySoundButton<T>>>,
 ) {
-    let (interaction, mut color) = interaction_query.single_mut();
-    *color = if interaction == &Interaction::Hovered {
-        HOVERED_BUTTON.into()
+    let (interaction, mut image) = interaction_query.single_mut();
+    image.color = if interaction == &Interaction::Hovered {
+        HOVERED_BUTTON
     } else {
-        NORMAL_BUTTON.into()
+        NORMAL_BUTTON
     };
     if interaction == &Interaction::Pressed {
         if !last_action.action(&time) {
@@ -156,13 +156,13 @@ fn volume_buttons<T: Component + Default>(
     time: Res<Time>,
     mut last_action: ResMut<LastAction>,
     mut channel_state: ResMut<ChannelAudioState<T>>,
-    mut interaction_query: Query<(&Interaction, &mut BackgroundColor, &ChangeVolumeButton<T>)>,
+    mut interaction_query: Query<(&Interaction, &mut UiImage, &ChangeVolumeButton<T>)>,
 ) {
-    for (interaction, mut color, volume) in &mut interaction_query {
-        *color = if interaction == &Interaction::Hovered {
-            HOVERED_BUTTON.into()
+    for (interaction, mut image, volume) in &mut interaction_query {
+        image.color = if interaction == &Interaction::Hovered {
+            HOVERED_BUTTON
         } else {
-            NORMAL_BUTTON.into()
+            NORMAL_BUTTON
         };
         if interaction == &Interaction::Pressed {
             if !last_action.action(&time) {
@@ -252,9 +252,9 @@ impl<T> Default for ChannelAudioState<T> {
     }
 }
 
-const NORMAL_BUTTON: Color = Color::rgb(0.15, 0.15, 0.15);
-const HOVERED_BUTTON: Color = Color::rgb(0.25, 0.25, 0.25);
-const DISABLED_BUTTON: Color = Color::rgb(0.5, 0.5, 0.5);
+const NORMAL_BUTTON: Color = Color::linear_rgb(0.15, 0.15, 0.15);
+const HOVERED_BUTTON: Color = Color::linear_rgb(0.25, 0.25, 0.25);
+const DISABLED_BUTTON: Color = Color::linear_rgb(0.5, 0.5, 0.5);
 
 fn prepare_audio_and_ui(mut commands: Commands, asset_server: ResMut<AssetServer>) {
     let loop_handle = asset_server.load("sounds/loop.ogg");
@@ -327,7 +327,7 @@ fn build_button_row<T: Component + Default + Clone>(
                                 value: format!("Channel {}", 4 - channel_index),
                                 style: TextStyle {
                                     font_size: 20.0,
-                                    color: Color::rgb(0.9, 0.9, 0.9),
+                                    color: Color::linear_rgb(0.9, 0.9, 0.9),
                                     font: font.clone(),
                                 },
                             }],
@@ -339,28 +339,28 @@ fn build_button_row<T: Component + Default + Clone>(
             spawn_button(
                 parent,
                 "Sound",
-                DISABLED_BUTTON.into(),
+                DISABLED_BUTTON,
                 PlaySoundButton::<T>::default(),
                 font.clone(),
             );
             spawn_button(
                 parent,
                 "Loop",
-                DISABLED_BUTTON.into(),
+                DISABLED_BUTTON,
                 StartLoopButton::<T>::default(),
                 font.clone(),
             );
             spawn_button(
                 parent,
                 "Pause",
-                DISABLED_BUTTON.into(),
+                DISABLED_BUTTON,
                 PlayPauseButton::<T>::default(),
                 font.clone(),
             );
             spawn_button(
                 parent,
                 "Vol. up",
-                NORMAL_BUTTON.into(),
+                NORMAL_BUTTON,
                 ChangeVolumeButton::<T> {
                     louder: true,
                     _marker: PhantomData,
@@ -370,7 +370,7 @@ fn build_button_row<T: Component + Default + Clone>(
             spawn_button(
                 parent,
                 "Vol. down",
-                NORMAL_BUTTON.into(),
+                NORMAL_BUTTON,
                 ChangeVolumeButton::<T> {
                     louder: false,
                     _marker: PhantomData,
@@ -380,7 +380,7 @@ fn build_button_row<T: Component + Default + Clone>(
             spawn_button(
                 parent,
                 "Stop",
-                DISABLED_BUTTON.into(),
+                DISABLED_BUTTON,
                 StopButton::<T>::default(),
                 font.clone(),
             );
@@ -390,7 +390,7 @@ fn build_button_row<T: Component + Default + Clone>(
 fn spawn_button<T: Component + Clone>(
     parent: &mut ChildBuilder,
     text: &str,
-    background_color: BackgroundColor,
+    color: Color,
     marker: T,
     font: Handle<Font>,
 ) {
@@ -404,7 +404,7 @@ fn spawn_button<T: Component + Clone>(
                 align_items: AlignItems::Center,
                 ..Default::default()
             },
-            background_color,
+            image: UiImage::default().with_color(color),
             ..Default::default()
         })
         .insert(marker.clone())
@@ -416,7 +416,7 @@ fn spawn_button<T: Component + Clone>(
                             value: text.to_string(),
                             style: TextStyle {
                                 font_size: 20.0,
-                                color: Color::rgb(0.9, 0.9, 0.9),
+                                color: Color::linear_rgb(0.9, 0.9, 0.9),
                                 font: font.clone(),
                             },
                         }],
diff --git a/examples/spatial.rs b/examples/spatial.rs
index 559c71b..5c4332d 100644
--- a/examples/spatial.rs
+++ b/examples/spatial.rs
@@ -9,7 +9,7 @@ fn main() {
         .insert_resource(SpatialAudio { max_distance: 25. })
         .add_plugins((DefaultPlugins, AudioPlugin, CameraPlugin))
         .add_systems(Startup, setup)
-        .run()
+        .run();
 }
 
 fn setup(
@@ -73,7 +73,7 @@ fn setup(
                 style: TextStyle {
                     font: asset_server.load("fonts/monogram.ttf"),
                     font_size: 40.0,
-                    color: Color::rgb(0.9, 0.9, 0.9),
+                    color: Color::linear_rgb(0.9, 0.9, 0.9),
                 },
             }],
             ..default()
@@ -88,7 +88,7 @@ fn setup(
         mesh: meshes.add(Cuboid {
             half_size: Vec3::new(25., 0., 25.),
         }),
-        material: materials.add(Color::DARK_GREEN),
+        material: materials.add(StandardMaterial::from_color(LinearRgba::GREEN)),
         ..default()
     });
 }
diff --git a/examples/status.rs b/examples/status.rs
index 527187c..78b7b1e 100644
--- a/examples/status.rs
+++ b/examples/status.rs
@@ -59,7 +59,7 @@ fn display_help_text(mut commands: Commands, asset_server: Res<AssetServer>) {
                 align_items: AlignItems::Center,
                 ..Default::default()
             },
-            background_color: Color::rgba(0., 0., 0., 0.).into(),
+            background_color: Color::linear_rgba(0., 0., 0., 0.).into(),
             ..Default::default()
         })
         .with_children(|parent| {
@@ -71,7 +71,7 @@ fn display_help_text(mut commands: Commands, asset_server: Res<AssetServer>) {
                             style: TextStyle {
                                 font: monogram.clone(),
                                 font_size: 40.0,
-                                color: Color::rgb(0.9, 0.9, 0.9),
+                                color: Color::linear_rgb(0.9, 0.9, 0.9),
                             },
                         },
                         TextSection {
@@ -79,7 +79,7 @@ fn display_help_text(mut commands: Commands, asset_server: Res<AssetServer>) {
                             style: TextStyle {
                                 font: monogram.clone(),
                                 font_size: 40.0,
-                                color: Color::rgb(0.9, 0.9, 0.9),
+                                color: Color::linear_rgb(0.9, 0.9, 0.9),
                             },
                         },
                         TextSection {
@@ -87,7 +87,7 @@ fn display_help_text(mut commands: Commands, asset_server: Res<AssetServer>) {
                             style: TextStyle {
                                 font: monogram.clone(),
                                 font_size: 40.0,
-                                color: Color::rgb(0.9, 0.9, 0.9),
+                                color: Color::linear_rgb(0.9, 0.9, 0.9),
                             },
                         },
                         TextSection {
@@ -95,7 +95,7 @@ fn display_help_text(mut commands: Commands, asset_server: Res<AssetServer>) {
                             style: TextStyle {
                                 font: monogram.clone(),
                                 font_size: 40.0,
-                                color: Color::rgb(0.9, 0.9, 0.9),
+                                color: Color::linear_rgb(0.9, 0.9, 0.9),
                             },
                         },
                     ],
diff --git a/examples/stress_test.rs b/examples/stress_test.rs
index aa608bc..951dc58 100644
--- a/examples/stress_test.rs
+++ b/examples/stress_test.rs
@@ -21,7 +21,7 @@ fn main() {
         .add_plugins((DefaultPlugins, AudioPlugin))
         .add_systems(Startup, prepare)
         .add_systems(Update, (check, play))
-        .run()
+        .run();
 }
 
 #[derive(Resource)]

From 634541eea0c389abe4223552538d34d68c46f7e4 Mon Sep 17 00:00:00 2001
From: Niklas Eicker <git@nikl.me>
Date: Mon, 17 Jun 2024 20:40:49 +0200
Subject: [PATCH 3/5] Publish rc

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 090ee41..bfccba5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_kira_audio"
-version = "0.19.0"
+version = "0.20.0-rc.1"
 authors = ["Niklas Eicker <hello@nikl.me>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"

From b73042cf5505943edcbb15282ada5138ab033b6f Mon Sep 17 00:00:00 2001
From: Niklas Eicker <git@nikl.me>
Date: Mon, 17 Jun 2024 20:47:40 +0200
Subject: [PATCH 4/5] Fix tests

---
 src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index bd13286..c6ed3d5 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -27,7 +27,7 @@
 //! }
 //!
 //! # fn stop(mut events: EventWriter<AppExit>) {
-//! #     events.send(AppExit);
+//! #     events.send(AppExit::Success);
 //! # }
 //! ```
 
@@ -131,7 +131,7 @@ pub use instance::AudioInstanceAssetsExt;
 /// }
 ///
 /// # fn stop(mut events: EventWriter<AppExit>) {
-/// #     events.send(AppExit);
+/// #     events.send(AppExit::Success);
 /// # }
 /// ```
 #[derive(Default)]

From 18a0710174e42a2c006f382f84b99f2e0133e84d Mon Sep 17 00:00:00 2001
From: Niklas Eicker <git@nikl.me>
Date: Thu, 4 Jul 2024 21:43:10 +0200
Subject: [PATCH 5/5] Bump to Bevy 0.14

---
 CHANGELOG.md | 3 +++
 Cargo.toml   | 6 +++---
 README.md    | 5 +++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b2b53e..c9ea6fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## v0.20.0 - 04.07.2024
+- Update to Bevy `0.14`
+
 ## v0.19.0 - 17.02.2024
 - Update to Bevy `0.13`
 
diff --git a/Cargo.toml b/Cargo.toml
index bfccba5..2cd692f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_kira_audio"
-version = "0.20.0-rc.1"
+version = "0.20.0"
 authors = ["Niklas Eicker <hello@nikl.me>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"
@@ -22,7 +22,7 @@ wav = ["kira/wav"]
 settings_loader = ["dep:ron", "dep:serde", "kira/serde"]
 
 [dependencies]
-bevy = { version = "0.14.0-rc.3", default-features = false, features = ["bevy_asset"] }
+bevy = { version = "0.14.0", default-features = false, features = ["bevy_asset"] }
 anyhow = "1.0"
 uuid = { version = "1", features = ["fast-rng"] }
 kira = { version = "0.8", default-features = false, features = ["cpal"] }
@@ -32,7 +32,7 @@ parking_lot = "0.12"
 thiserror = "1.0"
 
 [dev-dependencies.bevy]
-version = "0.14.0-rc.3"
+version = "0.14.0"
 default-features = false
 features = [
     "bevy_asset",
diff --git a/README.md b/README.md
index d604e05..8a7a29c 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Sound can be played in channels. Each channel has controls to pause or stop play
 
 ## Usage
 
-*Note: the Bevy feature `bevy_audio` is enabled by default and not compatible with this plugin. Make sure to not have the `bevy_audio` feature enabled if you want to use `bevy_kira_audio`. The same goes for Bevy's `vorbis` feature. See [Bevys' Cargo file][bevy_default_features] for a list of all default features of version `0.12` and list them manually in your Cargo file excluding the ones you do not want. Make sure to set `default-features` to `false` for the Bevy dependency. You can take a look at [bevy_game_template's cargo file as an example](https://github.com/NiklasEi/bevy_game_template/blob/main/Cargo.toml).*
+*Note: the Bevy feature `bevy_audio` is enabled by default and not compatible with this plugin. Make sure to not have the `bevy_audio` feature enabled if you want to use `bevy_kira_audio`. The same goes for Bevy's `vorbis` feature. See [Bevys' Cargo file][bevy_default_features] for a list of all default features of version `0.14` and list them manually in your Cargo file excluding the ones you do not want. Make sure to set `default-features` to `false` for the Bevy dependency. You can take a look at [bevy_game_template's cargo file as an example](https://github.com/NiklasEi/bevy_game_template/blob/main/Cargo.toml).*
 
 
 To play audio, you usually want to load audio files as assets. This requires `AssetLoaders`. `bevy_kira_audio` comes with loaders for most common audio formats. You can enable them with the features `ogg` (enabled by default), `mp3`, `wav`, or `flac`. The following example assumes that the feature `ogg` is enabled.
@@ -91,6 +91,7 @@ Compatibility of `bevy_kira_audio` versions:
 
 | Bevy version | `bevy_kira_audio` version |
 |:-------------|:--------------------------|
+| `0.14`       | `0.20`                    |
 | `0.13`       | `0.19`                    |
 | `0.12`       | `0.18`                    |
 | `0.11`       | `0.16` - `0.17`           |
@@ -124,4 +125,4 @@ additional terms or conditions.
 
 
 [kira]: https://github.com/tesselode/kira
-[bevy_default_features]: https://github.com/bevyengine/bevy/blob/v0.13.0/Cargo.toml#L55-L80
+[bevy_default_features]: https://github.com/bevyengine/bevy/blob/v0.14.0/Cargo.toml#L56-L86