Skip to content

Commit be8f5f6

Browse files
makspllmakspll
authored
Merge branch 'main' into feat/bevy-0.17
2 parents 7224f2f + 7dd5518 commit be8f5f6

File tree

10 files changed

+195
-86
lines changed

10 files changed

+195
-86
lines changed

‎Cargo.toml‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ categories.workspace = true
1313
readme.workspace = true
1414

1515
[workspace.package]
16-
version = "0.16.1"
16+
version = "0.17.0"
1717
edition = "2024"
1818
authors = ["Maksymilian Mozolewski <[email protected]>"]
1919
license = "MIT OR Apache-2.0"
@@ -123,23 +123,24 @@ ladfile_builder = { workspace = true, optional = true }
123123
# local crates
124124
script_integration_test_harness = { path = "crates/testing_crates/script_integration_test_harness" }
125125
test_utils = { path = "crates/testing_crates/test_utils" }
126-
bevy_mod_scripting_functions = { path = "crates/bevy_mod_scripting_functions", version = "0.16.1", default-features = false }
127-
bevy_mod_scripting_derive = { path = "crates/bevy_mod_scripting_derive", version = "0.16.1" }
128-
bevy_system_reflection = { path = "crates/bevy_system_reflection", version = "0.3.1", default-features = false }
129-
ladfile = { path = "crates/ladfile", version = "0.6.1" }
130-
ladfile_builder = { path = "crates/ladfile_builder", version = "0.6.1" }
131-
bevy_mod_scripting_lua = { path = "crates/languages/bevy_mod_scripting_lua", version = "0.16.1", default-features = false }
132-
bevy_mod_scripting_rhai = { path = "crates/languages/bevy_mod_scripting_rhai", version = "0.16.1", default-features = false }
133-
bevy_mod_scripting_asset = { path = "crates/bevy_mod_scripting_asset", version = "0.16.1", default-features = false }
134-
bevy_mod_scripting_bindings = { path = "crates/bevy_mod_scripting_bindings", version = "0.16.1", default-features = false }
135-
bevy_mod_scripting_bindings_domain = { path = "crates/bevy_mod_scripting_bindings_domain", version = "0.16.1", default-features = false }
136-
bevy_mod_scripting_display = { path = "crates/bevy_mod_scripting_display", version = "0.16.1", default-features = false }
137-
bevy_mod_scripting_script = { path = "crates/bevy_mod_scripting_script", version = "0.16.1", default-features = false }
138-
lua_language_server_lad_backend = { path = "crates/lad_backends/lua_language_server_lad_backend", version = "0.16.1", default-features = false }
126+
bevy_mod_scripting_functions = { path = "crates/bevy_mod_scripting_functions", version = "0.17.0", default-features = false }
127+
bevy_mod_scripting_derive = { path = "crates/bevy_mod_scripting_derive", version = "0.17.0" }
128+
bevy_system_reflection = { path = "crates/bevy_system_reflection", version = "0.17.0", default-features = false }
129+
ladfile = { path = "crates/ladfile", version = "0.17.0" }
130+
ladfile_builder = { path = "crates/ladfile_builder", version = "0.17.0" }
131+
bevy_mod_scripting_lua = { path = "crates/languages/bevy_mod_scripting_lua", version = "0.17.0", default-features = false }
132+
bevy_mod_scripting_rhai = { path = "crates/languages/bevy_mod_scripting_rhai", version = "0.17.0", default-features = false }
133+
bevy_mod_scripting_asset = { path = "crates/bevy_mod_scripting_asset", version = "0.17.0", default-features = false }
134+
bevy_mod_scripting_bindings = { path = "crates/bevy_mod_scripting_bindings", version = "0.17.0", default-features = false }
135+
bevy_mod_scripting_bindings_domain = { path = "crates/bevy_mod_scripting_bindings_domain", version = "0.17.0", default-features = false }
136+
bevy_mod_scripting_display = { path = "crates/bevy_mod_scripting_display", version = "0.17.0", default-features = false }
137+
bevy_mod_scripting_script = { path = "crates/bevy_mod_scripting_script", version = "0.17.0", default-features = false }
138+
lua_language_server_lad_backend = { path = "crates/lad_backends/lua_language_server_lad_backend", version = "0.17.0", default-features = false }
139+
bevy_mod_scripting_core = { path = "crates/bevy_mod_scripting_core", version = "0.17.0" }
139140

140141
# bevy
141142

142-
bevy_mod_scripting_core = { path = "crates/bevy_mod_scripting_core", version = "0.16.1" }
143+
143144
bevy = { version = "0.17", default-features = false }
144145
bevy_math = { version = "0.17", default-features = false, features = ["std"] }
145146
bevy_transform = { version = "0.17", default-features = false }
@@ -272,12 +273,12 @@ members = [
272273
"crates/lad_backends/mdbook_lad_preprocessor",
273274
"crates/ladfile_builder",
274275
"crates/bevy_system_reflection",
275-
"crates/bindings/*",
276276
"crates/bevy_mod_scripting_asset",
277277
"crates/bevy_mod_scripting_bindings",
278278
"crates/bevy_mod_scripting_display",
279279
"crates/bevy_mod_scripting_script",
280280
"crates/bevy_mod_scripting_bindings_domain",
281+
"crates/bindings/*",
281282
]
282283
resolver = "2"
283284
exclude = ["codegen", "crates/macro_tests", "xtask"]

‎crates/bevy_mod_scripting_functions/Cargo.toml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -48,38 +48,38 @@ bevy_mod_scripting_display = { workspace = true }
4848
bevy_mod_scripting_asset = { workspace = true }
4949
bevy_mod_scripting_script = { workspace = true }
5050
bevy_mod_scripting_derive = { workspace = true }
51-
bevy_mod_scripting_lua = { path = "../languages/bevy_mod_scripting_lua", optional = true, version = "0.16.1" }
52-
bevy_mod_scripting_rhai = { path = "../languages/bevy_mod_scripting_rhai", optional = true, version = "0.16.1" }
53-
bevy_system_reflection = { path = "../bevy_system_reflection", version = "0.3.1" }
51+
bevy_mod_scripting_lua = { path = "../languages/bevy_mod_scripting_lua", optional = true, version = "0.17.0" }
52+
bevy_mod_scripting_rhai = { path = "../languages/bevy_mod_scripting_rhai", optional = true, version = "0.17.0" }
53+
bevy_system_reflection = { path = "../bevy_system_reflection", version = "0.17.0" }
5454

5555
bevy_ecs = { workspace = true, features = ["std", "bevy_reflect"] }
5656
bevy_app = { workspace = true }
5757
bevy_asset = { workspace = true }
5858
bevy_platform = { workspace = true, features = ["std"] }
5959
bevy_reflect = { workspace = true, features = [] }
6060

61-
bevy_a11y_bms_bindings = { path = "../bindings/bevy_a11y_bms_bindings", version = "0.16.1", optional = true }
62-
bevy_animation_bms_bindings = { path = "../bindings/bevy_animation_bms_bindings", version = "0.16.1", optional = true }
63-
bevy_asset_bms_bindings = { path = "../bindings/bevy_asset_bms_bindings", version = "0.16.1", optional = true }
64-
bevy_color_bms_bindings = { path = "../bindings/bevy_color_bms_bindings", version = "0.16.1", optional = true }
65-
bevy_core_pipeline_bms_bindings = { path = "../bindings/bevy_core_pipeline_bms_bindings", version = "0.16.1", optional = true }
66-
bevy_ecs_bms_bindings = { path = "../bindings/bevy_ecs_bms_bindings", version = "0.16.1", optional = true }
67-
bevy_gizmos_bms_bindings = { path = "../bindings/bevy_gizmos_bms_bindings", version = "0.16.1", optional = true }
68-
bevy_gltf_bms_bindings = { path = "../bindings/bevy_gltf_bms_bindings", version = "0.16.1", optional = true }
69-
bevy_image_bms_bindings = { path = "../bindings/bevy_image_bms_bindings", version = "0.16.1", optional = true }
70-
bevy_input_bms_bindings = { path = "../bindings/bevy_input_bms_bindings", version = "0.16.1", optional = true }
71-
bevy_input_focus_bms_bindings = { path = "../bindings/bevy_input_focus_bms_bindings", version = "0.16.1", optional = true }
72-
bevy_math_bms_bindings = { path = "../bindings/bevy_math_bms_bindings", version = "0.16.1", optional = true }
73-
bevy_mesh_bms_bindings = { path = "../bindings/bevy_mesh_bms_bindings", version = "0.16.1", optional = true }
74-
bevy_pbr_bms_bindings = { path = "../bindings/bevy_pbr_bms_bindings", version = "0.16.1", optional = true }
75-
bevy_picking_bms_bindings = { path = "../bindings/bevy_picking_bms_bindings", version = "0.16.1", optional = true }
76-
bevy_reflect_bms_bindings = { path = "../bindings/bevy_reflect_bms_bindings", version = "0.16.1", optional = true }
77-
bevy_render_bms_bindings = { path = "../bindings/bevy_render_bms_bindings", version = "0.16.1", optional = true }
78-
bevy_scene_bms_bindings = { path = "../bindings/bevy_scene_bms_bindings", version = "0.16.1", optional = true }
79-
bevy_sprite_bms_bindings = { path = "../bindings/bevy_sprite_bms_bindings", version = "0.16.1", optional = true }
80-
bevy_text_bms_bindings = { path = "../bindings/bevy_text_bms_bindings", version = "0.16.1", optional = true }
81-
bevy_time_bms_bindings = { path = "../bindings/bevy_time_bms_bindings", version = "0.16.1", optional = true }
82-
bevy_transform_bms_bindings = { path = "../bindings/bevy_transform_bms_bindings", version = "0.16.1", optional = true }
61+
bevy_a11y_bms_bindings = { path = "../bindings/bevy_a11y_bms_bindings", version = "0.17.0", optional = true }
62+
bevy_animation_bms_bindings = { path = "../bindings/bevy_animation_bms_bindings", version = "0.17.0", optional = true }
63+
bevy_asset_bms_bindings = { path = "../bindings/bevy_asset_bms_bindings", version = "0.17.0", optional = true }
64+
bevy_color_bms_bindings = { path = "../bindings/bevy_color_bms_bindings", version = "0.17.0", optional = true }
65+
bevy_core_pipeline_bms_bindings = { path = "../bindings/bevy_core_pipeline_bms_bindings", version = "0.17.0", optional = true }
66+
bevy_ecs_bms_bindings = { path = "../bindings/bevy_ecs_bms_bindings", version = "0.17.0", optional = true }
67+
bevy_gizmos_bms_bindings = { path = "../bindings/bevy_gizmos_bms_bindings", version = "0.17.0", optional = true }
68+
bevy_gltf_bms_bindings = { path = "../bindings/bevy_gltf_bms_bindings", version = "0.17.0", optional = true }
69+
bevy_image_bms_bindings = { path = "../bindings/bevy_image_bms_bindings", version = "0.17.0", optional = true }
70+
bevy_input_bms_bindings = { path = "../bindings/bevy_input_bms_bindings", version = "0.17.0", optional = true }
71+
bevy_input_focus_bms_bindings = { path = "../bindings/bevy_input_focus_bms_bindings", version = "0.17.0", optional = true }
72+
bevy_math_bms_bindings = { path = "../bindings/bevy_math_bms_bindings", version = "0.17.0", optional = true }
73+
bevy_mesh_bms_bindings = { path = "../bindings/bevy_mesh_bms_bindings", version = "0.17.0", optional = true }
74+
bevy_pbr_bms_bindings = { path = "../bindings/bevy_pbr_bms_bindings", version = "0.17.0", optional = true }
75+
bevy_picking_bms_bindings = { path = "../bindings/bevy_picking_bms_bindings", version = "0.17.0", optional = true }
76+
bevy_reflect_bms_bindings = { path = "../bindings/bevy_reflect_bms_bindings", version = "0.17.0", optional = true }
77+
bevy_render_bms_bindings = { path = "../bindings/bevy_render_bms_bindings", version = "0.17.0", optional = true }
78+
bevy_scene_bms_bindings = { path = "../bindings/bevy_scene_bms_bindings", version = "0.17.0", optional = true }
79+
bevy_sprite_bms_bindings = { path = "../bindings/bevy_sprite_bms_bindings", version = "0.17.0", optional = true }
80+
bevy_text_bms_bindings = { path = "../bindings/bevy_text_bms_bindings", version = "0.17.0", optional = true }
81+
bevy_time_bms_bindings = { path = "../bindings/bevy_time_bms_bindings", version = "0.17.0", optional = true }
82+
bevy_transform_bms_bindings = { path = "../bindings/bevy_transform_bms_bindings", version = "0.17.0", optional = true }
8383

8484
[lints]
8585
workspace = true

‎crates/bevy_system_reflection/Cargo.toml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
[package]
22
name = "bevy_system_reflection"
3-
version = "0.3.1"
4-
edition = "2024"
5-
authors = ["Maksymilian Mozolewski <[email protected]>"]
6-
license = "MIT OR Apache-2.0"
73
description = "Utilities for reflecting systems, schedules, system sets and rendering schedules"
8-
repository = "https://github.com/makspll/bevy_mod_scripting"
9-
homepage = "https://github.com/makspll/bevy_mod_scripting"
10-
keywords = ["bevy", "gamedev", "scripting", "lua"]
11-
categories = ["game-development"]
12-
readme = "readme.md"
4+
version.workspace = true
5+
edition.workspace = true
6+
authors.workspace = true
7+
license.workspace = true
8+
homepage.workspace = true
9+
repository.workspace = true
10+
keywords.workspace = true
11+
categories.workspace = true
12+
readme.workspace = true
13+
1314

1415
[dependencies]
1516
bevy_ecs = { workspace = true, default-features = false, features = [] }

‎crates/lad_backends/lua_language_server_lad_backend/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ clap = { version = "4", features = ["derive"] }
1818
anyhow = "1"
1919
tera = "1.20"
2020
strum = { version = "0.25", features = ["derive"] }
21-
ladfile = { path = "../../ladfile", version = "0.6.1" }
21+
ladfile = { path = "../../ladfile", version = "0.17.0" }
2222
env_logger = "0.11"
2323
log = "0.4"
2424
serde = { version = "1.0", features = ["derive"] }

‎crates/lad_backends/mdbook_lad_preprocessor/Cargo.toml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[package]
22
name = "mdbook_lad_preprocessor"
3-
version = "0.3.1"
43
description = "Language Agnostic Declaration (LAD) file format for the bevy_mod_scripting crate"
54
readme = "readme.md"
5+
version.workspace = true
66
edition.workspace = true
77
authors.workspace = true
88
license.workspace = true
@@ -11,6 +11,7 @@ repository.workspace = true
1111
keywords.workspace = true
1212
categories.workspace = true
1313

14+
1415
[dependencies]
1516
env_logger = { workspace = true }
1617
clap = { workspace = true }

‎crates/ladfile/Cargo.toml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[package]
22
name = "ladfile"
3-
version = "0.6.1"
43
description = "Language Agnostic Declaration (LAD) file format for the bevy_mod_scripting crate"
54
readme = "readme.md"
5+
version.workspace = true
66
edition.workspace = true
77
authors.workspace = true
88
license.workspace = true
@@ -11,6 +11,7 @@ repository.workspace = true
1111
keywords.workspace = true
1212
categories.workspace = true
1313

14+
1415
[dependencies]
1516
serde = { workspace = true, features = ["derive", "std"] }
1617
serde_json = { workspace = true, features = ["std"] }

‎crates/ladfile_builder/Cargo.toml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "ladfile_builder"
3-
version = "0.6.1"
43
description = "Language Agnostic Declaration (LAD) file format for the bevy_mod_scripting crate"
4+
version.workspace = true
55
edition.workspace = true
66
authors.workspace = true
77
license.workspace = true
@@ -11,6 +11,7 @@ keywords.workspace = true
1111
categories.workspace = true
1212
readme.workspace = true
1313

14+
1415
[features]
1516
default = []
1617
lua_language_server_files = ["lua_language_server_lad_backend"]

‎crates/languages/bevy_mod_scripting_lua/src/bindings/script_value.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ impl FromLua for LuaScriptValue {
5959
Value::String(s) => ScriptValue::String(s.to_str()?.to_owned().into()),
6060
Value::Function(f) => ScriptValue::Function(
6161
(move |_context: FunctionCallContext, args: VecDeque<ScriptValue>| {
62-
println!("Lua function called with args: {args:?}");
6362
match f.call::<LuaScriptValue>(
6463
args.into_iter()
6564
.map(LuaScriptValue)

‎crates/languages/bevy_mod_scripting_rune/Cargo.toml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
[package]
22
name = "bevy_mod_scripting_rune"
3-
version = "0.9.0-alpha.2"
4-
edition = "2024"
5-
license = "MIT OR Apache-2.0"
63
description = "Necessary functionality for Rune support with bevy_mod_scripting"
7-
repository = "https://github.com/makspll/bevy_mod_scripting"
8-
homepage = "https://github.com/makspll/bevy_mod_scripting"
9-
keywords = ["bevy", "gamedev", "scripting", "rune"]
10-
categories = ["game-development"]
11-
readme = "readme.md"
4+
version.workspace = true
5+
edition.workspace = true
6+
authors.workspace = true
7+
license.workspace = true
8+
homepage.workspace = true
9+
repository.workspace = true
10+
keywords.workspace = true
11+
categories.workspace = true
12+
readme.workspace = true
13+
1214

1315
[lib]
1416
name = "bevy_mod_scripting_rune"

0 commit comments

Comments
 (0)