Skip to content

Commit 4315964

Browse files
committed
rearrange
1 parent e506d8e commit 4315964

File tree

5 files changed

+13
-33
lines changed

5 files changed

+13
-33
lines changed

Cargo.toml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ path = "src/lib.rs"
2020
features = ["lua54"]
2121

2222
[features]
23-
default = ["core_functions", "bevy_bindings", "unsafe_lua_modules"]
23+
default = ["core_functions", "bevy_bindings"]
2424

2525
## lua
2626
lua = ["bevy_mod_scripting_lua"]
@@ -53,16 +53,14 @@ rhai = ["bevy_mod_scripting_rhai"]
5353
bevy = { workspace = true }
5454
bevy_mod_scripting_core = { workspace = true }
5555
bevy_mod_scripting_lua = { path = "crates/languages/bevy_mod_scripting_lua", version = "0.9.0-alpha.7", optional = true }
56-
bevy_mod_scripting_rhai = { path = "crates/languages/bevy_mod_scripting_rhai", version = "0.9.0-alpha.2", optional = true }
56+
bevy_mod_scripting_rhai = { path = "crates/languages/bevy_mod_scripting_rhai", version = "0.9.0-alpha.7", optional = true }
5757
# bevy_mod_scripting_rune = { path = "crates/languages/bevy_mod_scripting_rune", version = "0.9.0-alpha.2", optional = true }
5858
bevy_mod_scripting_functions = { workspace = true }
5959

6060
[workspace.dependencies]
6161
bevy = { version = "0.15.0", default-features = false }
6262
bevy_mod_scripting_core = { path = "crates/bevy_mod_scripting_core", version = "0.9.0-alpha.7" }
6363
bevy_mod_scripting_functions = { path = "crates/bevy_mod_scripting_functions", version = "0.9.0-alpha.7", default-features = false }
64-
mlua = { version = "0.10" }
65-
rhai = { git = "https://github.com/rhaiscript/rhai", rev = "4ead53eb40f4a18d6f827609041ef1c742f04799" }
6664

6765
# test utilities
6866
script_integration_test_harness = { path = "crates/script_integration_test_harness" }
@@ -113,10 +111,10 @@ debug = true
113111
inherits = "release"
114112
debug = true
115113

116-
[[example]]
117-
name = "game_of_life"
118-
path = "examples/game_of_life.rs"
119-
required-features = ["lua54", "bevy/file_watcher", "bevy/multi_threaded"]
114+
# [[example]]
115+
# name = "game_of_life"
116+
# path = "examples/game_of_life.rs"
117+
# required-features = ["lua54", "bevy/file_watcher", "bevy/multi_threaded"]
120118

121119
[workspace.lints.clippy]
122120
panic = "deny"

crates/bevy_mod_scripting_core/Cargo.toml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ name = "bevy_mod_scripting_core"
1616
path = "src/lib.rs"
1717

1818
[features]
19+
default = []
1920
# if enabled enables documentation updating in optimized builds
2021
doc_always = []
2122

@@ -24,8 +25,10 @@ mlua_impls = ["mlua"]
2425
rhai_impls = ["rhai"]
2526

2627
[dependencies]
27-
mlua = { optional = true, workspace = true }
28-
rhai = { optional = true, workspace = true }
28+
mlua = { version = "0.10", default-features = false, optional = true }
29+
rhai = { git = "https://github.com/rhaiscript/rhai", rev = "4ead53eb40f4a18d6f827609041ef1c742f04799", default-features = false, features = [
30+
"sync",
31+
], optional = true }
2932

3033
bevy = { workspace = true, default-features = false, features = [
3134
"bevy_asset",

crates/languages/bevy_mod_scripting_lua/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ path = "src/lib.rs"
4040
bevy = { workspace = true, default-features = false }
4141
bevy_mod_scripting_core = { workspace = true, features = ["mlua_impls"] }
4242
bevy_mod_scripting_functions = { workspace = true, features = [] }
43-
mlua = { workspace = true, features = ["vendored", "send", "macros"] }
43+
mlua = { version = "0.10", features = ["vendored", "send", "macros"] }
4444
parking_lot = "0.12.1"
4545
uuid = "1.1"
4646
smol_str = "0.2.2"

crates/languages/bevy_mod_scripting_rhai/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ path = "src/lib.rs"
1717

1818
[dependencies]
1919
bevy = { workspace = true, default-features = false }
20-
rhai = { workspace = true, features = ["sync"] }
20+
rhai = { git = "https://github.com/rhaiscript/rhai", rev = "4ead53eb40f4a18d6f827609041ef1c742f04799" }
2121
bevy_mod_scripting_core = { workspace = true, features = ["rhai_impls"] }
2222
bevy_mod_scripting_functions = { workspace = true, features = [
2323
], default-features = false }

crates/xtask/src/main.rs

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1252,27 +1252,6 @@ impl Xtasks {
12521252

12531253
log::info!("Powerset command combinations: {:?}", output);
12541254

1255-
// also run a all features + each exclusive feature by itself
1256-
for feature in available_features
1257-
.0
1258-
.iter()
1259-
.filter(|f| f.to_feature_group().is_exclusive())
1260-
{
1261-
// run with all features
1262-
let mut features = Features::non_exclusive_features();
1263-
features.0.insert(*feature);
1264-
1265-
// don't include if we already ran this combination
1266-
if powersets.iter().any(|f| f == &features) {
1267-
continue;
1268-
}
1269-
1270-
output.push(App {
1271-
global_args: default_args.clone().with_features(features),
1272-
subcmd: Xtasks::Build,
1273-
});
1274-
}
1275-
12761255
// next run a full lint check with all features
12771256
output.push(App {
12781257
global_args: default_args.clone(),

0 commit comments

Comments
 (0)