Merge pull request #272 from morgenthum/bevy-0.18

janhohenheim · web-flow · commit 809a5751d4da · 2026-01-29T09:06:44.000+01:00
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.6.0"
+version = "0.7.0"
 edition = "2024"
 repository = "https://github.com/YarnSpinnerTool/YarnSpinner-Rust"
 homepage = "https://docs.yarnspinner.dev/"
@@ -24,14 +24,14 @@ yarnspinner_internal_shared = { path = "../internal_shared", version = "0.1.0" }
 yarnspinner = { path = "../yarnspinner", features = [
     "bevy",
     "serde",
-], version = "0.6.0" }
+], version = "0.7.0" }
 sha2 = "0.10"
 rand = { version = "0.9", features = ["small_rng"] }
 variadics_please = "1"
 
 
 [dependencies.bevy]
-version = "0.17"
+version = "0.18"
 default-features = false
 features = ["bevy_asset", "multi_threaded", "bevy_log"]
 
@@ -40,7 +40,7 @@ tempfile = "3"
 static_assertions = "1.1.0"
 
 [dev-dependencies.bevy]
-version = "0.17"
+version = "0.18"
 default-features = false
 features = ["bevy_core_pipeline", "bevy_audio"]
 
diff --git a/crates/bevy_plugin/src/localization/strings_file/asset.rs b/crates/bevy_plugin/src/localization/strings_file/asset.rs
@@ -16,7 +16,7 @@ pub(crate) fn strings_file_asset_plugin(app: &mut App) {
         .init_asset_loader::<StringsFileAssetLoader>();
 }
 
-#[derive(Debug, Default)]
+#[derive(Debug, Default, TypePath)]
 struct StringsFileAssetLoader;
 
 impl AssetLoader for StringsFileAssetLoader {
diff --git a/crates/bevy_plugin/src/yarn_file_asset.rs b/crates/bevy_plugin/src/yarn_file_asset.rs
@@ -1,6 +1,7 @@
 use crate::prelude::*;
 use bevy::asset::io::Reader;
 use bevy::prelude::*;
+use bevy::reflect::TypePath;
 
 use anyhow::Result;
 use bevy::asset::{AssetLoader, LoadContext};
@@ -71,7 +72,7 @@ pub(crate) fn yarnspinner_asset_loader_plugin(app: &mut App) {
         .init_asset_loader::<YarnFileAssetLoader>();
 }
 
-#[derive(Debug, Default)]
+#[derive(Debug, Default, TypePath)]
 struct YarnFileAssetLoader;
 
 impl AssetLoader for YarnFileAssetLoader {
@@ -98,6 +99,7 @@ impl AssetLoader for YarnFileAssetLoader {
 fn read_yarn_file(bytes: Vec<u8>, load_context: &LoadContext) -> Result<YarnFile, Error> {
     let source = String::from_utf8(bytes)?;
     let file_name = load_context
+        .path()
         .path()
         .file_name()
         .context("Yarn file has no filename")?
diff --git a/crates/compiler/Cargo.toml b/crates/compiler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "yarnspinner_compiler"
-version = "0.6.2"
+version = "0.7.0"
 edition = "2024"
 repository = "https://github.com/YarnSpinnerTool/YarnSpinner-Rust"
 homepage = "https://docs.yarnspinner.dev/"
@@ -19,10 +19,10 @@ antlr-rust = "=0.3.0-beta"
 better_any = "=0.2.0"
 regex = "1"
 yarnspinner_internal_shared = { path = "../internal_shared", version = "0.1.0" }
-yarnspinner_core = { path = "../core", version = "0.6.0" }
+yarnspinner_core = { path = "../core", version = "0.7.0" }
 annotate-snippets = "0.10"
 serde = { version = "1", features = ["derive"], optional = true }
-bevy = { version = "0.17", default-features = false, optional = true }
+bevy = { version = "0.18", default-features = false, optional = true }
 rand = { version = "0.9", features = ["small_rng"] }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
diff --git a/crates/compiler/src/visitors/type_check_visitor/check_operation.rs b/crates/compiler/src/visitors/type_check_visitor/check_operation.rs
@@ -157,7 +157,7 @@ impl<'input> TypeCheckVisitor<'input> {
                 if func.return_type.is_some() {
                     continue;
                 }
-                func.return_type = Box::new(expression_type.clone());
+                *func.return_type = expression_type.clone();
             } else {
                 self.visit(term.deref());
             }
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "yarnspinner_core"
-version = "0.6.1"
+version = "0.7.0"
 edition = "2024"
 repository = "https://github.com/YarnSpinnerTool/YarnSpinner-Rust"
 homepage = "https://docs.yarnspinner.dev/"
@@ -20,7 +20,7 @@ prost = { version = "0.12", default-features = false, features = [
     "prost-derive",
 ] }
 serde = { version = "1", features = ["derive"], optional = true }
-bevy = { version = "0.17", default-features = false, optional = true, features = [
+bevy = { version = "0.18", default-features = false, optional = true, features = [
     "std",
 ] }
 variadics_please = "1.1.0"
diff --git a/crates/core/src/types/function.rs b/crates/core/src/types/function.rs
@@ -44,7 +44,7 @@ impl From<FunctionType> for Type {
 impl FunctionType {
     /// Sets the return type of this function signature
     pub fn set_return_type(&mut self, return_type: impl Into<Option<Type>>) -> &mut Self {
-        self.return_type = Box::new(return_type.into());
+        *self.return_type = return_type.into();
         self
     }
 
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.6.0"
+version = "0.7.0"
 edition = "2024"
 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.6.0" }
+bevy_yarnspinner = { path = "../bevy_plugin", version = "0.7.0" }
 unicode-segmentation = "1"
 
 [dependencies.bevy]
-version = "0.17"
+version = "0.18"
 default-features = false
 features = [
     "bevy_ui",
diff --git a/crates/example_dialogue_view/src/option_selection.rs b/crates/example_dialogue_view/src/option_selection.rs
@@ -1,6 +1,6 @@
 use crate::ExampleYarnSpinnerDialogueViewSystemSet;
 use crate::setup::{DialogueNode, OptionButton, OptionsNode, UiRootNode, spawn_options};
-use crate::typewriter::{self, Typewriter, TypewriterFinishedEvent};
+use crate::typewriter::{Typewriter, TypewriterFinishedEvent};
 use bevy::color::palettes::css;
 use bevy::platform::collections::HashMap;
 use bevy::prelude::*;
@@ -13,9 +13,9 @@ pub(crate) fn option_selection_plugin(app: &mut App) {
         (
             create_options.run_if(resource_added::<OptionSelection>),
             show_options,
-            select_option
-                .run_if(resource_exists::<OptionSelection>.and(any_with_component::<PrimaryWindow>))
-                .before(typewriter::despawn),
+            select_option.run_if(
+                resource_exists::<OptionSelection>.and(any_with_component::<PrimaryWindow>),
+            ),
         )
             .chain()
             .after(YarnSpinnerSystemSet)
diff --git a/crates/example_dialogue_view/src/setup.rs b/crates/example_dialogue_view/src/setup.rs
@@ -79,10 +79,10 @@ fn setup(mut commands: Commands) {
                             left: Val::Px(TEXT_BORDER_HORIZONTAL),
                             right: Val::Px(TEXT_BORDER_HORIZONTAL),
                         },
+                        border_radius: BorderRadius::all(Val::Px(20.0)),
                         ..default()
                     },
                     BackgroundColor(Color::BLACK.with_alpha(0.8)),
-                    BorderRadius::all(Val::Px(20.0)),
                 ))
                 .with_children(|parent| {
                     // Dialog itself
diff --git a/crates/example_dialogue_view/src/updating.rs b/crates/example_dialogue_view/src/updating.rs
@@ -1,7 +1,7 @@
 use crate::ExampleYarnSpinnerDialogueViewSystemSet;
 use crate::option_selection::OptionSelection;
 use crate::setup::{DialogueContinueNode, DialogueNameNode, UiRootNode};
-use crate::typewriter::{self, Typewriter};
+use crate::typewriter::Typewriter;
 use bevy::prelude::*;
 use bevy_yarnspinner::{events::*, prelude::*};
 
@@ -11,7 +11,6 @@ pub(crate) fn ui_updating_plugin(app: &mut App) {
         continue_dialogue
             .run_if(resource_exists::<Typewriter>)
             .after(YarnSpinnerSystemSet)
-            .after(typewriter::spawn)
             .in_set(ExampleYarnSpinnerDialogueViewSystemSet),
     )
     .add_message::<SpeakerChangeEvent>()
diff --git a/crates/runtime/Cargo.toml b/crates/runtime/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "yarnspinner_runtime"
-version = "0.6.2"
+version = "0.7.0"
 edition = "2024"
 repository = "https://github.com/YarnSpinnerTool/YarnSpinner-Rust"
 homepage = "https://docs.yarnspinner.dev/"
@@ -29,7 +29,7 @@ bevy = ["dep:bevy", "yarnspinner_core/bevy"]
 
 [dependencies]
 yarnspinner_internal_shared = { path = "../internal_shared", version = "0.1.0" }
-yarnspinner_core = { path = "../core", version = "0.6.0" }
+yarnspinner_core = { path = "../core", version = "0.7.0" }
 unicode-normalization = { version = "0.1", default-features = false }
 unicode-segmentation = "1"
 log = "0.4"
@@ -41,8 +41,8 @@ fixed_decimal = { version = "0.5", default-features = false, features = [
 once_cell = "1"
 regex = "1"
 serde = { version = "1", features = ["derive"], optional = true }
-bevy = { version = "0.17.0", default-features = false,  features = ["bevy_log"], optional = true }
-bevy_platform = { version = "0.17.0", features = ["alloc"] }
+bevy = { version = "0.18.0", default-features = false,  features = ["bevy_log"], optional = true }
+bevy_platform = { version = "0.18.0", features = ["alloc"] }
 
 [lints.clippy]
 std_instead_of_core = "warn"
diff --git a/crates/yarnspinner/Cargo.toml b/crates/yarnspinner/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "yarnspinner"
-version = "0.6.3"
+version = "0.7.0"
 edition = "2024"
 repository = "https://github.com/YarnSpinnerTool/YarnSpinner-Rust"
 homepage = "https://docs.yarnspinner.dev/"
@@ -28,13 +28,13 @@ bevy = [
 ]
 
 [dependencies]
-yarnspinner_core = { path = "../core", version = "0.6.0" }
-yarnspinner_compiler = { path = "../compiler", version = "0.6.0" }
-yarnspinner_runtime = { path = "../runtime", version = "0.6.0" }
+yarnspinner_core = { path = "../core", version = "0.7.0" }
+yarnspinner_compiler = { path = "../compiler", version = "0.7.0" }
+yarnspinner_runtime = { path = "../runtime", version = "0.7.0" }
 log = { version = "0.4", features = ["std"] }
-bevy = { version = "0.17", default-features = false, optional = true }
+bevy = { version = "0.18", default-features = false, optional = true }
 
 [dev-dependencies]
 regex = "1"
 anyhow = "1"
-bevy_platform = "0.17"
+bevy_platform = "0.18"
diff --git a/demo/Cargo.toml b/demo/Cargo.toml
@@ -12,10 +12,10 @@ license = "MIT OR Apache-2.0"
 publish = false
 
 [dependencies]
-bevy = { version = "0.17.0" }
-bevy_yarnspinner = { path = "../crates/bevy_plugin", version = "0.6.0" }
-bevy_yarnspinner_example_dialogue_view = { path = "../crates/example_dialogue_view", version = "0.6.0" }
-bevy_sprite3d = { version = "7.0.0-rc", git = "https://github.com/janhohenheim/bevy_sprite3d", branch = "bevy-0.17.0-rc" }
+bevy = { version = "0.18.0" }
+bevy_yarnspinner = { path = "../crates/bevy_plugin", version = "0.7.0" }
+bevy_yarnspinner_example_dialogue_view = { path = "../crates/example_dialogue_view", version = "0.7.0" }
+bevy_sprite3d = "8.0.0"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 getrandom = { version = "0.3", features = ["wasm_js"] }
diff --git a/demo/src/setup.rs b/demo/src/setup.rs
@@ -83,7 +83,7 @@ pub(crate) fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
         },
         StageCurtains,
     ));
-    commands.insert_resource(AmbientLight {
+    commands.insert_resource(GlobalAmbientLight {
         color: Color::srgb(1., 0.75, 0.7),
         brightness: 0.25,
         ..default()
diff --git a/examples/bevy_yarnspinner/Cargo.toml b/examples/bevy_yarnspinner/Cargo.toml
@@ -10,9 +10,9 @@ authors = ["Jan Hohenheim <jan@hohenheim.ch>"]
 publish = false
 
 [dependencies]
-bevy = { version = "0.17", features = ["file_watcher"] }
-bevy_yarnspinner = { path = "../../crates/bevy_plugin", version = "0.6" }
-bevy_yarnspinner_example_dialogue_view = { path = "../../crates/example_dialogue_view", version = "0.6" }
+bevy = { version = "0.18", features = ["file_watcher"] }
+bevy_yarnspinner = { path = "../../crates/bevy_plugin", version = "0.7" }
+bevy_yarnspinner_example_dialogue_view = { path = "../../crates/example_dialogue_view", version = "0.7" }
 
 [[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.6.0" }
+yarnspinner = { path = "../../crates/yarnspinner", version = "0.7.0" }
 
 [[bin]]
 name = "access_variables"
diff --git a/readme.md b/readme.md
@@ -137,6 +137,7 @@ cargo run
 
 | Bevy        | Yarn Spinner for Rust | 
 |-------------|---------------------- |
+| 0.18        | 0.7                   |
 | 0.17        | 0.6                   |
 | 0.16        | 0.5                   |
 | 0.15        | 0.4                   |

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ pub(crate) fn strings_file_asset_plugin(app: &mut App) {`
`16`	`16`	`.init_asset_loader::<StringsFileAssetLoader>();`
`17`	`17`	`}`
`18`	`18`
`19`		`-#[derive(Debug, Default)]`
	`19`	`+#[derive(Debug, Default, TypePath)]`
`20`	`20`	`struct StringsFileAssetLoader;`
`21`	`21`
`22`	`22`	`impl AssetLoader for StringsFileAssetLoader {`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ impl<'input> TypeCheckVisitor<'input> {`
`157`	`157`	`if func.return_type.is_some() {`
`158`	`158`	`continue;`
`159`	`159`	`}`
`160`		`- func.return_type = Box::new(expression_type.clone());`
	`160`	`+ *func.return_type = expression_type.clone();`
`161`	`161`	`} else {`
`162`	`162`	`self.visit(term.deref());`
`163`	`163`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ impl From<FunctionType> for Type {`
`44`	`44`	`impl FunctionType {`
`45`	`45`	`/// Sets the return type of this function signature`
`46`	`46`	`pub fn set_return_type(&mut self, return_type: impl Into<Option<Type>>) -> &mut Self {`
`47`		`- self.return_type = Box::new(return_type.into());`
	`47`	`+ *self.return_type = return_type.into();`
`48`	`48`	`self`
`49`	`49`	`}`
`50`	`50`