Update to Bevy 0.11

NiklasEi · Jul 10, 2023 · 2849037 · 2849037
1 parent abe450a
commit 2849037
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 35 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## v0.7.0 - 10.07.2023
+- Update to Bevy 0.11
+
 ## v0.6.0 - 18.03.2023
 - Support for xml assets
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_common_assets"
-version = "0.7.0-dev"
+version = "0.7.0"
 authors = ["Niklas Eicker <git@nikl.me>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"
@@ -21,18 +21,18 @@ msgpack = ["dep:rmp-serde"]
 xml = ["dep:quick-xml"]
 
 [dependencies]
-bevy = { git = "https://github.com/bevyengine/bevy", default-features = false, features = ["bevy_asset"] }
+bevy = { version = "0.11", default-features = false, features = ["bevy_asset"] }
 serde_toml = { version = "0.7", 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 }
-quick-xml = { version = "0.28.0", features = [ "serialize" ], optional = true }
+quick-xml = { version = "0.29", features = [ "serialize" ], optional = true }
 serde = { version = "1" }
 anyhow = { version = "1" }
 
 [dev-dependencies]
-bevy = { git = "https://github.com/bevyengine/bevy" }
+bevy = { version = "0.11" }
 serde = { version = "1" }
 
 [package.metadata.docs.rs]

diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ Supported formats:
 
 Enable the feature(s) for the format(s) that you want to use.
 
-Define the types that you would like to load from files and derive `serde::Deserialize` and `bevy::reflect::TypeUuid` for them. The latter requires a unique uuid as an attribute:
+Define the types that you would like to load from files and derive `serde::Deserialize`, `bevy::reflect::TypePath`, and `bevy::reflect::TypeUuid` for them. The last derive requires a unique uuid as an attribute:
 ```rust
 #[derive(serde::Deserialize, bevy::reflect::TypeUuid, bevy::reflect::TypePath)]
 #[uuid = "413be529-bfeb-41b3-9db0-4b8b380a2c46"] // <-- keep me unique
@@ -44,13 +44,15 @@ use bevy_common_assets::yaml::YamlAssetPlugin;
 
 fn main() {
     App::new()
-        .add_plugins(DefaultPlugins)
-        .add_plugin(JsonAssetPlugin::<Level>::new(&["level.json", "custom.json"]))
-        .add_plugin(RonAssetPlugin::<Level>::new(&["level.ron"]))
-        .add_plugin(MsgPackAssetPlugin::<Level>::new(&["level.msgpack"]))
-        .add_plugin(TomlAssetPlugin::<Level>::new(&["level.toml"]))
-        .add_plugin(XmlAssetPlugin::<Level>::new(&["level.xml"]))
-        .add_plugin(YamlAssetPlugin::<Level>::new(&["level.yaml"]))
+        .add_plugins((
+            DefaultPlugins,
+            JsonAssetPlugin::<Level>::new(&["level.json", "custom.json"]),
+            RonAssetPlugin::<Level>::new(&["level.ron"]),
+            MsgPackAssetPlugin::<Level>::new(&["level.msgpack"]),
+            TomlAssetPlugin::<Level>::new(&["level.toml"]),
+            XmlAssetPlugin::<Level>::new(&["level.xml"]),
+            YamlAssetPlugin::<Level>::new(&["level.yaml"])
+        ))
         // ...
         .run();
 }
@@ -75,6 +77,7 @@ Compatibility of `bevy_common_assets` versions:
 
 | `bevy_common_assets` | `bevy` |
 |:---------------------|:-------|
+| `0.7`                | `0.11` |
 | `0.5` - `0.6`        | `0.10` |
 | `0.4`                | `0.9`  |
 | `0.3`                | `0.8`  |

diff --git a/examples/json.rs b/examples/json.rs
@@ -4,8 +4,10 @@ use bevy_common_assets::json::JsonAssetPlugin;
 
 fn main() {
     App::new()
-        .add_plugins(DefaultPlugins)
-        .add_plugin(JsonAssetPlugin::<Level>::new(&["level.json"]))
+        .add_plugins((
+            DefaultPlugins,
+            JsonAssetPlugin::<Level>::new(&["level.json"]),
+        ))
         .insert_resource(Msaa::Off)
         .add_state::<AppState>()
         .add_systems(Startup, setup)

diff --git a/examples/msgpack.rs b/examples/msgpack.rs
@@ -4,8 +4,10 @@ use bevy_common_assets::msgpack::MsgPackAssetPlugin;
 
 fn main() {
     App::new()
-        .add_plugins(DefaultPlugins)
-        .add_plugin(MsgPackAssetPlugin::<Level>::new(&["level.msgpack"]))
+        .add_plugins((
+            DefaultPlugins,
+            MsgPackAssetPlugin::<Level>::new(&["level.msgpack"]),
+        ))
         .insert_resource(Msaa::Off)
         .add_state::<AppState>()
         .add_systems(Startup, setup)

diff --git a/examples/multiple_formats.rs b/examples/multiple_formats.rs
@@ -6,11 +6,13 @@ use bevy_common_assets::ron::RonAssetPlugin;
 
 fn main() {
     App::new()
-        .add_plugins(DefaultPlugins)
         // You can add loaders for different asset types, but also multiple loaders for the same asset type
         // The important thing is: they all need distinct extensions!
-        .add_plugin(JsonAssetPlugin::<Level>::new(&["level.json"]))
-        .add_plugin(RonAssetPlugin::<Level>::new(&["level.ron"]))
+        .add_plugins((
+            DefaultPlugins,
+            RonAssetPlugin::<Level>::new(&["level.ron"]),
+            JsonAssetPlugin::<Level>::new(&["level.json"]),
+        ))
         .insert_resource(Msaa::Off)
         .add_state::<AppState>()
         .add_systems(Startup, setup)

diff --git a/examples/ron.rs b/examples/ron.rs
@@ -4,8 +4,7 @@ use bevy_common_assets::ron::RonAssetPlugin;
 
 fn main() {
     App::new()
-        .add_plugins(DefaultPlugins)
-        .add_plugin(RonAssetPlugin::<Level>::new(&["level.ron"]))
+        .add_plugins((DefaultPlugins, RonAssetPlugin::<Level>::new(&["level.ron"])))
         .insert_resource(Msaa::Off)
         .add_state::<AppState>()
         .add_systems(Startup, setup)

diff --git a/examples/toml.rs b/examples/toml.rs
@@ -4,8 +4,10 @@ use bevy_common_assets::toml::TomlAssetPlugin;
 
 fn main() {
     App::new()
-        .add_plugins(DefaultPlugins)
-        .add_plugin(TomlAssetPlugin::<Level>::new(&["level.toml"]))
+        .add_plugins((
+            DefaultPlugins,
+            TomlAssetPlugin::<Level>::new(&["level.toml"]),
+        ))
         .insert_resource(Msaa::Off)
         .add_state::<AppState>()
         .add_systems(Startup, setup)

diff --git a/examples/xml.rs b/examples/xml.rs
@@ -5,8 +5,7 @@ use bevy_common_assets::xml::XmlAssetPlugin;
 
 fn main() {
     App::new()
-        .add_plugins(DefaultPlugins)
-        .add_plugin(XmlAssetPlugin::<Level>::new(&["level.xml"]))
+        .add_plugins((DefaultPlugins, XmlAssetPlugin::<Level>::new(&["level.xml"])))
         .insert_resource(Msaa::Off)
         .add_state::<AppState>()
         .add_systems(Startup, setup)

diff --git a/examples/yaml.rs b/examples/yaml.rs
@@ -4,8 +4,10 @@ use bevy_common_assets::yaml::YamlAssetPlugin;
 
 fn main() {
     App::new()
-        .add_plugins(DefaultPlugins)
-        .add_plugin(YamlAssetPlugin::<Level>::new(&["level.yaml"]))
+        .add_plugins((
+            DefaultPlugins,
+            YamlAssetPlugin::<Level>::new(&["level.yaml"]),
+        ))
         .insert_resource(Msaa::Off)
         .add_state::<AppState>()
         .add_systems(Startup, setup)

diff --git a/src/lib.rs b/src/lib.rs
@@ -17,15 +17,11 @@
 //! fn main() {
 //!     App::new()
 //! # /*
-//!         .add_plugins(DefaultPlugins)
+//!         .add_plugins((DefaultPlugins, JsonAssetPlugin::<Level>::new(&["level.json"])))
 //! # */
-//! #       .add_plugins(MinimalPlugins)
-//! #       .add_plugin(AssetPlugin::default())
-//! # /*
-//!         .add_plugin(JsonAssetPlugin::<Level>::new(&["level.json"]))
-//! # */
-//!         .add_startup_system(load_level)
-//! #       .add_system(stop)
+//! #       .add_plugins((MinimalPlugins, AssetPlugin::default()))
+//!         .add_systems(Startup, load_level)
+//! #       .add_systems(Update, stop)
 //!         .run()
 //! }
 //!