Merge pull request #207 from YarnSpinnerTool/bevy-0.14

Upgrade to Bevy 0.14
YarnSpinnerTool · Jul 4, 2024 · 9103204 · 9103204
2 parents da56041 + 425e4b9
commit 9103204
Show file tree

Hide file tree

Showing 11 changed files with 168 additions and 161 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/bevy_plugin/Cargo.toml b/crates/bevy_plugin/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_yarnspinner"
-version = "0.3.0-rc"
+version = "0.3.0"
 edition = "2021"
 repository = "https://github.com/YarnSpinnerTool/YarnSpinner-Rust"
 homepage = "https://docs.yarnspinner.dev/"
@@ -20,27 +20,25 @@ audio_assets = ["bevy/bevy_audio", "bevy/vorbis"]
 anyhow = "1"
 csv = "1"
 serde = { version = "1", features = ["derive"] }
-yarnspinner = { path = "../yarnspinner", features = ["bevy", "serde"], version = "0.3.0-rc" }
+yarnspinner = { path = "../yarnspinner", features = ["bevy", "serde"], version = "0.3.0" }
 sha2 = "0.10"
 rand = { version = "0.8", features = ["small_rng"] }
 
 
 [dependencies.bevy]
-version = "0.14.0-rc.2"
+version = "0.14.0"
 default-features = false
 features = [
     "bevy_asset",
     "multi_threaded",
-    # Remove when https://github.com/bevyengine/bevy/pull/13740 lands
-    "bevy_scene",
 ]
 
 [dev-dependencies]
 tempfile = "3"
 static_assertions = "1.1.0"
 
 [dev-dependencies.bevy]
-version = "0.14.0-rc.2"
+version = "0.14.0"
 default-features = false
 features = [
     "bevy_core_pipeline",

diff --git a/crates/compiler/Cargo.toml b/crates/compiler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "yarnspinner_compiler"
-version = "0.3.0-rc"
+version = "0.3.0"
 edition = "2021"
 repository = "https://github.com/YarnSpinnerTool/YarnSpinner-Rust"
 homepage = "https://docs.yarnspinner.dev/"
@@ -18,10 +18,10 @@ bevy = ["dep:bevy", "yarnspinner_core/bevy"]
 antlr-rust = "=0.3.0-beta"
 better_any = "=0.2.0"
 regex = "1"
-yarnspinner_core = { path = "../core", version = "0.3.0-rc" }
+yarnspinner_core = { path = "../core", version = "0.3.0" }
 annotate-snippets = "0.10"
 serde = { version = "1", features = ["derive"], optional = true }
-bevy = { version = "0.14.0-rc.2", default-features = false, optional = true }
+bevy = { version = "0.14.0", default-features = false, optional = true }
 rand = { version = "0.8", features = ["small_rng"] }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]

diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "yarnspinner_core"
-version = "0.3.0-rc"
+version = "0.3.0"
 edition = "2021"
 repository = "https://github.com/YarnSpinnerTool/YarnSpinner-Rust"
 homepage = "https://docs.yarnspinner.dev/"
@@ -18,7 +18,7 @@ bevy = ["dep:bevy"]
 yarnspinner_macros = { path = "../macros", version = "0.1" }
 prost = "0.12"
 serde = { version = "1", features = ["derive"], optional = true }
-bevy = { version = "0.14.0-rc.2", default-features = false, optional = true }
+bevy = { version = "0.14.0", default-features = false, optional = true }
 
 [dev-dependencies]
 static_assertions = "1.1.0"
diff --git a/crates/example_dialogue_view/Cargo.toml b/crates/example_dialogue_view/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_yarnspinner_example_dialogue_view"
-version = "0.3.0-rc"
+version = "0.3.0"
 edition = "2021"
 repository = "https://github.com/YarnSpinnerTool/YarnSpinner-Rust"
 homepage = "https://docs.yarnspinner.dev/"
@@ -14,11 +14,11 @@ readme = "../../readme.md"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bevy_yarnspinner = { path = "../bevy_plugin", version = "0.3.0-rc" }
+bevy_yarnspinner = { path = "../bevy_plugin", version = "0.3.0" }
 unicode-segmentation = "1"
 
 [dependencies.bevy]
-version = "0.14.0-rc.2"
+version = "0.14.0"
 default-features = false
 features = [
     "bevy_ui",

diff --git a/crates/runtime/Cargo.toml b/crates/runtime/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "yarnspinner_runtime"
-version = "0.3.0-rc"
+version = "0.3.0"
 edition = "2021"
 repository = "https://github.com/YarnSpinnerTool/YarnSpinner-Rust"
 homepage = "https://docs.yarnspinner.dev/"
@@ -20,7 +20,7 @@ serde = [
 bevy = ["dep:bevy", "yarnspinner_core/bevy"]
 
 [dependencies]
-yarnspinner_core = { path = "../core", version = "0.3.0-rc" }
+yarnspinner_core = { path = "../core", version = "0.3.0" }
 unicode-normalization = "0.1"
 unicode-segmentation = "1"
 log = "0.4"
@@ -30,4 +30,4 @@ fixed_decimal = { version = "0.5", features = ["ryu", "std"] }
 once_cell = "1"
 regex = "1"
 serde = { version = "1", features = ["derive"], optional = true }
-bevy = { version = "0.14.0-rc.2", default-features = false, optional = true }
+bevy = { version = "0.14.0", default-features = false, optional = true }
diff --git a/crates/yarnspinner/Cargo.toml b/crates/yarnspinner/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "yarnspinner"
-version = "0.3.0-rc"
+version = "0.3.0"
 edition = "2021"
 repository = "https://github.com/YarnSpinnerTool/YarnSpinner-Rust"
 homepage = "https://docs.yarnspinner.dev/"
@@ -27,9 +27,9 @@ bevy = [
 ]
 
 [dependencies]
-yarnspinner_core = { path = "../core", version = "0.3.0-rc" }
-yarnspinner_compiler = { path = "../compiler", version = "0.3.0-rc" }
-yarnspinner_runtime = { path = "../runtime", version = "0.3.0-rc" }
+yarnspinner_core = { path = "../core", version = "0.3.0" }
+yarnspinner_compiler = { path = "../compiler", version = "0.3.0" }
+yarnspinner_runtime = { path = "../runtime", version = "0.3.0" }
 log = { version = "0.4", features = ["std"] }
 
 [dev-dependencies]

diff --git a/demo/Cargo.toml b/demo/Cargo.toml
@@ -11,8 +11,8 @@ description = "A demo for Bevy Yarn Spinner for Rust, the friendly tool for writ
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-bevy = { version = "0.14.0-rc.2" }
-bevy_yarnspinner = { path = "../crates/bevy_plugin", version = "0.3.0-rc" }
-bevy_yarnspinner_example_dialogue_view = { path = "../crates/example_dialogue_view", version = "0.3.0-rc" }
-# waiting for https://github.com/FraserLee/bevy_sprite3d/pull/21 to be merged
-bevy_sprite3d = { git = "https://github.com/janhohenheim/bevy_sprite3d", branch = "bevy-0.14.0-rc.2" }
+bevy = { version = "0.14.0" }
+bevy_yarnspinner = { path = "../crates/bevy_plugin", version = "0.3.0" }
+bevy_yarnspinner_example_dialogue_view = { path = "../crates/example_dialogue_view", version = "0.3.0" }
+# waiting for https://github.com/FraserLee/bevy_sprite3d/pull/22 to be merged
+bevy_sprite3d = { git = "https://github.com/janhohenheim/bevy_sprite3d", branch = "bevy-0.14" }
diff --git a/examples/bevy_yarnspinner/Cargo.toml b/examples/bevy_yarnspinner/Cargo.toml
@@ -10,9 +10,9 @@ authors = ["Jan Hohenheim <[email protected]>"]
 publish = false
 
 [dependencies]
-bevy = { version = "0.14.0-rc.2", features = ["file_watcher"] }
-bevy_yarnspinner = { path = "../../crates/bevy_plugin", version = "0.3.0-rc" }
-bevy_yarnspinner_example_dialogue_view = { path = "../../crates/example_dialogue_view", version = "0.3.0-rc" }
+bevy = { version = "0.14.0", features = ["file_watcher"] }
+bevy_yarnspinner = { path = "../../crates/bevy_plugin", version = "0.3.0" }
+bevy_yarnspinner_example_dialogue_view = { path = "../../crates/example_dialogue_view", version = "0.3.0" }
 
 [[bin]]
 name = "access_variables"

diff --git a/examples/yarnspinner_without_bevy/Cargo.toml b/examples/yarnspinner_without_bevy/Cargo.toml
@@ -13,7 +13,7 @@ publish = false
 crossterm = "0.27"
 ratatui = "0.26"
 anyhow = "1.0"
-yarnspinner = { path = "../../crates/yarnspinner", version = "0.3.0-rc" }
+yarnspinner = { path = "../../crates/yarnspinner", version = "0.3.0" }
 
 [[bin]]
 name = "access_variables"

diff --git a/readme.md b/readme.md
@@ -108,6 +108,6 @@ Et voilà! That was all. Thanks for checking out Yarn Spinner for Rust! Continui
 
 | Bevy        | Yarn Spinner for Rust | 
 |-------------|-----------------------|
-| 0.14.0-rc.2 | 0.3.0-rc              |
+| 0.14        | 0.3                   |
 | 0.13        | 0.2                   |
 | 0.12        | 0.1                   |