Merge pull request #28 from NiklasEi/bevy_main

Update to Bevy 0.13
NiklasEi · Feb 17, 2024 · db0a34c · db0a34c
2 parents 18c17fb + 20d7ef6
commit db0a34c
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## v0.10.0 - 18.02.2024
+- Update to Bevy 0.13
+
 ## v0.9.1 - 17.01.2024
 - CsvAssetPlugin supports configuring the delimiter with `with_delimiter`
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_common_assets"
-version = "0.9.1"
+version = "0.10.0"
 authors = ["Niklas Eicker <[email protected]>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"
@@ -22,7 +22,7 @@ xml = ["dep:quick-xml"]
 csv = ["dep:csv"]
 
 [dependencies]
-bevy = { version = "0.12", default-features = false, features = ["bevy_asset"] }
+bevy = { version = "0.13", 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 }
@@ -35,7 +35,7 @@ serde = { version = "1" }
 anyhow = { version = "1" }
 
 [dev-dependencies]
-bevy = { version = "0.12" }
+bevy = { version = "0.13" }
 serde = { version = "1" }
 
 [package.metadata.docs.rs]

diff --git a/README.md b/README.md
@@ -76,13 +76,14 @@ Compatibility of `bevy_common_assets` versions:
 
 | `bevy_common_assets` | `bevy` |
 |:---------------------|:-------|
+| `0.10`               | `0.13` |
 | `0.8` - `0.9`        | `0.12` |
 | `0.7`                | `0.11` |
 | `0.5` - `0.6`        | `0.10` |
 | `0.4`                | `0.9`  |
 | `0.3`                | `0.8`  |
 | `0.1` - `0.2`        | `0.7`  |
-| `main`               | `0.12` |
+| `main`               | `0.13` |
 | `bevy_main`          | `main` |
 
 ## License

diff --git a/examples/csv.rs b/examples/csv.rs
@@ -10,7 +10,7 @@ fn main() {
             CsvAssetPlugin::<TreePosition>::new(&["level.csv"]),
         ))
         .insert_resource(Msaa::Off)
-        .add_state::<AppState>()
+        .init_state::<AppState>()
         .add_systems(Startup, setup)
         .add_systems(Update, spawn_level.run_if(in_state(AppState::Loading)))
         .run()

diff --git a/examples/json.rs b/examples/json.rs
@@ -9,7 +9,7 @@ fn main() {
             JsonAssetPlugin::<Level>::new(&["level.json"]),
         ))
         .insert_resource(Msaa::Off)
-        .add_state::<AppState>()
+        .init_state::<AppState>()
         .add_systems(Startup, setup)
         .add_systems(Update, spawn_level.run_if(in_state(AppState::Loading)))
         .run()

diff --git a/examples/msgpack.rs b/examples/msgpack.rs
@@ -9,7 +9,7 @@ fn main() {
             MsgPackAssetPlugin::<Level>::new(&["level.msgpack"]),
         ))
         .insert_resource(Msaa::Off)
-        .add_state::<AppState>()
+        .init_state::<AppState>()
         .add_systems(Startup, setup)
         .add_systems(Update, spawn_level.run_if(in_state(AppState::Loading)))
         .run()

diff --git a/examples/multiple_formats.rs b/examples/multiple_formats.rs
@@ -14,7 +14,7 @@ fn main() {
             JsonAssetPlugin::<Level>::new(&["level.json"]),
         ))
         .insert_resource(Msaa::Off)
-        .add_state::<AppState>()
+        .init_state::<AppState>()
         .add_systems(Startup, setup)
         .add_systems(Update, check_loading.run_if(in_state(AppState::Loading)))
         .add_systems(OnEnter(AppState::Level), spawn_level)

diff --git a/examples/ron.rs b/examples/ron.rs
@@ -6,7 +6,7 @@ fn main() {
     App::new()
         .add_plugins((DefaultPlugins, RonAssetPlugin::<Level>::new(&["level.ron"])))
         .insert_resource(Msaa::Off)
-        .add_state::<AppState>()
+        .init_state::<AppState>()
         .add_systems(Startup, setup)
         .add_systems(Update, spawn_level.run_if(in_state(AppState::Loading)))
         .run()

diff --git a/examples/toml.rs b/examples/toml.rs
@@ -9,7 +9,7 @@ fn main() {
             TomlAssetPlugin::<Level>::new(&["level.toml"]),
         ))
         .insert_resource(Msaa::Off)
-        .add_state::<AppState>()
+        .init_state::<AppState>()
         .add_systems(Startup, setup)
         .add_systems(Update, spawn_level.run_if(in_state(AppState::Loading)))
         .run()

diff --git a/examples/xml.rs b/examples/xml.rs
@@ -7,7 +7,7 @@ fn main() {
     App::new()
         .add_plugins((DefaultPlugins, XmlAssetPlugin::<Level>::new(&["level.xml"])))
         .insert_resource(Msaa::Off)
-        .add_state::<AppState>()
+        .init_state::<AppState>()
         .add_systems(Startup, setup)
         .add_systems(Update, spawn_level.run_if(in_state(AppState::Loading)))
         .run()

diff --git a/examples/yaml.rs b/examples/yaml.rs
@@ -9,7 +9,7 @@ fn main() {
             YamlAssetPlugin::<Level>::new(&["level.yaml"]),
         ))
         .insert_resource(Msaa::Off)
-        .add_state::<AppState>()
+        .init_state::<AppState>()
         .add_systems(Startup, setup)
         .add_systems(Update, spawn_level.run_if(in_state(AppState::Loading)))
         .run()

diff --git a/src/lib.rs b/src/lib.rs
@@ -40,7 +40,7 @@
 //! struct LevelAsset(Handle<Level>);
 //!
 //! # fn stop(mut events: EventWriter<AppExit>) {
-//! #     events.send(AppExit)
+//! #     events.send(AppExit);
 //! # }
 //! ```