From 64f9eae22d6ca54188362565104a7aa0a59ee437 Mon Sep 17 00:00:00 2001
From: Niklas Eicker <git@nikl.me>
Date: Thu, 24 Oct 2024 19:42:39 +0200
Subject: [PATCH 1/5] Update to bevy 0.15 rc1

---
 CHANGELOG.md                  |   2 +
 Cargo.toml                    |   8 +--
 examples/multiple_channels.rs | 101 ++++++++++++++--------------------
 examples/spatial.rs           |  87 +++++++++++------------------
 examples/status.rs            |  63 +++++----------------
 examples/stress_test.rs       |   7 ++-
 src/source/flac_loader.rs     |  12 ++--
 src/source/mp3_loader.rs      |  12 ++--
 src/source/ogg_loader.rs      |  12 ++--
 src/source/settings_loader.rs |  12 ++--
 src/source/wav_loader.rs      |  12 ++--
 11 files changed, 129 insertions(+), 199 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83b1e7c..01c9f6f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+- Update to Bevy `0.15`
+
 ## v0.20.0 - 04.07.2024
 - Update to Bevy `0.14`
 - Asset loaders are now public
diff --git a/Cargo.toml b/Cargo.toml
index 2cd692f..33b0f46 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_kira_audio"
-version = "0.20.0"
+version = "0.21.0-rc.1"
 authors = ["Niklas Eicker <hello@nikl.me>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"
@@ -22,17 +22,17 @@ wav = ["kira/wav"]
 settings_loader = ["dep:ron", "dep:serde", "kira/serde"]
 
 [dependencies]
-bevy = { version = "0.14.0", default-features = false, features = ["bevy_asset"] }
+bevy = { version = "0.15.0-rc.1", default-features = false, features = ["bevy_asset"] }
 anyhow = "1.0"
 uuid = { version = "1", features = ["fast-rng"] }
-kira = { version = "0.8", default-features = false, features = ["cpal"] }
+kira = { version = "0.8.7", default-features = false, features = ["cpal"] }
 ron = { version = "0.8", optional = true }
 serde = { version = "1.0", features = ["derive"], optional = true }
 parking_lot = "0.12"
 thiserror = "1.0"
 
 [dev-dependencies.bevy]
-version = "0.14.0"
+version = "0.15.0-rc.1"
 default-features = false
 features = [
     "bevy_asset",
diff --git a/examples/multiple_channels.rs b/examples/multiple_channels.rs
index c9aa6af..bef30f2 100644
--- a/examples/multiple_channels.rs
+++ b/examples/multiple_channels.rs
@@ -37,7 +37,7 @@ fn play_pause_button<T: Component + Default>(
     time: Res<Time>,
     mut last_action: ResMut<LastAction>,
     mut interaction_query: Query<(&Interaction, &mut UiImage), With<PlayPauseButton<T>>>,
-    mut play_pause_text: Query<&mut Text, With<PlayPauseButton<T>>>,
+    mut play_pause_text: Query<&mut TextSpan, With<PlayPauseButton<T>>>,
 ) {
     let (interaction, mut image) = interaction_query.single_mut();
     image.color = if channel_state.stopped {
@@ -48,7 +48,7 @@ fn play_pause_button<T: Component + Default>(
         NORMAL_BUTTON
     };
     let mut text = play_pause_text.single_mut();
-    text.sections.first_mut().unwrap().value = if channel_state.paused {
+    text.0 = if channel_state.paused {
         "Play".to_owned()
     } else {
         "Pause".to_owned()
@@ -183,10 +183,10 @@ struct LastAction(f64);
 
 impl LastAction {
     fn action(&mut self, time: &Time) -> bool {
-        if time.elapsed_seconds_f64() - self.0 < 0.2 {
+        if time.elapsed_secs_f64() - self.0 < 0.2 {
             return false;
         }
-        self.0 = time.elapsed_seconds_f64();
+        self.0 = time.elapsed_secs_f64();
 
         true
     }
@@ -273,16 +273,13 @@ fn prepare_audio_and_ui(mut commands: Commands, asset_server: ResMut<AssetServer
 
 fn set_up_ui(commands: &mut Commands, asset_server: ResMut<AssetServer>) {
     let font = asset_server.load("fonts/monogram.ttf");
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
     commands
-        .spawn(NodeBundle {
-            style: Style {
-                display: Display::Flex,
-                flex_direction: FlexDirection::Column,
-                width: Val::Percent(100.),
-                height: Val::Percent(100.),
-                ..Default::default()
-            },
+        .spawn(Node {
+            display: Display::Flex,
+            flex_direction: FlexDirection::Column,
+            width: Val::Percent(100.),
+            height: Val::Percent(100.),
             ..Default::default()
         })
         .with_children(|parent| {
@@ -298,43 +295,32 @@ fn build_button_row<T: Component + Default + Clone>(
     channel_index: u8,
 ) {
     parent
-        .spawn(NodeBundle {
-            style: Style {
-                display: Display::Flex,
-                flex_direction: FlexDirection::Row,
-                width: Val::Percent(100.),
-                height: Val::Percent(33.3),
-                ..Default::default()
-            },
+        .spawn(Node {
+            display: Display::Flex,
+            flex_direction: FlexDirection::Row,
+            width: Val::Percent(100.),
+            height: Val::Percent(33.3),
             ..Default::default()
         })
         .with_children(|parent| {
             parent
-                .spawn(NodeBundle {
-                    style: Style {
-                        width: Val::Px(120.0),
-                        height: Val::Percent(100.),
-                        justify_content: JustifyContent::Center,
-                        align_items: AlignItems::Center,
-                        ..Default::default()
-                    },
+                .spawn(Node {
+                    width: Val::Px(120.0),
+                    height: Val::Percent(100.),
+                    justify_content: JustifyContent::Center,
+                    align_items: AlignItems::Center,
                     ..Default::default()
                 })
                 .with_children(|parent| {
-                    parent.spawn(TextBundle {
-                        text: Text {
-                            sections: vec![TextSection {
-                                value: format!("Channel {}", 4 - channel_index),
-                                style: TextStyle {
-                                    font_size: 20.0,
-                                    color: Color::linear_rgb(0.9, 0.9, 0.9),
-                                    font: font.clone(),
-                                },
-                            }],
+                    parent.spawn((
+                        Text::new(format!("Channel {}", 4 - channel_index)),
+                        TextFont {
+                            font: font.clone(),
+                            font_size: 20.0,
                             ..Default::default()
                         },
-                        ..Default::default()
-                    });
+                        TextColor(Color::linear_rgb(0.9, 0.9, 0.9)),
+                    ));
                 });
             spawn_button(
                 parent,
@@ -395,8 +381,8 @@ fn spawn_button<T: Component + Clone>(
     font: Handle<Font>,
 ) {
     parent
-        .spawn(ButtonBundle {
-            style: Style {
+        .spawn((
+            Node {
                 width: Val::Px(100.0),
                 height: Val::Px(65.0),
                 margin: UiRect::all(Val::Auto),
@@ -404,27 +390,22 @@ fn spawn_button<T: Component + Clone>(
                 align_items: AlignItems::Center,
                 ..Default::default()
             },
-            image: UiImage::default().with_color(color),
-            ..Default::default()
-        })
+            UiImage::default().with_color(color),
+            Button,
+        ))
         .insert(marker.clone())
         .with_children(|parent| {
             parent
-                .spawn(TextBundle {
-                    text: Text {
-                        sections: vec![TextSection {
-                            value: text.to_string(),
-                            style: TextStyle {
-                                font_size: 20.0,
-                                color: Color::linear_rgb(0.9, 0.9, 0.9),
-                                font: font.clone(),
-                            },
-                        }],
-                        justify: JustifyText::Center,
+                .spawn((
+                    Text::new(String::new()),
+                    TextFont {
+                        font: font.clone(),
+                        font_size: 20.0,
                         ..Default::default()
                     },
-                    ..Default::default()
-                })
-                .insert(marker);
+                    TextColor(Color::linear_rgb(0.9, 0.9, 0.9)),
+                    TextLayout::new_with_justify(JustifyText::Center),
+                ))
+                .with_child((TextSpan::new(text), marker));
         });
 }
diff --git a/examples/spatial.rs b/examples/spatial.rs
index 5c4332d..09375f8 100644
--- a/examples/spatial.rs
+++ b/examples/spatial.rs
@@ -1,4 +1,3 @@
-use bevy::ecs::event::ManualEventReader;
 use bevy::input::mouse::MouseMotion;
 use bevy::prelude::*;
 use bevy::window::{CursorGrabMode, PrimaryWindow};
@@ -25,11 +24,10 @@ fn setup(
         .looped()
         .handle();
     commands
-        .spawn(SceneBundle {
-            scene: asset_server.load("models/panStew.glb#Scene0"),
-            transform: Transform::from_xyz(-5.0, 0., 0.),
-            ..default()
-        })
+        .spawn((
+            SceneRoot(asset_server.load("models/panStew.glb#Scene0")),
+            Transform::from_xyz(-5.0, 0., 0.),
+        ))
         .insert(AudioEmitter {
             instances: vec![cooking],
         });
@@ -39,58 +37,40 @@ fn setup(
         .looped()
         .handle();
     commands
-        .spawn(SceneBundle {
-            scene: asset_server.load("models/boxOpen.glb#Scene0"),
-            transform: Transform::from_xyz(10., 0., 0.),
-            ..default()
-        })
+        .spawn((
+            SceneRoot(asset_server.load("models/boxOpen.glb#Scene0")),
+            Transform::from_xyz(10., 0., 0.),
+        ))
         .insert(AudioEmitter {
             instances: vec![elevator_music],
         });
     // Our camera will be the receiver
     commands
-        .spawn(Camera3dBundle {
-            transform: Transform::from_xyz(0.0, 0.5, 10.0),
-            ..default()
-        })
+        .spawn((Camera3d::default(), Transform::from_xyz(0.0, 0.5, 10.0)))
         .insert(AudioReceiver)
         .insert(FlyCam);
 
     // Other scene setup...
-    commands.spawn(PointLightBundle {
-        point_light: PointLight {
+    commands.spawn((
+        PointLight {
             intensity: 1500.0,
             shadows_enabled: true,
             ..default()
         },
-        transform: Transform::from_xyz(4.0, 8.0, 4.0),
-        ..default()
-    });
-    commands.spawn( TextBundle {
-        text: Text {
-            sections: vec![TextSection {
-                value: "WASD to move horizontally\nSPACE to ascend\nLSHIFT to descend\nESC to grab/release cursor.".to_string(),
-                style: TextStyle {
-                    font: asset_server.load("fonts/monogram.ttf"),
-                    font_size: 40.0,
-                    color: Color::linear_rgb(0.9, 0.9, 0.9),
-                },
-            }],
-            ..default()
-        },
-        style: Style {
-            margin: UiRect::all(Val::Px(15.)),
-          ..default()
-        },
+        Transform::from_xyz(4.0, 8.0, 4.0),
+    ));
+    commands.spawn( (Text::new("WASD to move horizontally\nSPACE to ascend\nLSHIFT to descend\nESC to grab/release cursor."), TextFont{
+        font:asset_server.load("fonts/monogram.ttf"),
+        font_size: 40.0,
         ..default()
-    });
-    commands.spawn(PbrBundle {
-        mesh: meshes.add(Cuboid {
+    }, TextColor(Color::linear_rgb(0.9, 0.9, 0.9)),
+                    Node {margin: UiRect::all(Val::Px(15.)), ..default()}));
+    commands.spawn((
+        Mesh3d(meshes.add(Cuboid {
             half_size: Vec3::new(25., 0., 25.),
-        }),
-        material: materials.add(StandardMaterial::from_color(LinearRgba::GREEN)),
-        ..default()
-    });
+        })),
+        MeshMaterial3d(materials.add(StandardMaterial::from_color(LinearRgba::GREEN))),
+    ));
 }
 
 // only camera handling code from here on...
@@ -141,14 +121,14 @@ fn cursor_grab(
 
 /// Grabs/ungrabs mouse cursor
 fn toggle_grab_cursor(window: &mut Window) {
-    match window.cursor.grab_mode {
+    match window.cursor_options.grab_mode {
         CursorGrabMode::None => {
-            window.cursor.grab_mode = CursorGrabMode::Confined;
-            window.cursor.visible = false;
+            window.cursor_options.grab_mode = CursorGrabMode::Confined;
+            window.cursor_options.visible = false;
         }
         _ => {
-            window.cursor.grab_mode = CursorGrabMode::None;
-            window.cursor.visible = true;
+            window.cursor_options.grab_mode = CursorGrabMode::None;
+            window.cursor_options.visible = true;
         }
     }
 }
@@ -168,7 +148,7 @@ fn player_move(
             let right = Vec3::new(local_z.z, 0., -local_z.x);
 
             for key in keys.get_pressed() {
-                match window.cursor.grab_mode {
+                match window.cursor_options.grab_mode {
                     CursorGrabMode::None => (),
                     _ => match key {
                         KeyCode::KeyW => velocity += forward,
@@ -184,7 +164,7 @@ fn player_move(
 
             velocity = velocity.normalize_or_zero();
 
-            transform.translation += velocity * time.delta_seconds() * SPEED;
+            transform.translation += velocity * time.delta_secs() * SPEED;
         }
     } else {
         warn!("Primary window not found for `player_move`!");
@@ -193,7 +173,6 @@ fn player_move(
 
 #[derive(Resource, Default)]
 struct InputState {
-    reader_motion: ManualEventReader<MouseMotion>,
     pitch: f32,
     yaw: f32,
 }
@@ -202,14 +181,14 @@ struct InputState {
 fn player_look(
     primary_window: Query<&Window, With<PrimaryWindow>>,
     mut state: ResMut<InputState>,
-    motion: Res<Events<MouseMotion>>,
+    mut motion: EventReader<MouseMotion>,
     mut query: Query<&mut Transform, With<FlyCam>>,
 ) {
     if let Ok(window) = primary_window.get_single() {
         let delta_state = state.as_mut();
         for mut transform in query.iter_mut() {
-            for ev in delta_state.reader_motion.read(&motion) {
-                match window.cursor.grab_mode {
+            for ev in motion.read() {
+                match window.cursor_options.grab_mode {
                     CursorGrabMode::None => (),
                     _ => {
                         // Using smallest of height or width ensures equal vertical and horizontal sensitivity
diff --git a/examples/status.rs b/examples/status.rs
index 78b7b1e..6b4099a 100644
--- a/examples/status.rs
+++ b/examples/status.rs
@@ -49,60 +49,25 @@ fn print_status(audio: Res<Audio>, loop_audio: Res<LoopAudioInstanceHandle>) {
 
 fn display_help_text(mut commands: Commands, asset_server: Res<AssetServer>) {
     let monogram = asset_server.load("fonts/monogram.ttf");
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
     commands
-        .spawn(NodeBundle {
-            style: Style {
+        .spawn(Node {
                 width: Val::Percent(100.),
                 height: Val::Percent(100.),
                 justify_content: JustifyContent::Center,
                 align_items: AlignItems::Center,
                 ..Default::default()
-            },
-            background_color: Color::linear_rgba(0., 0., 0., 0.).into(),
-            ..Default::default()
         })
-        .with_children(|parent| {
-            parent.spawn(TextBundle {
-                text: Text {
-                    sections: vec![
-                        TextSection {
-                            value: "Press 'P' to pause\n".to_string(),
-                            style: TextStyle {
-                                font: monogram.clone(),
-                                font_size: 40.0,
-                                color: Color::linear_rgb(0.9, 0.9, 0.9),
-                            },
-                        },
-                        TextSection {
-                            value: "Press 'R' to resume\n".to_string(),
-                            style: TextStyle {
-                                font: monogram.clone(),
-                                font_size: 40.0,
-                                color: Color::linear_rgb(0.9, 0.9, 0.9),
-                            },
-                        },
-                        TextSection {
-                            value: "Press 'S' to stop\n\n".to_string(),
-                            style: TextStyle {
-                                font: monogram.clone(),
-                                font_size: 40.0,
-                                color: Color::linear_rgb(0.9, 0.9, 0.9),
-                            },
-                        },
-                        TextSection {
-                            value: "Check your console for the audio state".to_string(),
-                            style: TextStyle {
-                                font: monogram.clone(),
-                                font_size: 40.0,
-                                color: Color::linear_rgb(0.9, 0.9, 0.9),
-                            },
-                        },
-                    ],
-                    justify: JustifyText::Center,
-                    ..Default::default()
-                },
-                ..Default::default()
-            });
-        });
+        .with_child((Text("Press 'P' to pause\nPress 'R' to resume\nPress 'S' to stop\n\nCheck your console for the audio state".to_owned()),
+            TextFont {
+                font: monogram.clone(),
+                font_size: 40.0,
+                ..default()
+            },
+                TextColor(Color::linear_rgb(0.9, 0.9, 0.9)),
+                TextLayout {
+                    justify:JustifyText::Center,
+                    ..default()
+                }
+            ));
 }
diff --git a/examples/stress_test.rs b/examples/stress_test.rs
index 951dc58..822b488 100644
--- a/examples/stress_test.rs
+++ b/examples/stress_test.rs
@@ -1,4 +1,3 @@
-use bevy::asset::LoadState;
 use bevy::prelude::*;
 use bevy_kira_audio::prelude::*;
 
@@ -43,7 +42,11 @@ fn check(
     mut commands: Commands,
 ) {
     if let Some(handle) = handle {
-        if asset_server.get_load_state(handle.0.id()) == Some(LoadState::Loaded) {
+        if asset_server
+            .get_load_state(handle.0.id())
+            .map(|state| state.is_loaded())
+            .unwrap_or(false)
+        {
             commands.insert_resource(AudioHandle(handle.0.clone()));
             commands.remove_resource::<LoadingAudioHandle>();
         }
diff --git a/src/source/flac_loader.rs b/src/source/flac_loader.rs
index bd092a2..7a81beb 100644
--- a/src/source/flac_loader.rs
+++ b/src/source/flac_loader.rs
@@ -1,6 +1,6 @@
 use anyhow::Result;
 use bevy::asset::io::Reader;
-use bevy::asset::{AssetLoader, AsyncReadExt, LoadContext};
+use bevy::asset::{AssetLoader, LoadContext};
 use kira::sound::static_sound::{StaticSoundData, StaticSoundSettings};
 use kira::sound::FromFileError;
 use std::io::Cursor;
@@ -29,11 +29,11 @@ impl AssetLoader for FlacLoader {
     type Settings = ();
     type Error = FlacLoaderError;
 
-    async fn load<'a>(
-        &'a self,
-        reader: &'a mut Reader<'_>,
-        _settings: &'a (),
-        _load_context: &'a mut LoadContext<'_>,
+    async fn load(
+        &self,
+        reader: &mut dyn Reader,
+        _settings: &(),
+        _load_context: &mut LoadContext<'_>,
     ) -> Result<Self::Asset, Self::Error> {
         let mut sound_bytes = vec![];
         reader.read_to_end(&mut sound_bytes).await?;
diff --git a/src/source/mp3_loader.rs b/src/source/mp3_loader.rs
index 428186f..2c91c2f 100644
--- a/src/source/mp3_loader.rs
+++ b/src/source/mp3_loader.rs
@@ -1,6 +1,6 @@
 use anyhow::Result;
 use bevy::asset::io::Reader;
-use bevy::asset::{AssetLoader, AsyncReadExt, LoadContext};
+use bevy::asset::{AssetLoader, LoadContext};
 use kira::sound::static_sound::{StaticSoundData, StaticSoundSettings};
 use kira::sound::FromFileError;
 use std::io::Cursor;
@@ -29,11 +29,11 @@ impl AssetLoader for Mp3Loader {
     type Settings = ();
     type Error = Mp3LoaderError;
 
-    async fn load<'a>(
-        &'a self,
-        reader: &'a mut Reader<'_>,
-        _settings: &'a (),
-        _load_context: &'a mut LoadContext<'_>,
+    async fn load(
+        &self,
+        reader: &mut dyn Reader,
+        _settings: &(),
+        _load_context: &mut LoadContext<'_>,
     ) -> Result<Self::Asset, Self::Error> {
         let mut sound_bytes = vec![];
         reader.read_to_end(&mut sound_bytes).await?;
diff --git a/src/source/ogg_loader.rs b/src/source/ogg_loader.rs
index e0cae6d..2c17471 100644
--- a/src/source/ogg_loader.rs
+++ b/src/source/ogg_loader.rs
@@ -1,6 +1,6 @@
 use anyhow::Result;
 use bevy::asset::io::Reader;
-use bevy::asset::{AssetLoader, AsyncReadExt, LoadContext};
+use bevy::asset::{AssetLoader, LoadContext};
 use kira::sound::static_sound::{StaticSoundData, StaticSoundSettings};
 use kira::sound::FromFileError;
 use std::io::Cursor;
@@ -29,11 +29,11 @@ impl AssetLoader for OggLoader {
     type Settings = ();
     type Error = OggLoaderError;
 
-    async fn load<'a>(
-        &'a self,
-        reader: &'a mut Reader<'_>,
-        _settings: &'a (),
-        _load_context: &'a mut LoadContext<'_>,
+    async fn load(
+        &self,
+        reader: &mut dyn Reader,
+        _settings: &(),
+        _load_context: &mut LoadContext<'_>,
     ) -> Result<Self::Asset, Self::Error> {
         let mut sound_bytes = vec![];
         reader.read_to_end(&mut sound_bytes).await?;
diff --git a/src/source/settings_loader.rs b/src/source/settings_loader.rs
index c036106..67b0046 100644
--- a/src/source/settings_loader.rs
+++ b/src/source/settings_loader.rs
@@ -2,7 +2,7 @@ use std::time::Duration;
 use std::{io::Cursor, path::PathBuf};
 
 use bevy::asset::io::Reader;
-use bevy::asset::{AssetLoader, AsyncReadExt, LoadContext, ReadAssetBytesError};
+use bevy::asset::{AssetLoader, LoadContext, ReadAssetBytesError};
 use kira::sound::static_sound::{StaticSoundData, StaticSoundSettings};
 use kira::sound::{EndPosition, FromFileError, PlaybackPosition, PlaybackRate, Region};
 use kira::tween::Tween;
@@ -127,11 +127,11 @@ impl AssetLoader for SettingsLoader {
     type Settings = ();
     type Error = SettingsLoaderError;
 
-    async fn load<'a>(
-        &'a self,
-        reader: &'a mut Reader<'_>,
-        _settings: &'a (),
-        load_context: &'a mut LoadContext<'_>,
+    async fn load(
+        &self,
+        reader: &mut dyn Reader,
+        _settings: &(),
+        load_context: &mut LoadContext<'_>,
     ) -> Result<Self::Asset, Self::Error> {
         let mut bytes = Vec::new();
         reader.read_to_end(&mut bytes).await?;
diff --git a/src/source/wav_loader.rs b/src/source/wav_loader.rs
index 96bf766..b8130fb 100644
--- a/src/source/wav_loader.rs
+++ b/src/source/wav_loader.rs
@@ -1,6 +1,6 @@
 use anyhow::Result;
 use bevy::asset::io::Reader;
-use bevy::asset::{AssetLoader, AsyncReadExt, LoadContext};
+use bevy::asset::{AssetLoader, LoadContext};
 use kira::sound::static_sound::{StaticSoundData, StaticSoundSettings};
 use kira::sound::FromFileError;
 use std::io::Cursor;
@@ -29,11 +29,11 @@ impl AssetLoader for WavLoader {
     type Settings = ();
     type Error = WavLoaderError;
 
-    async fn load<'a>(
-        &'a self,
-        reader: &'a mut Reader<'_>,
-        _settings: &'a (),
-        _load_context: &'a mut LoadContext<'_>,
+    async fn load(
+        &self,
+        reader: &mut dyn Reader,
+        _settings: &(),
+        _load_context: &mut LoadContext<'_>,
     ) -> Result<Self::Asset, Self::Error> {
         let mut sound_bytes = vec![];
         reader.read_to_end(&mut sound_bytes).await?;

From e50a2eefa0ea5a6b58aeaa2ead5ca960509acf3c Mon Sep 17 00:00:00 2001
From: Niklas Eicker <git@nikl.me>
Date: Sat, 30 Nov 2024 00:11:31 +0100
Subject: [PATCH 2/5] Update to released bevy 0.15

---
 Cargo.toml                    | 43 ++++++++++++++++++++++++-----------
 examples/multiple_channels.rs | 12 +++++-----
 2 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 33b0f46..42cca5f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_kira_audio"
-version = "0.21.0-rc.1"
+version = "0.21.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.15.0-rc.1", default-features = false, features = ["bevy_asset"] }
+bevy = { version = "0.15.0", default-features = false, features = ["bevy_asset"] }
 anyhow = "1.0"
 uuid = { version = "1", features = ["fast-rng"] }
 kira = { version = "0.8.7", default-features = false, features = ["cpal"] }
@@ -32,24 +32,41 @@ parking_lot = "0.12"
 thiserror = "1.0"
 
 [dev-dependencies.bevy]
-version = "0.15.0-rc.1"
+version = "0.15.0"
 default-features = false
+# default features minus "bevy_audio" and "vorbis"
 features = [
+    "android-game-activity",
+    "animation",
     "bevy_asset",
-    "bevy_winit",
-    "bevy_render",
-    "x11",
-    "bevy_ui",
-    "bevy_text",
+    "bevy_color",
     "bevy_core_pipeline",
-    "bevy_sprite",
+    "bevy_gilrs",
+    "bevy_gizmos",
     "bevy_gltf",
-    "bevy_scene",
+    "bevy_mesh_picking_backend",
     "bevy_pbr",
+    "bevy_picking",
+    "bevy_render",
+    "bevy_scene",
+    "bevy_sprite",
+    "bevy_sprite_picking_backend",
+    "bevy_state",
+    "bevy_text",
+    "bevy_ui",
+    "bevy_ui_picking_backend",
+    "bevy_window",
+    "bevy_winit",
+    "custom_cursor",
+    "default_font",
+    "hdr",
+    "multi_threaded",
+    "png",
+    "smaa_luts",
+    "sysinfo_plugin",
     "tonemapping_luts",
-    "ktx2",
-    "zstd",
-    "multi_threaded"
+    "webgl2",
+    "x11",
 ]
 
 [[example]]
diff --git a/examples/multiple_channels.rs b/examples/multiple_channels.rs
index bef30f2..6a8d657 100644
--- a/examples/multiple_channels.rs
+++ b/examples/multiple_channels.rs
@@ -36,7 +36,7 @@ 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 UiImage), With<PlayPauseButton<T>>>,
+    mut interaction_query: Query<(&Interaction, &mut ImageNode), With<PlayPauseButton<T>>>,
     mut play_pause_text: Query<&mut TextSpan, With<PlayPauseButton<T>>>,
 ) {
     let (interaction, mut image) = interaction_query.single_mut();
@@ -74,7 +74,7 @@ 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 UiImage), With<StopButton<T>>>,
+    mut interaction_query: Query<(&Interaction, &mut ImageNode), With<StopButton<T>>>,
 ) {
     let (interaction, mut image) = interaction_query.single_mut();
     image.color = if channel_state.stopped {
@@ -102,7 +102,7 @@ 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 UiImage), With<StartLoopButton<T>>>,
+    mut interaction_query: Query<(&Interaction, &mut ImageNode), With<StartLoopButton<T>>>,
 ) {
     let (interaction, mut image) = interaction_query.single_mut();
     image.color = if !channel_state.loop_started {
@@ -133,7 +133,7 @@ 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 UiImage), With<PlaySoundButton<T>>>,
+    mut interaction_query: Query<(&Interaction, &mut ImageNode), With<PlaySoundButton<T>>>,
 ) {
     let (interaction, mut image) = interaction_query.single_mut();
     image.color = if interaction == &Interaction::Hovered {
@@ -156,7 +156,7 @@ 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 UiImage, &ChangeVolumeButton<T>)>,
+    mut interaction_query: Query<(&Interaction, &mut ImageNode, &ChangeVolumeButton<T>)>,
 ) {
     for (interaction, mut image, volume) in &mut interaction_query {
         image.color = if interaction == &Interaction::Hovered {
@@ -390,7 +390,7 @@ fn spawn_button<T: Component + Clone>(
                 align_items: AlignItems::Center,
                 ..Default::default()
             },
-            UiImage::default().with_color(color),
+            ImageNode::default().with_color(color),
             Button,
         ))
         .insert(marker.clone())

From 1f6ffc9846cd0f7ff418156ea4ac383b5ec69d7d Mon Sep 17 00:00:00 2001
From: Niklas Eicker <git@nikl.me>
Date: Sat, 30 Nov 2024 13:30:54 +0100
Subject: [PATCH 3/5] minimal instructions in examples

---
 examples/channel_control.rs  | 11 ++++++++++-
 examples/instance_control.rs |  7 +++++++
 examples/stress_test.rs      | 10 +++++++++-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/examples/channel_control.rs b/examples/channel_control.rs
index bf0cf8c..0308b38 100644
--- a/examples/channel_control.rs
+++ b/examples/channel_control.rs
@@ -27,7 +27,16 @@ fn channel_control(input: Res<ButtonInput<MouseButton>>, audio: Res<Audio>) {
     }
 }
 
-fn play_loop(asset_server: Res<AssetServer>, audio: Res<Audio>) {
+fn play_loop(mut commands: Commands, asset_server: Res<AssetServer>, audio: Res<Audio>) {
     audio.play(asset_server.load("sounds/loop.ogg")).looped();
     audio.play(asset_server.load("sounds/sound.ogg"));
+    commands.spawn(Camera2d);
+    commands.spawn(Text::new(
+        r#"
+    This example demonstrates how to control an audio channel
+    The audio commands have 2s linear fade in/out
+
+    Left-click to pause the audio
+    Right-click to resume the audio"#,
+    ));
 }
diff --git a/examples/instance_control.rs b/examples/instance_control.rs
index 031cccd..46be297 100644
--- a/examples/instance_control.rs
+++ b/examples/instance_control.rs
@@ -42,4 +42,11 @@ fn play_loop(mut commands: Commands, asset_server: Res<AssetServer>, audio: Res<
         .looped()
         .handle();
     commands.insert_resource(InstanceHandle(handle));
+    commands.spawn(Camera2d);
+    commands.spawn(Text::new(
+        r#"
+    This example demonstrates how to control a single audio instance
+
+    Left-click to toggle the audio"#,
+    ));
 }
diff --git a/examples/stress_test.rs b/examples/stress_test.rs
index 822b488..cdce1a7 100644
--- a/examples/stress_test.rs
+++ b/examples/stress_test.rs
@@ -33,7 +33,15 @@ fn prepare(asset_server: Res<AssetServer>, mut commands: Commands, audio: Res<Au
     // Stop our ears from exploding...
     // Playing multiple sounds in the same frame can get quite loud
     audio.set_volume(0.001);
-    commands.insert_resource(LoadingAudioHandle(asset_server.load("sounds/plop.ogg")))
+    commands.insert_resource(LoadingAudioHandle(asset_server.load("sounds/plop.ogg")));
+
+    commands.spawn(Camera2d);
+    commands.spawn(Text::new(
+        r#"
+    This is a stress test playing 100 sounds every frame
+
+    Milage may vary; be sure to run in release mode!"#,
+    ));
 }
 
 fn check(

From 0015711c90bed4744e17cd988c365957ff58275b Mon Sep 17 00:00:00 2001
From: Niklas Eicker <git@nikl.me>
Date: Sat, 30 Nov 2024 13:30:57 +0100
Subject: [PATCH 4/5] minimal instructions in examples

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01c9f6f..14c8461 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Changelog
 
+## v0.21.0 - 30.11.2024
 - Update to Bevy `0.15`
 
 ## v0.20.0 - 04.07.2024

From 3a60c3185a75b28c284face77156b24cab142960 Mon Sep 17 00:00:00 2001
From: Niklas Eicker <git@nikl.me>
Date: Sat, 30 Nov 2024 13:59:35 +0100
Subject: [PATCH 5/5] Fix new lints

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

diff --git a/src/audio.rs b/src/audio.rs
index 216c3fb..e65f632 100644
--- a/src/audio.rs
+++ b/src/audio.rs
@@ -178,7 +178,7 @@ pub struct PlayAudioCommand<'a> {
     pub(crate) que: &'a dyn AudioCommandQue,
 }
 
-impl<'a> Drop for PlayAudioCommand<'a> {
+impl Drop for PlayAudioCommand<'_> {
     fn drop(&mut self) {
         self.que.que(AudioCommand::Play(self.into()));
     }
@@ -328,7 +328,7 @@ pub struct TweenCommand<'a, Fade> {
     _marker: PhantomData<Fade>,
 }
 
-impl<'a, Fade> Drop for TweenCommand<'a, Fade> {
+impl<Fade> Drop for TweenCommand<'_, Fade> {
     fn drop(&mut self) {
         self.que.que(self.kind.to_command(self.tween.take()));
     }
@@ -345,7 +345,7 @@ impl<'a, Fade> TweenCommand<'a, Fade> {
     }
 }
 
-impl<'a> TweenCommand<'a, FadeIn> {
+impl TweenCommand<'_, FadeIn> {
     /// Set how long will the sound fade in linearly.
     pub fn linear_fade_in(&mut self, duration: Duration) -> &mut Self {
         self.tween = Some(AudioTween::linear(duration));
@@ -362,7 +362,7 @@ impl<'a> TweenCommand<'a, FadeIn> {
     }
 }
 
-impl<'a> TweenCommand<'a, FadeOut> {
+impl TweenCommand<'_, FadeOut> {
     /// Set how long will the sound fade out linearly.
     pub fn linear_fade_out(&mut self, duration: Duration) -> &mut Self {
         self.tween = Some(AudioTween::linear(duration));