Skip to content

Commit 9103204

Browse files
janhohenheimjanhohenheim
authored
Merge pull request #207 from YarnSpinnerTool/bevy-0.14
Upgrade to Bevy 0.14
2 parents da56041 + 425e4b9 commit 9103204

File tree

11 files changed

+168
-161
lines changed

11 files changed

+168
-161
lines changed

‎Cargo.lock‎

Lines changed: 139 additions & 130 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎crates/bevy_plugin/Cargo.toml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "bevy_yarnspinner"
3-
version = "0.3.0-rc"
3+
version = "0.3.0"
44
edition = "2021"
55
repository = "https://github.com/YarnSpinnerTool/YarnSpinner-Rust"
66
homepage = "https://docs.yarnspinner.dev/"
@@ -20,27 +20,25 @@ audio_assets = ["bevy/bevy_audio", "bevy/vorbis"]
2020
anyhow = "1"
2121
csv = "1"
2222
serde = { version = "1", features = ["derive"] }
23-
yarnspinner = { path = "../yarnspinner", features = ["bevy", "serde"], version = "0.3.0-rc" }
23+
yarnspinner = { path = "../yarnspinner", features = ["bevy", "serde"], version = "0.3.0" }
2424
sha2 = "0.10"
2525
rand = { version = "0.8", features = ["small_rng"] }
2626

2727

2828
[dependencies.bevy]
29-
version = "0.14.0-rc.2"
29+
version = "0.14.0"
3030
default-features = false
3131
features = [
3232
"bevy_asset",
3333
"multi_threaded",
34-
# Remove when https://github.com/bevyengine/bevy/pull/13740 lands
35-
"bevy_scene",
3634
]
3735

3836
[dev-dependencies]
3937
tempfile = "3"
4038
static_assertions = "1.1.0"
4139

4240
[dev-dependencies.bevy]
43-
version = "0.14.0-rc.2"
41+
version = "0.14.0"
4442
default-features = false
4543
features = [
4644
"bevy_core_pipeline",

‎crates/compiler/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "yarnspinner_compiler"
3-
version = "0.3.0-rc"
3+
version = "0.3.0"
44
edition = "2021"
55
repository = "https://github.com/YarnSpinnerTool/YarnSpinner-Rust"
66
homepage = "https://docs.yarnspinner.dev/"
@@ -18,10 +18,10 @@ bevy = ["dep:bevy", "yarnspinner_core/bevy"]
1818
antlr-rust = "=0.3.0-beta"
1919
better_any = "=0.2.0"
2020
regex = "1"
21-
yarnspinner_core = { path = "../core", version = "0.3.0-rc" }
21+
yarnspinner_core = { path = "../core", version = "0.3.0" }
2222
annotate-snippets = "0.10"
2323
serde = { version = "1", features = ["derive"], optional = true }
24-
bevy = { version = "0.14.0-rc.2", default-features = false, optional = true }
24+
bevy = { version = "0.14.0", default-features = false, optional = true }
2525
rand = { version = "0.8", features = ["small_rng"] }
2626

2727
[target.'cfg(target_arch = "wasm32")'.dependencies]

‎crates/core/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "yarnspinner_core"
3-
version = "0.3.0-rc"
3+
version = "0.3.0"
44
edition = "2021"
55
repository = "https://github.com/YarnSpinnerTool/YarnSpinner-Rust"
66
homepage = "https://docs.yarnspinner.dev/"
@@ -18,7 +18,7 @@ bevy = ["dep:bevy"]
1818
yarnspinner_macros = { path = "../macros", version = "0.1" }
1919
prost = "0.12"
2020
serde = { version = "1", features = ["derive"], optional = true }
21-
bevy = { version = "0.14.0-rc.2", default-features = false, optional = true }
21+
bevy = { version = "0.14.0", default-features = false, optional = true }
2222

2323
[dev-dependencies]
2424
static_assertions = "1.1.0"

‎crates/example_dialogue_view/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "bevy_yarnspinner_example_dialogue_view"
3-
version = "0.3.0-rc"
3+
version = "0.3.0"
44
edition = "2021"
55
repository = "https://github.com/YarnSpinnerTool/YarnSpinner-Rust"
66
homepage = "https://docs.yarnspinner.dev/"
@@ -14,11 +14,11 @@ readme = "../../readme.md"
1414
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1515

1616
[dependencies]
17-
bevy_yarnspinner = { path = "../bevy_plugin", version = "0.3.0-rc" }
17+
bevy_yarnspinner = { path = "../bevy_plugin", version = "0.3.0" }
1818
unicode-segmentation = "1"
1919

2020
[dependencies.bevy]
21-
version = "0.14.0-rc.2"
21+
version = "0.14.0"
2222
default-features = false
2323
features = [
2424
"bevy_ui",

‎crates/runtime/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "yarnspinner_runtime"
3-
version = "0.3.0-rc"
3+
version = "0.3.0"
44
edition = "2021"
55
repository = "https://github.com/YarnSpinnerTool/YarnSpinner-Rust"
66
homepage = "https://docs.yarnspinner.dev/"
@@ -20,7 +20,7 @@ serde = [
2020
bevy = ["dep:bevy", "yarnspinner_core/bevy"]
2121

2222
[dependencies]
23-
yarnspinner_core = { path = "../core", version = "0.3.0-rc" }
23+
yarnspinner_core = { path = "../core", version = "0.3.0" }
2424
unicode-normalization = "0.1"
2525
unicode-segmentation = "1"
2626
log = "0.4"
@@ -30,4 +30,4 @@ fixed_decimal = { version = "0.5", features = ["ryu", "std"] }
3030
once_cell = "1"
3131
regex = "1"
3232
serde = { version = "1", features = ["derive"], optional = true }
33-
bevy = { version = "0.14.0-rc.2", default-features = false, optional = true }
33+
bevy = { version = "0.14.0", default-features = false, optional = true }

‎crates/yarnspinner/Cargo.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "yarnspinner"
3-
version = "0.3.0-rc"
3+
version = "0.3.0"
44
edition = "2021"
55
repository = "https://github.com/YarnSpinnerTool/YarnSpinner-Rust"
66
homepage = "https://docs.yarnspinner.dev/"
@@ -27,9 +27,9 @@ bevy = [
2727
]
2828

2929
[dependencies]
30-
yarnspinner_core = { path = "../core", version = "0.3.0-rc" }
31-
yarnspinner_compiler = { path = "../compiler", version = "0.3.0-rc" }
32-
yarnspinner_runtime = { path = "../runtime", version = "0.3.0-rc" }
30+
yarnspinner_core = { path = "../core", version = "0.3.0" }
31+
yarnspinner_compiler = { path = "../compiler", version = "0.3.0" }
32+
yarnspinner_runtime = { path = "../runtime", version = "0.3.0" }
3333
log = { version = "0.4", features = ["std"] }
3434

3535
[dev-dependencies]

‎demo/Cargo.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ description = "A demo for Bevy Yarn Spinner for Rust, the friendly tool for writ
1111
license = "MIT OR Apache-2.0"
1212

1313
[dependencies]
14-
bevy = { version = "0.14.0-rc.2" }
15-
bevy_yarnspinner = { path = "../crates/bevy_plugin", version = "0.3.0-rc" }
16-
bevy_yarnspinner_example_dialogue_view = { path = "../crates/example_dialogue_view", version = "0.3.0-rc" }
17-
# waiting for https://github.com/FraserLee/bevy_sprite3d/pull/21 to be merged
18-
bevy_sprite3d = { git = "https://github.com/janhohenheim/bevy_sprite3d", branch = "bevy-0.14.0-rc.2" }
14+
bevy = { version = "0.14.0" }
15+
bevy_yarnspinner = { path = "../crates/bevy_plugin", version = "0.3.0" }
16+
bevy_yarnspinner_example_dialogue_view = { path = "../crates/example_dialogue_view", version = "0.3.0" }
17+
# waiting for https://github.com/FraserLee/bevy_sprite3d/pull/22 to be merged
18+
bevy_sprite3d = { git = "https://github.com/janhohenheim/bevy_sprite3d", branch = "bevy-0.14" }

‎examples/bevy_yarnspinner/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ authors = ["Jan Hohenheim <[email protected]>"]
1010
publish = false
1111

1212
[dependencies]
13-
bevy = { version = "0.14.0-rc.2", features = ["file_watcher"] }
14-
bevy_yarnspinner = { path = "../../crates/bevy_plugin", version = "0.3.0-rc" }
15-
bevy_yarnspinner_example_dialogue_view = { path = "../../crates/example_dialogue_view", version = "0.3.0-rc" }
13+
bevy = { version = "0.14.0", features = ["file_watcher"] }
14+
bevy_yarnspinner = { path = "../../crates/bevy_plugin", version = "0.3.0" }
15+
bevy_yarnspinner_example_dialogue_view = { path = "../../crates/example_dialogue_view", version = "0.3.0" }
1616

1717
[[bin]]
1818
name = "access_variables"

‎examples/yarnspinner_without_bevy/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ publish = false
1313
crossterm = "0.27"
1414
ratatui = "0.26"
1515
anyhow = "1.0"
16-
yarnspinner = { path = "../../crates/yarnspinner", version = "0.3.0-rc" }
16+
yarnspinner = { path = "../../crates/yarnspinner", version = "0.3.0" }
1717

1818
[[bin]]
1919
name = "access_variables"

0 commit comments

Comments
 (0)