Merge pull request #37 from brandon-reinhart/bevy_main

update to bevy 0.14

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## v0.11.0 - 04.07.2024
+- Update to Bevy 0.14
+
 ## v0.10.0 - 17.02.2024
 - Update to Bevy 0.13
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bevy_common_assets"
-version = "0.10.0"
+version = "0.11.0"
 authors = ["Niklas Eicker <git@nikl.me>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"
@@ -23,21 +23,21 @@ csv = ["dep:csv"]
 postcard = ["dep:postcard"]
 
 [dependencies]
-bevy = { version = "0.13", default-features = false, features = ["bevy_asset"] }
+bevy = { version = "0.14", default-features = false, features = ["bevy_asset"] }
 serde_toml = { version = "0.8", package = "toml", optional = true }
 serde_ron = { version = "0.8", package = "ron", optional = true }
 serde_yaml = { version = "0.9", optional = true }
 serde_json = { version = "1", optional = true }
 rmp-serde = { version = "1", optional = true }
 csv = { version = "1", optional = true }
 thiserror = "1.0"
-quick-xml = { version = "0.31", features = [ "serialize" ], optional = true }
+quick-xml = { version = "0.34", features = [ "serialize" ], optional = true }
 serde = { version = "1" }
 anyhow = { version = "1" }
 postcard = {version = "1.0", features = ["use-std"], optional = true}
 
 [dev-dependencies]
-bevy = { version = "0.13" }
+bevy = { version = "0.14.0-rc.4" }
 serde = { version = "1" }
 
 [package.metadata.docs.rs]

README.md

@@ -79,6 +79,7 @@ Compatibility of `bevy_common_assets` versions:
 
 | `bevy_common_assets` | `bevy` |
 |:---------------------|:-------|
+| `0.11`               | `0.14` |
 | `0.10`               | `0.13` |
 | `0.8` - `0.9`        | `0.12` |
 | `0.7`                | `0.11` |

examples/csv.rs

@@ -13,7 +13,7 @@ fn main() {
         .init_state::<AppState>()
         .add_systems(Startup, setup)
         .add_systems(Update, spawn_level.run_if(in_state(AppState::Loading)))
-        .run()
+        .run();
 }
 
 fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {

examples/json.rs

@@ -12,7 +12,7 @@ fn main() {
         .init_state::<AppState>()
         .add_systems(Startup, setup)
         .add_systems(Update, spawn_level.run_if(in_state(AppState::Loading)))
-        .run()
+        .run();
 }
 
 fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {

examples/msgpack.rs

@@ -12,7 +12,7 @@ fn main() {
         .init_state::<AppState>()
         .add_systems(Startup, setup)
         .add_systems(Update, spawn_level.run_if(in_state(AppState::Loading)))
-        .run()
+        .run();
 }
 
 fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {

examples/postcard.rs

@@ -12,7 +12,7 @@ fn main() {
         .init_state::<AppState>()
         .add_systems(Startup, setup)
         .add_systems(Update, spawn_level.run_if(in_state(AppState::Loading)))
-        .run()
+        .run();
 }
 
 fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {

examples/ron.rs

@@ -9,7 +9,7 @@ fn main() {
         .init_state::<AppState>()
         .add_systems(Startup, setup)
         .add_systems(Update, spawn_level.run_if(in_state(AppState::Loading)))
-        .run()
+        .run();
 }
 
 fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {

examples/toml.rs

@@ -12,7 +12,7 @@ fn main() {
         .init_state::<AppState>()
         .add_systems(Startup, setup)
         .add_systems(Update, spawn_level.run_if(in_state(AppState::Loading)))
-        .run()
+        .run();
 }
 
 fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {

examples/xml.rs

@@ -10,7 +10,7 @@ fn main() {
         .init_state::<AppState>()
         .add_systems(Startup, setup)
         .add_systems(Update, spawn_level.run_if(in_state(AppState::Loading)))
-        .run()
+        .run();
 }
 
 fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {

examples/yaml.rs

@@ -12,7 +12,7 @@ fn main() {
         .init_state::<AppState>()
         .add_systems(Startup, setup)
         .add_systems(Update, spawn_level.run_if(in_state(AppState::Loading)))
-        .run()
+        .run();
 }
 
 fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {

src/csv.rs

@@ -1,6 +1,6 @@
 use bevy::app::{App, Plugin};
 use bevy::asset::io::Reader;
-use bevy::asset::{Asset, AssetApp, AssetLoader, AsyncReadExt, BoxedFuture, Handle, LoadContext};
+use bevy::asset::{Asset, AssetApp, AssetLoader, AsyncReadExt, Handle, LoadContext};
 use bevy::prelude::TypePath;
 use std::marker::PhantomData;
 use thiserror::Error;
@@ -99,26 +99,23 @@ where
     type Settings = ();
     type Error = CsvLoaderError;
 
-    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 mut reader = csv::ReaderBuilder::new()
-                .delimiter(self.delimiter)
-                .from_reader(bytes.as_slice());
-            let mut handles = vec![];
-            for (index, result) in reader.deserialize().enumerate() {
-                let asset: A = result?;
-                handles
-                    .push(load_context.add_loaded_labeled_asset(index.to_string(), asset.into()));
-            }
-            Ok(LoadedCsv { rows: handles })
-        })
+        load_context: &'a mut LoadContext<'_>,
+    ) -> Result<Self::Asset, Self::Error> {
+        let mut bytes = Vec::new();
+        reader.read_to_end(&mut bytes).await?;
+        let mut reader = csv::ReaderBuilder::new()
+            .delimiter(self.delimiter)
+            .from_reader(bytes.as_slice());
+        let mut handles = vec![];
+        for (index, result) in reader.deserialize().enumerate() {
+            let asset: A = result?;
+            handles.push(load_context.add_loaded_labeled_asset(index.to_string(), asset.into()));
+        }
+        Ok(LoadedCsv { rows: handles })
     }
 
     fn extensions(&self) -> &[&str] {

src/json.rs

@@ -1,6 +1,6 @@
 use bevy::app::{App, Plugin};
 use bevy::asset::io::Reader;
-use bevy::asset::{Asset, AssetApp, AssetLoader, AsyncReadExt, BoxedFuture, LoadContext};
+use bevy::asset::{Asset, AssetApp, AssetLoader, AsyncReadExt, LoadContext};
 use serde_json::from_slice;
 use std::marker::PhantomData;
 use thiserror::Error;
@@ -63,18 +63,16 @@ where
     type Settings = ();
     type Error = JsonLoaderError;
 
-    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 asset = from_slice::<A>(&bytes)?;
-            Ok(asset)
-        })
+        _load_context: &'a mut LoadContext<'_>,
+    ) -> Result<Self::Asset, Self::Error> {
+        let mut bytes = Vec::new();
+        reader.read_to_end(&mut bytes).await?;
+        let asset = from_slice::<A>(&bytes)?;
+        Ok(asset)
     }
 
     fn extensions(&self) -> &[&str] {

src/lib.rs

@@ -23,7 +23,7 @@
 //! #       .init_asset::<Level>()
 //!         .add_systems(Startup, load_level)
 //! #       .add_systems(Update, stop)
-//!         .run()
+//!         .run();
 //! }
 //!
 //! fn load_level(mut commands: Commands, asset_server: Res<AssetServer>) {
@@ -40,7 +40,7 @@
 //! struct LevelAsset(Handle<Level>);
 //!
 //! # fn stop(mut events: EventWriter<AppExit>) {
-//! #     events.send(AppExit);
+//! #     events.send(AppExit::Success);
 //! # }
 //! ```
 

src/msgpack.rs

@@ -1,6 +1,6 @@
 use bevy::app::{App, Plugin};
 use bevy::asset::io::Reader;
-use bevy::asset::{Asset, AssetApp, AssetLoader, AsyncReadExt, BoxedFuture, LoadContext};
+use bevy::asset::{Asset, AssetApp, AssetLoader, AsyncReadExt, LoadContext};
 use rmp_serde::from_slice;
 use std::marker::PhantomData;
 use thiserror::Error;
@@ -63,18 +63,16 @@ where
     type Settings = ();
     type Error = MsgPackLoaderError;
 
-    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 asset = from_slice::<A>(&bytes)?;
-            Ok(asset)
-        })
+        _load_context: &'a mut LoadContext<'_>,
+    ) -> Result<Self::Asset, Self::Error> {
+        let mut bytes = Vec::new();
+        reader.read_to_end(&mut bytes).await?;
+        let asset = from_slice::<A>(&bytes)?;
+        Ok(asset)
     }
 
     fn extensions(&self) -> &[&str] {

src/postcard.rs

@@ -5,7 +5,6 @@ use bevy::{
         LoadContext,
     },
     prelude::*,
-    utils::{thiserror, BoxedFuture},
 };
 use postcard::{from_bytes, to_stdvec};
 use serde::{Deserialize, Serialize};
@@ -70,18 +69,16 @@ where
     type Settings = ();
     type Error = PostcardAssetError;
 
-    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 asset = from_bytes::<A>(&bytes)?;
-            Ok(asset)
-        })
+        _load_context: &'a mut LoadContext<'_>,
+    ) -> Result<Self::Asset, Self::Error> {
+        let mut bytes = Vec::new();
+        reader.read_to_end(&mut bytes).await?;
+        let asset = from_bytes::<A>(&bytes)?;
+        Ok(asset)
     }
 
     fn extensions(&self) -> &[&str] {
@@ -108,16 +105,14 @@ impl<A: Asset + for<'de> Deserialize<'de> + Serialize> AssetSaver for PostcardAs
     type OutputLoader = PostcardAssetLoader<A>;
     type Error = PostcardAssetError;
 
-    fn save<'a>(
+    async fn save<'a>(
         &'a self,
         writer: &'a mut bevy::asset::io::Writer,
         asset: bevy::asset::saver::SavedAsset<'a, Self::Asset>,
         _settings: &'a Self::Settings,
-    ) -> BoxedFuture<'a, Result<<Self::OutputLoader as AssetLoader>::Settings, Self::Error>> {
-        Box::pin(async move {
-            let bytes = to_stdvec(&asset.get())?;
-            writer.write_all(&bytes).await?;
-            Ok(())
-        })
+    ) -> Result<<Self::OutputLoader as AssetLoader>::Settings, Self::Error> {
+        let bytes = to_stdvec(&asset.get())?;
+        writer.write_all(&bytes).await?;
+        Ok(())
     }
 }

src/ron.rs

@@ -1,6 +1,6 @@
 use bevy::app::{App, Plugin};
 use bevy::asset::io::Reader;
-use bevy::asset::{Asset, AssetApp, AssetLoader, AsyncReadExt, BoxedFuture, LoadContext};
+use bevy::asset::{Asset, AssetApp, AssetLoader, AsyncReadExt, LoadContext};
 use serde_ron::de::from_bytes;
 use std::marker::PhantomData;
 use thiserror::Error;
@@ -63,18 +63,16 @@ where
     type Settings = ();
     type Error = RonLoaderError;
 
-    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 asset = from_bytes::<A>(&bytes)?;
-            Ok(asset)
-        })
+        _load_context: &'a mut LoadContext<'_>,
+    ) -> Result<Self::Asset, Self::Error> {
+        let mut bytes = Vec::new();
+        reader.read_to_end(&mut bytes).await?;
+        let asset = from_bytes::<A>(&bytes)?;
+        Ok(asset)
     }
 
     fn extensions(&self) -> &[&str] {

src/toml.rs

@@ -1,6 +1,6 @@
 use bevy::app::{App, Plugin};
 use bevy::asset::io::Reader;
-use bevy::asset::{Asset, AssetApp, AssetLoader, AsyncReadExt, BoxedFuture, LoadContext};
+use bevy::asset::{Asset, AssetApp, AssetLoader, AsyncReadExt, LoadContext};
 use std::marker::PhantomData;
 use std::str::from_utf8;
 use thiserror::Error;
@@ -66,18 +66,16 @@ where
     type Settings = ();
     type Error = TomlLoaderError;
 
-    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 asset = serde_toml::from_str::<A>(from_utf8(&bytes)?)?;
-            Ok(asset)
-        })
+        _load_context: &'a mut LoadContext<'_>,
+    ) -> Result<Self::Asset, Self::Error> {
+        let mut bytes = Vec::new();
+        reader.read_to_end(&mut bytes).await?;
+        let asset = serde_toml::from_str::<A>(from_utf8(&bytes)?)?;
+        Ok(asset)
     }
 
     fn extensions(&self) -> &[&str] {