From 7f2b2b642727a454eaec03333731442463b97988 Mon Sep 17 00:00:00 2001 From: Jan Hohenheim Date: Tue, 11 Jun 2024 14:59:42 +0200 Subject: [PATCH] Bump versions --- Cargo.lock | 12 +++---- crates/bevy_plugin/Cargo.toml | 8 ++--- crates/compiler/Cargo.toml | 4 +-- crates/core/Cargo.toml | 2 +- crates/example_dialogue_view/Cargo.toml | 4 +-- crates/runtime/Cargo.toml | 12 +++---- crates/yarnspinner/Cargo.toml | 8 ++--- demo/Cargo.toml | 6 ++-- examples/bevy_yarnspinner/Cargo.toml | 4 +-- examples/yarnspinner_without_bevy/Cargo.toml | 4 +-- readme.md | 36 ++++++++++++-------- 11 files changed, 54 insertions(+), 46 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 73c9364b..974f0f5c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1175,7 +1175,7 @@ dependencies = [ [[package]] name = "bevy_yarnspinner" -version = "0.2.0" +version = "0.3.0-rc" dependencies = [ "anyhow", "bevy", @@ -1200,7 +1200,7 @@ dependencies = [ [[package]] name = "bevy_yarnspinner_example_dialogue_view" -version = "0.2.1" +version = "0.3.0-rc" dependencies = [ "bevy", "bevy_yarnspinner", @@ -4980,7 +4980,7 @@ checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" [[package]] name = "yarnspinner" -version = "0.2.0" +version = "0.3.0" dependencies = [ "anyhow", "log", @@ -5000,7 +5000,7 @@ dependencies = [ [[package]] name = "yarnspinner_compiler" -version = "0.2.1" +version = "0.3.0" dependencies = [ "annotate-snippets", "antlr-rust", @@ -5015,7 +5015,7 @@ dependencies = [ [[package]] name = "yarnspinner_core" -version = "0.2.0" +version = "0.3.0" dependencies = [ "bevy", "prost", @@ -5043,7 +5043,7 @@ dependencies = [ [[package]] name = "yarnspinner_runtime" -version = "0.2.0" +version = "0.3.0" dependencies = [ "bevy", "fixed_decimal", diff --git a/crates/bevy_plugin/Cargo.toml b/crates/bevy_plugin/Cargo.toml index c95c67dd..264457bb 100644 --- a/crates/bevy_plugin/Cargo.toml +++ b/crates/bevy_plugin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bevy_yarnspinner" -version = "0.2.0" +version = "0.3.0-rc" edition = "2021" repository = "https://github.com/YarnSpinnerTool/YarnSpinner-Rust" homepage = "https://docs.yarnspinner.dev/" @@ -20,7 +20,7 @@ audio_assets = ["bevy/bevy_audio", "bevy/vorbis"] anyhow = "1" csv = "1" serde = { version = "1", features = ["derive"] } -yarnspinner = { path = "../yarnspinner", features = ["bevy", "serde"], version = "0.2" } +yarnspinner = { path = "../yarnspinner", features = ["bevy", "serde"], version = "0.3" } sha2 = "0.10" rand = { version = "0.8", features = ["small_rng"] } @@ -37,8 +37,8 @@ tempfile = "3" version = "0.14.0-rc.2" default-features = false features = [ - "bevy_core_pipeline", - "bevy_audio", + "bevy_core_pipeline", + "bevy_audio", ] [target.'cfg(all(not(target_arch = "wasm32"), not(target_os = "android")))'.dependencies] diff --git a/crates/compiler/Cargo.toml b/crates/compiler/Cargo.toml index f73da91d..8da6f8f4 100644 --- a/crates/compiler/Cargo.toml +++ b/crates/compiler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "yarnspinner_compiler" -version = "0.2.1" +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_core/bevy"] antlr-rust = "=0.3.0-beta" better_any = "=0.2.0" regex = "1" -yarnspinner_core = { path = "../core", version = "0.2" } +yarnspinner_core = { path = "../core", version = "0.3" } annotate-snippets = "0.10" serde = { version = "1", features = ["derive"], optional = true } bevy = { version = "0.14.0-rc.2", default-features = false, optional = true } diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index 8eca027e..78621ccc 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "yarnspinner_core" -version = "0.2.0" +version = "0.3.0" edition = "2021" repository = "https://github.com/YarnSpinnerTool/YarnSpinner-Rust" homepage = "https://docs.yarnspinner.dev/" diff --git a/crates/example_dialogue_view/Cargo.toml b/crates/example_dialogue_view/Cargo.toml index 7f311378..4b2b506e 100644 --- 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.2.1" +version = "0.3.0-rc" edition = "2021" repository = "https://github.com/YarnSpinnerTool/YarnSpinner-Rust" homepage = "https://docs.yarnspinner.dev/" @@ -14,7 +14,7 @@ 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.2" } +bevy_yarnspinner = { path = "../bevy_plugin", version = "0.3.0-rc" } unicode-segmentation = "1" [dependencies.bevy] diff --git a/crates/runtime/Cargo.toml b/crates/runtime/Cargo.toml index 469d0d69..b5eb5798 100644 --- a/crates/runtime/Cargo.toml +++ b/crates/runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "yarnspinner_runtime" -version = "0.2.0" +version = "0.3.0" edition = "2021" repository = "https://github.com/YarnSpinnerTool/YarnSpinner-Rust" homepage = "https://docs.yarnspinner.dev/" @@ -12,15 +12,15 @@ description = "Runtime / VM for Yarn Spinner for Rust, the friendly tool for wri [features] default = [] serde = [ - "dep:serde", - "bevy?/serialize", - "yarnspinner_core/serde", - "icu_locid/serde", + "dep:serde", + "bevy?/serialize", + "yarnspinner_core/serde", + "icu_locid/serde", ] bevy = ["dep:bevy", "yarnspinner_core/bevy"] [dependencies] -yarnspinner_core = { path = "../core", version = "0.2" } +yarnspinner_core = { path = "../core", version = "0.3" } unicode-normalization = "0.1" unicode-segmentation = "1" log = "0.4" diff --git a/crates/yarnspinner/Cargo.toml b/crates/yarnspinner/Cargo.toml index 6b893ab2..a9bf6870 100644 --- a/crates/yarnspinner/Cargo.toml +++ b/crates/yarnspinner/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "yarnspinner" -version = "0.2.0" +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.2" } -yarnspinner_compiler = { path = "../compiler", version = "0.2" } -yarnspinner_runtime = { path = "../runtime", version = "0.2" } +yarnspinner_core = { path = "../core", version = "0.3" } +yarnspinner_compiler = { path = "../compiler", version = "0.3" } +yarnspinner_runtime = { path = "../runtime", version = "0.3" } log = { version = "0.4", features = ["std"] } [dev-dependencies] diff --git a/demo/Cargo.toml b/demo/Cargo.toml index 2ba5d1c5..04629e56 100644 --- 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 = "0.14.0-rc.2" -bevy_yarnspinner = { path = "../crates/bevy_plugin", version = "0.2" } -bevy_yarnspinner_example_dialogue_view = { path = "../crates/example_dialogue_view", version = "0.2" } +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" } diff --git a/examples/bevy_yarnspinner/Cargo.toml b/examples/bevy_yarnspinner/Cargo.toml index 09702ebc..10bd5484 100644 --- a/examples/bevy_yarnspinner/Cargo.toml +++ b/examples/bevy_yarnspinner/Cargo.toml @@ -11,8 +11,8 @@ publish = false [dependencies] bevy = { version = "0.14.0-rc.2", features = ["file_watcher"] } -bevy_yarnspinner = { path = "../../crates/bevy_plugin", version = "0.2" } -bevy_yarnspinner_example_dialogue_view = { path = "../../crates/example_dialogue_view", version = "0.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" } [[bin]] name = "access_variables" diff --git a/examples/yarnspinner_without_bevy/Cargo.toml b/examples/yarnspinner_without_bevy/Cargo.toml index c2e2e0f8..62563fa6 100644 --- 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.2" } +yarnspinner = { path = "../../crates/yarnspinner", version = "0.3" } [[bin]] name = "access_variables" @@ -29,4 +29,4 @@ doc = false [[bin]] name = "hello_world" -doc = false \ No newline at end of file +doc = false diff --git a/readme.md b/readme.md index 31e441d0..df8b42e7 100644 --- a/readme.md +++ b/readme.md @@ -1,25 +1,31 @@ # Yarn Spinner for Rust + [![Crates.io](https://img.shields.io/crates/v/bevy_yarnspinner.svg)](https://crates.io/crates/bevy_yarnspinner) [![Docs](https://docs.rs/bevy_yarnspinner/badge.svg)](https://docs.rs/bevy_yarnspinner/latest/bevy_yarnspinner/) [![Discord](https://img.shields.io/discord/754171172693868585.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/yarnspinner) > **Note:** -> Yarn Spinner for Rust is a work-in-progress project. We don't currently offer any official support for it. We encourage you to file [issues](https://github.com/YarnSpinnerTool/YarnSpinner-Rust/issues/new) if you have them, and to join the official [Yarn Spinner Discord](https://discord.gg/yarnspinner) to discuss the project! +> Yarn Spinner for Rust is a work-in-progress project. We don't currently offer any official support for it. We encourage you to +> file [issues](https://github.com/YarnSpinnerTool/YarnSpinner-Rust/issues/new) if you have them, and to join the official [Yarn Spinner Discord](https://discord.gg/yarnspinner) to discuss the project! -The Rust port of Yarn Spinner, the friendly tool for writing game dialogue. Read more on [docs.yarnspinner.dev](https://docs.yarnspinner.dev/using-yarnspinner-with-rust/overview) or check out +The Rust port of Yarn Spinner, the friendly tool for writing game dialogue. Read more on [docs.yarnspinner.dev](https://docs.yarnspinner.dev/using-yarnspinner-with-rust/overview) or check out the [live demo](https://janhohenheim.itch.io/yarnspinner-rust-demo), which was written using the [Bevy engine](https://bevyengine.org/). -This project offers first class support for Bevy and assumes you are using it. If you are not, check out the [relevant section of the book](https://yarnspinnertool.github.io/YarnSpinner-Rust/working_without_bevy) +This project offers first class support for Bevy and assumes you are using it. If you are not, check out +the [relevant section of the book](https://yarnspinnertool.github.io/YarnSpinner-Rust/working_without_bevy) [![Yarn Spinner for Rust Demo](https://img.itch.zone/aW1hZ2UvMjExMjc5NC8xMjQ0MjEwNy5wbmc=/original/LpAOnR.png)](https://janhohenheim.itch.io/yarn-slinger-demo) ## Quickstart + Taken straight from our [examples](https://github.com/YarnSpinnerTool/YarnSpinner-Rust/tree/main/examples/bevy_yarnspinner): First, let's add our dependencies: + ```bash cargo add bevy bevy_yarnspinner bevy_yarnspinner_example_dialogue_view ``` Now, the `main.rs`: + ```rust use bevy::prelude::*; use bevy_yarnspinner::prelude::*; @@ -36,13 +42,13 @@ fn main() { // Initialize the bundled example UI ExampleYarnSpinnerDialogueViewPlugin::new(), )) - .add_systems(Startup, setup_camera) - .add_systems( - Update, - // Spawn the dialogue runner once the Yarn project has finished compiling - spawn_dialogue_runner.run_if(resource_added::()), - ) - .run(); + .add_systems(Startup, setup_camera) + .add_systems( + Update, + // Spawn the dialogue runner once the Yarn project has finished compiling + spawn_dialogue_runner.run_if(resource_added::()), + ) + .run(); } fn setup_camera(mut commands: Commands) { @@ -59,6 +65,7 @@ fn spawn_dialogue_runner(mut commands: Commands, project: Res) { ``` And finally, the `assets/dialogue/hello_world.yarn`: + ```text title: HelloWorld --- @@ -98,7 +105,8 @@ Et voilà! That was all. Thanks for checking out Yarn Spinner for Rust! Continui ## Version Table -| Bevy | Yarn Spinner for Rust | -|------|-----------------------| -| 0.13 | 0.2 | -| 0.12 | 0.1 | +| Bevy | Yarn Spinner for Rust | +|-------------|-----------------------| +| 0.14.0-rc.2 | 0.3.0-rc | +| 0.13 | 0.2 | +| 0.12 | 0.1 |