feat!: Update to Bevy 0.16 (#422)

Co-authored-by: makspll <makspl17@gmail.com>

Author: alexparlett

.gitignore

@@ -15,6 +15,7 @@ assets/scripts/tlconfig.lua
 **.log
 **build/
 .html
+.idea/
 
 /assets/**/*.lad.json
-/docs/src/ladfiles/*.lad.json
+/docs/src/ladfiles/*.lad.json

Cargo.toml

@@ -23,9 +23,7 @@ features = ["lua54", "rhai"]
 [features]
 default = [
     "core_functions",
-    "bevy_core_bindings",
     "bevy_ecs_bindings",
-    "bevy_hierarchy_bindings",
     "bevy_input_bindings",
     "bevy_math_bindings",
     "bevy_reflect_bindings",
@@ -48,9 +46,7 @@ luau = ["bevy_mod_scripting_lua/luau", "lua"]
 
 # bindings 
 core_functions = ["bevy_mod_scripting_functions/core_functions"]
-bevy_core_bindings = ["bevy_mod_scripting_functions/bevy_core"]
 bevy_ecs_bindings = ["bevy_mod_scripting_functions/bevy_ecs"]
-bevy_hierarchy_bindings = ["bevy_mod_scripting_functions/bevy_hierarchy"]
 bevy_input_bindings = ["bevy_mod_scripting_functions/bevy_input"]
 bevy_math_bindings = ["bevy_mod_scripting_functions/bevy_math"]
 bevy_reflect_bindings = ["bevy_mod_scripting_functions/bevy_reflect"]
@@ -75,6 +71,8 @@ profile_with_tracy = ["bevy/trace_tracy"]
 
 [dependencies]
 bevy = { workspace = true }
+bevy_math = { workspace = true }
+bevy_reflect = { workspace = true }
 bevy_mod_scripting_core = { workspace = true }
 bevy_mod_scripting_lua = { path = "crates/languages/bevy_mod_scripting_lua", version = "0.13.0", optional = true }
 bevy_mod_scripting_rhai = { path = "crates/languages/bevy_mod_scripting_rhai", version = "0.13.0", optional = true }
@@ -84,7 +82,9 @@ bevy_mod_scripting_derive = { workspace = true }
 
 [workspace.dependencies]
 profiling = { version = "1.0" }
-bevy = { version = "0.15.3", default-features = false }
+bevy = { version = "0.16.0", default-features = false }
+bevy_math = { version = "0.16.0" }
+bevy_reflect = { version = "0.16.0" }
 bevy_mod_scripting_core = { path = "crates/bevy_mod_scripting_core", version = "0.13.0" }
 bevy_mod_scripting_functions = { path = "crates/bevy_mod_scripting_functions", version = "0.13.0", default-features = false }
 bevy_mod_scripting_derive = { path = "crates/bevy_mod_scripting_derive", version = "0.13.0" }
@@ -94,19 +94,17 @@ script_integration_test_harness = { path = "crates/testing_crates/script_integra
 test_utils = { path = "crates/testing_crates/test_utils" }
 
 [dev-dependencies]
-bevy = { workspace = true, default-features = true }
+bevy = { workspace = true, default-features = true, features = ["std"] }
 clap = { version = "4.1", features = ["derive"] }
-rand = "0.8.5"
-bevy_console = "0.13"
-# rhai-rand = "0.1"
+rand = "0.9.1"
 criterion = { version = "0.5" }
-ansi-parser = "0.9"
 ladfile_builder = { path = "crates/ladfile_builder", version = "0.3.3" }
 script_integration_test_harness = { workspace = true }
 test_utils = { workspace = true }
 libtest-mimic = "0.8"
 tracing-tracy = "0.11"
 regex = "1.11"
+bevy_console = "0.14"
 
 [workspace]
 members = [

assets/tests/add_system/added_systems_run_in_parallel.lua

@@ -21,21 +21,30 @@ function on_test()
 
     local expected_dot_graph = [[
 digraph {
-  node_0 [label="bevy_mod_scripting_core::bindings::allocator::garbage_collector"];
-  node_1 [label="on_test_post_update"];
-  node_2 [label="script_integration_test_harness::dummy_before_post_update_system"];
-  node_3 [label="script_integration_test_harness::dummy_post_update_system"];
-  node_4 [label="custom_system_a"];
-  node_5 [label="custom_system_b"];
-  node_6 [label="SystemSet GarbageCollection"];
-  node_7 [label="SystemSet ScriptSystem(custom_system_a)"];
-  node_8 [label="SystemSet ScriptSystem(custom_system_b)"];
-  node_0 -> node_6 [color=red, label="child of", arrowhead=diamond];
-  node_4 -> node_7 [color=red, label="child of", arrowhead=diamond];
-  node_5 -> node_8 [color=red, label="child of", arrowhead=diamond];
-  node_1 -> node_4 [color=blue, label="runs before", arrowhead=normal];
-  node_1 -> node_5 [color=blue, label="runs before", arrowhead=normal];
-  node_2 -> node_3 [color=blue, label="runs before", arrowhead=normal];
+  node_0 [label="bevy_asset::assets::Assets<bevy_asset::folder::LoadedFolder>::asset_events"];
+  node_1 [label="bevy_asset::assets::Assets<bevy_asset::assets::LoadedUntypedAsset>::asset_events"];
+  node_2 [label="bevy_asset::assets::Assets<()>::asset_events"];
+  node_3 [label="bevy_asset::assets::Assets<bevy_mod_scripting_core::asset::ScriptAsset>::asset_events"];
+  node_4 [label="bevy_mod_scripting_core::bindings::allocator::garbage_collector"];
+  node_5 [label="on_test_post_update"];
+  node_6 [label="script_integration_test_harness::dummy_before_post_update_system"];
+  node_7 [label="script_integration_test_harness::dummy_post_update_system"];
+  node_8 [label="custom_system_a"];
+  node_9 [label="custom_system_b"];
+  node_10 [label="SystemSet AssetEvents"];
+  node_11 [label="SystemSet GarbageCollection"];
+  node_12 [label="SystemSet ScriptSystem(custom_system_a)"];
+  node_13 [label="SystemSet ScriptSystem(custom_system_b)"];
+  node_0 -> node_10 [color=red, label="child of", arrowhead=diamond];
+  node_1 -> node_10 [color=red, label="child of", arrowhead=diamond];
+  node_2 -> node_10 [color=red, label="child of", arrowhead=diamond];
+  node_3 -> node_10 [color=red, label="child of", arrowhead=diamond];
+  node_4 -> node_11 [color=red, label="child of", arrowhead=diamond];
+  node_8 -> node_12 [color=red, label="child of", arrowhead=diamond];
+  node_9 -> node_13 [color=red, label="child of", arrowhead=diamond];
+  node_5 -> node_8 [color=blue, label="runs before", arrowhead=normal];
+  node_5 -> node_9 [color=blue, label="runs before", arrowhead=normal];
+  node_6 -> node_7 [color=blue, label="runs before", arrowhead=normal];
 }
     ]]
 

assets/tests/add_system/added_systems_run_in_parallel.rhai

@@ -20,21 +20,30 @@ fn on_test() {
 
     let expected_dot_graph = `
 digraph {
-  node_0 [label="bevy_mod_scripting_core::bindings::allocator::garbage_collector"];
-  node_1 [label="on_test_post_update"];
-  node_2 [label="script_integration_test_harness::dummy_before_post_update_system"];
-  node_3 [label="script_integration_test_harness::dummy_post_update_system"];
-  node_4 [label="custom_system_a"];
-  node_5 [label="custom_system_b"];
-  node_6 [label="SystemSet GarbageCollection"];
-  node_7 [label="SystemSet ScriptSystem(custom_system_a)"];
-  node_8 [label="SystemSet ScriptSystem(custom_system_b)"];
-  node_0 -> node_6 [color=red, label="child of", arrowhead=diamond];
-  node_4 -> node_7 [color=red, label="child of", arrowhead=diamond];
-  node_5 -> node_8 [color=red, label="child of", arrowhead=diamond];
-  node_1 -> node_4 [color=blue, label="runs before", arrowhead=normal];
-  node_1 -> node_5 [color=blue, label="runs before", arrowhead=normal];
-  node_2 -> node_3 [color=blue, label="runs before", arrowhead=normal];
+  node_0 [label="bevy_asset::assets::Assets<bevy_asset::folder::LoadedFolder>::asset_events"];
+  node_1 [label="bevy_asset::assets::Assets<bevy_asset::assets::LoadedUntypedAsset>::asset_events"];
+  node_2 [label="bevy_asset::assets::Assets<()>::asset_events"];
+  node_3 [label="bevy_asset::assets::Assets<bevy_mod_scripting_core::asset::ScriptAsset>::asset_events"];
+  node_4 [label="bevy_mod_scripting_core::bindings::allocator::garbage_collector"];
+  node_5 [label="on_test_post_update"];
+  node_6 [label="script_integration_test_harness::dummy_before_post_update_system"];
+  node_7 [label="script_integration_test_harness::dummy_post_update_system"];
+  node_8 [label="custom_system_a"];
+  node_9 [label="custom_system_b"];
+  node_10 [label="SystemSet AssetEvents"];
+  node_11 [label="SystemSet GarbageCollection"];
+  node_12 [label="SystemSet ScriptSystem(custom_system_a)"];
+  node_13 [label="SystemSet ScriptSystem(custom_system_b)"];
+  node_0 -> node_10 [color=red, label="child of", arrowhead=diamond];
+  node_1 -> node_10 [color=red, label="child of", arrowhead=diamond];
+  node_2 -> node_10 [color=red, label="child of", arrowhead=diamond];
+  node_3 -> node_10 [color=red, label="child of", arrowhead=diamond];
+  node_4 -> node_11 [color=red, label="child of", arrowhead=diamond];
+  node_8 -> node_12 [color=red, label="child of", arrowhead=diamond];
+  node_9 -> node_13 [color=red, label="child of", arrowhead=diamond];
+  node_5 -> node_8 [color=blue, label="runs before", arrowhead=normal];
+  node_5 -> node_9 [color=blue, label="runs before", arrowhead=normal];
+  node_6 -> node_7 [color=blue, label="runs before", arrowhead=normal];
 }`; 
 
     assert_str_eq.call(dot_graph, expected_dot_graph, "Expected the schedule graph to match the expected graph");

benches/benchmarks.rs

@@ -1,27 +1,28 @@
-use bevy::log::tracing_subscriber::layer::SubscriberExt;
-use bevy::log::{tracing_subscriber, Level};
-use bevy::reflect::Reflect;
-use bevy::utils::tracing;
-use bevy::utils::tracing::span;
+extern crate bevy_mod_scripting;
+extern crate script_integration_test_harness;
+extern crate test_utils;
+use std::{collections::HashMap, path::PathBuf, sync::LazyLock, time::Duration};
+
+use bevy::{
+    log::{
+        tracing, tracing::span, tracing_subscriber, tracing_subscriber::layer::SubscriberExt, Level,
+    },
+    reflect::Reflect,
+};
 use bevy_mod_scripting_core::bindings::{
     FromScript, IntoScript, Mut, Ref, ReflectReference, ScriptValue, Val,
 };
-use criterion::{criterion_main, measurement::Measurement, BenchmarkGroup, Criterion};
-use criterion::{BatchSize, BenchmarkFilter};
+use criterion::{
+    criterion_main, measurement::Measurement, BatchSize, BenchmarkFilter, BenchmarkGroup, Criterion,
+};
 use regex::Regex;
-use script_integration_test_harness::test_functions::rand::Rng;
 use script_integration_test_harness::{
     make_test_lua_plugin, make_test_rhai_plugin, perform_benchmark_with_generator,
     run_lua_benchmark, run_plugin_script_load_benchmark, run_rhai_benchmark,
+    test_functions::rand::Rng,
 };
-use std::collections::HashMap;
-use std::{path::PathBuf, sync::LazyLock, time::Duration};
 use test_utils::{discover_all_tests, Test};
 
-extern crate bevy_mod_scripting;
-extern crate script_integration_test_harness;
-extern crate test_utils;
-
 static ENABLE_PROFILING: LazyLock<bool> =
     LazyLock::new(|| std::env::var("ENABLE_PROFILING").is_ok());
 

build_scripts.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+WORKSPACE_DIR="$PWD"
+
+cd "$(dirname "$0")"
+# if the path is in /bevy_api_gen then we run the codegen check
+
+if [[ "$WORKSPACE_DIR" == *"/bevy_api_gen"* ]]; then
+    # save output to file as well as stdout and stderr
+    cargo check --quiet --workspace --message-format=json --all-targets --keep-going
+elif [[ "$WORKSPACE_DIR" == *"/xtask"* ]]; then
+    cd "$WORKSPACE_DIR"
+    cargo check --quiet --workspace --message-format=json --all-targets --keep-going
+else 
+    cd "$WORKSPACE_DIR"
+    cargo check --quiet --workspace --message-format=json --all-targets --keep-going
+fi

codegen_bevy_features.txt

@@ -1 +1 @@
-bevy_asset,bevy_animation,bevy_core_pipeline,bevy_ui,bevy_pbr,bevy_render,bevy_text,bevy_sprite,file_watcher,multi_threaded
+bevy_asset,bevy_animation,bevy_core_pipeline,bevy_ui,bevy_pbr,bevy_render,bevy_text,bevy_sprite,file_watcher,multi_threaded,std,async_executor

crates/bevy_api_gen/Cargo.bootstrap.toml

@@ -6,8 +6,8 @@ edition = "2021"
 
 [dependencies]
 bevy_mod_scripting_core = { path = "{{BMS_CORE_PATH}}" }
-bevy_reflect = { version = "0.15.3", features = [
-    "bevy",
+bevy_reflect = { version = "0.16.0", features = [
+    "smol_str",
     "glam",
     "petgraph",
     "smallvec",

crates/bevy_api_gen/Cargo.toml

@@ -30,8 +30,6 @@ codegen-units = 8
 incremental = false
 debug = false
 
-[rust-analyzer.rustc]
-source = "discover"
 
 [package.metadata.rust-analyzer]
 rustc_private = true
@@ -41,7 +39,6 @@ log = "0.4"
 env_logger = "0.11"
 rustc_plugin = "0.12.0-nightly-2024-12-15"
 indexmap = "2"
-tempdir = "0.3"
 cargo_metadata = "0.18"
 serde_json = "1"
 serde = "1"
@@ -51,8 +48,7 @@ strum = { version = "0.26", features = ["derive"] }
 include_dir = "0.7"
 prettyplease = "0.2"
 convert_case = "0.6"
-syn = { version = "2", features = ["parsing"], no-default-features = true }
-clap-verbosity-flag = "2.2"
+syn = { version = "2", features = ["parsing"], default-features = false }
 itertools = "0.12"
 chrono = "0.4"
 

crates/bevy_api_gen/src/bin/main.rs

@@ -62,6 +62,9 @@ fn main() {
                 .map(|s| s.to_owned())
                 .collect::<Vec<String>>();
 
+            // log all dependencies
+            debug!("Enabled dependencies: {}", dependencies.join(","));
+
             Some(dependencies)
         }
         _ => None,
@@ -110,36 +113,34 @@ fn main() {
             if !output.is_dir() {
                 panic!("Output is not a directory");
             }
-            let crates = std::fs::read_dir(&output)
-                .expect("Could not read output directory")
-                .filter_map(|d| {
-                    let entry = d.expect("Could not read entry in output directory");
-                    let path = entry.path();
-                    if path.extension().is_some_and(|ext| ext == "rs")
-                        && path.file_stem().is_some_and(|s| s != "mod")
-                    {
-                        Some(path.file_stem().unwrap().to_owned())
-                    } else {
-                        None
-                    }
-                });
+
             let meta_loader = MetaLoader::new(vec![output.to_owned()], workspace_meta);
-            let mut crates: Vec<_> = crates
-                .map(|c| {
-                    let name = c.to_str().unwrap().to_owned();
-                    log::info!("Collecting crate: {}", name);
-                    let meta = meta_loader
-                        .meta_for(&name)
-                        .expect("Could not find meta file for crate");
-                    Crate { name, meta }
+            let mut crates = meta_loader
+                .iter_meta()
+                .filter_map(|m| {
+                    log::debug!(
+                        "Processing crate: {}, will generate: {}",
+                        m.crate_name(),
+                        m.will_generate()
+                    );
+                    m.will_generate().then_some(Crate {
+                        name: m.crate_name().to_owned(),
+                        meta: m,
+                    })
                 })
-                .collect();
+                .collect::<Vec<_>>();
 
             crates.sort_by(|a, b| a.name.cmp(&b.name));
 
-            let context = Collect { crates, api_name };
+            let json = serde_json::to_string_pretty(
+                &crates.iter().map(|c| c.name.clone()).collect::<Vec<_>>(),
+            )
+            .unwrap();
+
+            let collect = Collect { crates, api_name };
+
             let mut context =
-                Context::from_serialize(context).expect("Could not create template context");
+                Context::from_serialize(collect).expect("Could not create template context");
 
             extend_context_with_args(args.template_args.as_deref(), &mut context);
 
@@ -148,6 +149,11 @@ fn main() {
                 .expect("Failed to render mod.rs");
             file.flush().unwrap();
             log::info!("Succesfully generated mod.rs");
+
+            // put json of Collect context into stdout
+            std::io::stdout()
+                .write_all(json.as_bytes())
+                .expect("Failed to write Collect context to stdout");
             return;
         }
         _ => {}