From 8792cfd05e7aa9aa51ab15d71227d2b55efe8a2f Mon Sep 17 00:00:00 2001 From: Niklas Eicker Date: Sat, 18 May 2024 13:15:03 +0200 Subject: [PATCH 1/7] Use main Bevy and fix doc tests --- Cargo.toml | 4 ++-- src/lib.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a09888a..417e22e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ csv = ["dep:csv"] postcard = ["dep:postcard"] [dependencies] -bevy = { version = "0.13", default-features = false, features = ["bevy_asset"] } +bevy = { git = "https://github.com/bevyengine/bevy", 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 } @@ -37,7 +37,7 @@ anyhow = { version = "1" } postcard = {version = "1.0", features = ["use-std"], optional = true} [dev-dependencies] -bevy = { version = "0.13" } +bevy = { git = "https://github.com/bevyengine/bevy" } serde = { version = "1" } [package.metadata.docs.rs] diff --git a/src/lib.rs b/src/lib.rs index b8f0bb1..03f8ea7 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -23,7 +23,7 @@ //! # .init_asset::() //! .add_systems(Startup, load_level) //! # .add_systems(Update, stop) -//! .run() +//! .run(); //! } //! //! fn load_level(mut commands: Commands, asset_server: Res) { @@ -40,7 +40,7 @@ //! struct LevelAsset(Handle); //! //! # fn stop(mut events: EventWriter) { -//! # events.send(AppExit); +//! # events.send(AppExit::Success); //! # } //! ``` From 6abc324e9803a67d7d54a5abaef35cb8c9fd4f4a Mon Sep 17 00:00:00 2001 From: Niklas Eicker Date: Sat, 18 May 2024 13:26:17 +0200 Subject: [PATCH 2/7] Update to main Bevy --- examples/csv.rs | 2 +- examples/json.rs | 2 +- examples/msgpack.rs | 2 +- examples/postcard.rs | 2 +- examples/ron.rs | 2 +- examples/toml.rs | 2 +- examples/xml.rs | 2 +- examples/yaml.rs | 2 +- src/csv.rs | 35 ++++++++++++++++------------------- src/json.rs | 20 +++++++++----------- src/msgpack.rs | 20 +++++++++----------- src/postcard.rs | 31 +++++++++++++------------------ src/ron.rs | 20 +++++++++----------- src/toml.rs | 20 +++++++++----------- src/xml.rs | 20 +++++++++----------- src/yaml.rs | 20 +++++++++----------- 16 files changed, 91 insertions(+), 111 deletions(-) diff --git a/examples/csv.rs b/examples/csv.rs index 7f34c6b..c4e5f39 100644 --- a/examples/csv.rs +++ b/examples/csv.rs @@ -13,7 +13,7 @@ fn main() { .init_state::() .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) { diff --git a/examples/json.rs b/examples/json.rs index d4a1fc9..5ee46c9 100644 --- a/examples/json.rs +++ b/examples/json.rs @@ -12,7 +12,7 @@ fn main() { .init_state::() .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) { diff --git a/examples/msgpack.rs b/examples/msgpack.rs index e788bc5..c3606ca 100644 --- a/examples/msgpack.rs +++ b/examples/msgpack.rs @@ -12,7 +12,7 @@ fn main() { .init_state::() .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) { diff --git a/examples/postcard.rs b/examples/postcard.rs index 1fa1fad..5043fcd 100644 --- a/examples/postcard.rs +++ b/examples/postcard.rs @@ -12,7 +12,7 @@ fn main() { .init_state::() .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) { diff --git a/examples/ron.rs b/examples/ron.rs index 35e1669..131597f 100644 --- a/examples/ron.rs +++ b/examples/ron.rs @@ -9,7 +9,7 @@ fn main() { .init_state::() .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) { diff --git a/examples/toml.rs b/examples/toml.rs index 618d200..df4c455 100644 --- a/examples/toml.rs +++ b/examples/toml.rs @@ -12,7 +12,7 @@ fn main() { .init_state::() .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) { diff --git a/examples/xml.rs b/examples/xml.rs index 6033f30..9413989 100644 --- a/examples/xml.rs +++ b/examples/xml.rs @@ -10,7 +10,7 @@ fn main() { .init_state::() .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) { diff --git a/examples/yaml.rs b/examples/yaml.rs index 72866b1..e1831aa 100644 --- a/examples/yaml.rs +++ b/examples/yaml.rs @@ -12,7 +12,7 @@ fn main() { .init_state::() .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) { diff --git a/src/csv.rs b/src/csv.rs index 91e04b4..b1e60f3 100644 --- a/src/csv.rs +++ b/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> { - 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 { + 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] { diff --git a/src/json.rs b/src/json.rs index 34b123f..4c70b9a 100644 --- a/src/json.rs +++ b/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> { - Box::pin(async move { - let mut bytes = Vec::new(); - reader.read_to_end(&mut bytes).await?; - let asset = from_slice::(&bytes)?; - Ok(asset) - }) + _load_context: &'a mut LoadContext<'_>, + ) -> Result { + let mut bytes = Vec::new(); + reader.read_to_end(&mut bytes).await?; + let asset = from_slice::(&bytes)?; + Ok(asset) } fn extensions(&self) -> &[&str] { diff --git a/src/msgpack.rs b/src/msgpack.rs index de58697..265162e 100644 --- a/src/msgpack.rs +++ b/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> { - Box::pin(async move { - let mut bytes = Vec::new(); - reader.read_to_end(&mut bytes).await?; - let asset = from_slice::(&bytes)?; - Ok(asset) - }) + _load_context: &'a mut LoadContext<'_>, + ) -> Result { + let mut bytes = Vec::new(); + reader.read_to_end(&mut bytes).await?; + let asset = from_slice::(&bytes)?; + Ok(asset) } fn extensions(&self) -> &[&str] { diff --git a/src/postcard.rs b/src/postcard.rs index c7cbbe7..61cfdf4 100644 --- a/src/postcard.rs +++ b/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> { - Box::pin(async move { - let mut bytes = Vec::new(); - reader.read_to_end(&mut bytes).await?; - let asset = from_bytes::(&bytes)?; - Ok(asset) - }) + _load_context: &'a mut LoadContext<'_>, + ) -> Result { + let mut bytes = Vec::new(); + reader.read_to_end(&mut bytes).await?; + let asset = from_bytes::(&bytes)?; + Ok(asset) } fn extensions(&self) -> &[&str] { @@ -108,16 +105,14 @@ impl Deserialize<'de> + Serialize> AssetSaver for PostcardAs type OutputLoader = PostcardAssetLoader; 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<::Settings, Self::Error>> { - Box::pin(async move { - let bytes = to_stdvec(&asset.get())?; - writer.write_all(&bytes).await?; - Ok(()) - }) + ) -> Result<::Settings, Self::Error> { + let bytes = to_stdvec(&asset.get())?; + writer.write_all(&bytes).await?; + Ok(()) } } diff --git a/src/ron.rs b/src/ron.rs index 3d9745b..e9b64d6 100644 --- a/src/ron.rs +++ b/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> { - Box::pin(async move { - let mut bytes = Vec::new(); - reader.read_to_end(&mut bytes).await?; - let asset = from_bytes::(&bytes)?; - Ok(asset) - }) + _load_context: &'a mut LoadContext<'_>, + ) -> Result { + let mut bytes = Vec::new(); + reader.read_to_end(&mut bytes).await?; + let asset = from_bytes::(&bytes)?; + Ok(asset) } fn extensions(&self) -> &[&str] { diff --git a/src/toml.rs b/src/toml.rs index 7f37bcb..52dab8c 100644 --- a/src/toml.rs +++ b/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> { - Box::pin(async move { - let mut bytes = Vec::new(); - reader.read_to_end(&mut bytes).await?; - let asset = serde_toml::from_str::(from_utf8(&bytes)?)?; - Ok(asset) - }) + _load_context: &'a mut LoadContext<'_>, + ) -> Result { + let mut bytes = Vec::new(); + reader.read_to_end(&mut bytes).await?; + let asset = serde_toml::from_str::(from_utf8(&bytes)?)?; + Ok(asset) } fn extensions(&self) -> &[&str] { diff --git a/src/xml.rs b/src/xml.rs index ab0fb6f..f0b501e 100644 --- a/src/xml.rs +++ b/src/xml.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 quick_xml::de::from_str; use std::marker::PhantomData; use std::str::from_utf8; @@ -68,18 +68,16 @@ where type Settings = (); type Error = XmlLoaderError; - 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> { - Box::pin(async move { - let mut bytes = Vec::new(); - reader.read_to_end(&mut bytes).await?; - let asset = from_str::(from_utf8(&bytes)?)?; - Ok(asset) - }) + _load_context: &'a mut LoadContext<'_>, + ) -> Result { + let mut bytes = Vec::new(); + reader.read_to_end(&mut bytes).await?; + let asset = from_str::(from_utf8(&bytes)?)?; + Ok(asset) } fn extensions(&self) -> &[&str] { diff --git a/src/yaml.rs b/src/yaml.rs index d034d05..07eb5a4 100644 --- a/src/yaml.rs +++ b/src/yaml.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_yaml::from_slice; use std::marker::PhantomData; use thiserror::Error; @@ -63,18 +63,16 @@ where type Settings = (); type Error = YamlLoaderError; - 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> { - Box::pin(async move { - let mut bytes = Vec::new(); - reader.read_to_end(&mut bytes).await?; - let asset = from_slice::(&bytes)?; - Ok(asset) - }) + _load_context: &'a mut LoadContext<'_>, + ) -> Result { + let mut bytes = Vec::new(); + reader.read_to_end(&mut bytes).await?; + let asset = from_slice::(&bytes)?; + Ok(asset) } fn extensions(&self) -> &[&str] { From de26ea859c44e7e149f9d5663ddaa258e17df589 Mon Sep 17 00:00:00 2001 From: Niklas Eicker Date: Sat, 8 Jun 2024 16:23:38 +0200 Subject: [PATCH 3/7] Update Bevy RC 2 --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 417e22e..5a7a567 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ csv = ["dep:csv"] postcard = ["dep:postcard"] [dependencies] -bevy = { git = "https://github.com/bevyengine/bevy", default-features = false, features = ["bevy_asset"] } +bevy = { version = "0.14.0-rc.2", 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 } @@ -37,7 +37,7 @@ anyhow = { version = "1" } postcard = {version = "1.0", features = ["use-std"], optional = true} [dev-dependencies] -bevy = { git = "https://github.com/bevyengine/bevy" } +bevy = { version = "0.14.0-rc.2" } serde = { version = "1" } [package.metadata.docs.rs] From 03dbeaede6af9d93967a044cc62ed6749ddca352 Mon Sep 17 00:00:00 2001 From: Niklas Eicker Date: Sat, 8 Jun 2024 16:25:47 +0200 Subject: [PATCH 4/7] Bump to RC version --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 5a7a567..7aab2e2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bevy_common_assets" -version = "0.10.0" +version = "0.11.0-rc.2.1" authors = ["Niklas Eicker "] edition = "2021" license = "MIT OR Apache-2.0" From e3a6ae32b288b5178a75bb21aaa7dd50ac8de74f Mon Sep 17 00:00:00 2001 From: Niklas Eicker Date: Mon, 17 Jun 2024 20:21:18 +0200 Subject: [PATCH 5/7] Bump Bevy to 0.14.0-rc.3 --- Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 7aab2e2..5cbfad8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bevy_common_assets" -version = "0.11.0-rc.2.1" +version = "0.11.0-rc.3" authors = ["Niklas Eicker "] edition = "2021" license = "MIT OR Apache-2.0" @@ -23,7 +23,7 @@ csv = ["dep:csv"] postcard = ["dep:postcard"] [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"] } 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 } @@ -37,7 +37,7 @@ anyhow = { version = "1" } postcard = {version = "1.0", features = ["use-std"], optional = true} [dev-dependencies] -bevy = { version = "0.14.0-rc.2" } +bevy = { version = "0.14.0-rc.3" } serde = { version = "1" } [package.metadata.docs.rs] From 53a477b209fdffb2584e62f4a4599afd2d2f7ca3 Mon Sep 17 00:00:00 2001 From: Niklas Eicker Date: Fri, 28 Jun 2024 17:16:10 +0200 Subject: [PATCH 6/7] Bump Bevy to 0.14.0-rc.4 --- Cargo.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5cbfad8..39380cc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bevy_common_assets" -version = "0.11.0-rc.3" +version = "0.11.0-rc.4" authors = ["Niklas Eicker "] edition = "2021" license = "MIT OR Apache-2.0" @@ -23,7 +23,7 @@ csv = ["dep:csv"] postcard = ["dep:postcard"] [dependencies] -bevy = { version = "0.14.0-rc.3", default-features = false, features = ["bevy_asset"] } +bevy = { version = "0.14.0-rc.4", 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 } @@ -31,13 +31,13 @@ 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.14.0-rc.3" } +bevy = { version = "0.14.0-rc.4" } serde = { version = "1" } [package.metadata.docs.rs] From 94cddb43e2f43271ad390f2d960aad1bc1a58434 Mon Sep 17 00:00:00 2001 From: Brandon Reinhart Date: Thu, 4 Jul 2024 13:03:33 -0500 Subject: [PATCH 7/7] update to bevy 0.14 --- CHANGELOG.md | 3 +++ Cargo.toml | 4 ++-- README.md | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e302614..87f77bd 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/Cargo.toml b/Cargo.toml index 39380cc..9cb9fc9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bevy_common_assets" -version = "0.11.0-rc.4" +version = "0.11.0" authors = ["Niklas Eicker "] edition = "2021" license = "MIT OR Apache-2.0" @@ -23,7 +23,7 @@ csv = ["dep:csv"] postcard = ["dep:postcard"] [dependencies] -bevy = { version = "0.14.0-rc.4", 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 } diff --git a/README.md b/README.md index ca1c7f7..7d6d5ee 100644 --- a/README.md +++ b/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` |