Skip to content

Commit 48cc5b8

Browse files
makspllmakspll
authored
Merge branch 'staging' into feature/bevy-system-refactor
2 parents 5f34f88 + b238bfc commit 48cc5b8

File tree

44 files changed

+4262
-6007
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+4262
-6007
lines changed

‎.github/workflows/bevy_mod_scripting.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
- '.github/workflows/release-plz.yml'
99
- '.github/workflows/bevy_api_gen.yml'
1010
- '.github/workflows/macro_tests.yml'
11+
- 'docs/**'
1112

1213

1314
name: Check and Lint - bevy_mod_scripting
@@ -34,7 +35,8 @@ jobs:
3435
{label: Ubuntu - Lua52, os: ubuntu-latest, features: "lua52", cross: x86_64-unknown-linux-gnu },
3536
{label: Ubuntu - Lua53, os: ubuntu-latest, features: "lua53", cross: x86_64-unknown-linux-gnu },
3637
{label: Ubuntu - Luajit, os: ubuntu-latest, features: "luajit", cross: x86_64-unknown-linux-gnu },
37-
{label: Ubuntu - Luajit52, os: ubuntu-latest, features: "luajit52", cross: x86_64-unknown-linux-gnu }
38+
{label: Ubuntu - Luajit52, os: ubuntu-latest, features: "luajit52", cross: x86_64-unknown-linux-gnu },
39+
{label: Ubuntu - Luau, os: ubuntu-latest, features: "luau", cross: x86_64-unknown-linux-gnu }
3840
]
3941
steps:
4042
- if: runner.os == 'linux'

‎.github/workflows/mdbook.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Deploy mdBook to GitHub Pages
2+
3+
on:
4+
push:
5+
branches:
6+
- "**"
7+
paths:
8+
- 'docs/**'
9+
- '.github/workflows/mdbook.yml'
10+
11+
jobs:
12+
13+
build:
14+
name: Build Book - mdbook
15+
runs-on: ubuntu-latest
16+
steps:
17+
18+
- name: Checkout repository
19+
uses: actions/checkout@v4
20+
21+
- uses: actions-rs/toolchain@v1
22+
with:
23+
toolchain: stable
24+
override: true
25+
- name: Rust Cache
26+
uses: Swatinem/rust-cache@v2.7.3
27+
- name: Install mdBook
28+
run: cargo install mdbook
29+
30+
- name: Build the book
31+
run: cd docs && mdbook build
32+
33+
- name: Deploy to GitHub Pages
34+
if: github.ref == 'refs/heads/main'
35+
uses: peaceiris/actions-gh-pages@v3
36+
with:
37+
github_token: ${{ secrets.GITHUB_TOKEN }}
38+
publish_dir: docs/book

‎.github/workflows/pr-titles.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: "Lint PR"
2+
3+
on:
4+
pull_request_target:
5+
types:
6+
- opened
7+
- edited
8+
- synchronize
9+
- reopened
10+
11+
permissions:
12+
pull-requests: read
13+
14+
jobs:
15+
main:
16+
name: Validate PR title
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: amannn/action-semantic-pull-request@v5
20+
env:
21+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
22+
with:
23+
types: |
24+
fix
25+
feat
26+
chore

‎CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# Changelog
22

3+
## [0.8.0-alpha.2](https://github.com/makspll/bevy_mod_scripting/compare/v0.8.0-alpha.1...v0.8.0-alpha.2) - 2024-12-03
4+
5+
### Fixed
6+
7+
- bug when compiling without `teal` feature ([#148](https://github.com/makspll/bevy_mod_scripting/pull/148))
8+
9+
### Other
10+
11+
- Small fixes ([#155](https://github.com/makspll/bevy_mod_scripting/pull/155))
12+
- Luau support attempt ([#154](https://github.com/makspll/bevy_mod_scripting/pull/154))
13+
- Bump bevy & bevy console ([#153](https://github.com/makspll/bevy_mod_scripting/pull/153))
14+
- Fix failing doctest ([#146](https://github.com/makspll/bevy_mod_scripting/pull/146))
15+
- update Cargo.toml dependencies
16+
317
## [0.8.0-alpha.1](https://github.com/makspll/bevy_mod_scripting/compare/v0.8.0-alpha.0...v0.8.0-alpha.1) - 2024-11-10
418

519
### Other

‎Cargo.toml

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "bevy_mod_scripting"
3-
version = "0.8.0-alpha.1"
3+
version = "0.8.0-alpha.2"
44
authors = ["Maksymilian Mozolewski <makspl17@gmail.com>"]
55
edition = "2021"
66
license = "MIT OR Apache-2.0"
@@ -36,6 +36,7 @@ lua53 = ["bevy_mod_scripting_lua/lua53", "lua"]
3636
lua54 = ["bevy_mod_scripting_lua/lua54", "lua"]
3737
luajit = ["bevy_mod_scripting_lua/luajit", "lua"]
3838
luajit52 = ["bevy_mod_scripting_lua/luajit52", "lua"]
39+
luau = ["bevy_mod_scripting_lua/luau", "lua"]
3940

4041
# optional
4142
unsafe_lua_modules = ["bevy_mod_scripting_lua/unsafe_lua_modules"]
@@ -53,22 +54,22 @@ rune = ["bevy_mod_scripting_rune"]
5354
[dependencies]
5455
bevy = { workspace = true }
5556
bevy_mod_scripting_core = { workspace = true }
56-
bevy_mod_scripting_lua = { path = "crates/languages/bevy_mod_scripting_lua", version = "0.8.0-alpha.1", optional = true }
57-
bevy_mod_scripting_rhai = { path = "crates/languages/bevy_mod_scripting_rhai", version = "0.8.0-alpha.1", optional = true }
58-
bevy_mod_scripting_rune = { path = "crates/languages/bevy_mod_scripting_rune", version = "0.8.0-alpha.1", optional = true }
57+
bevy_mod_scripting_lua = { path = "crates/languages/bevy_mod_scripting_lua", version = "0.8.0-alpha.2", optional = true }
58+
bevy_mod_scripting_rhai = { path = "crates/languages/bevy_mod_scripting_rhai", version = "0.8.0-alpha.2", optional = true }
59+
bevy_mod_scripting_rune = { path = "crates/languages/bevy_mod_scripting_rune", version = "0.8.0-alpha.2", optional = true }
5960

6061

6162
[workspace.dependencies]
62-
bevy = { version = "0.15.0-rc.3", default-features = false }
63-
bevy_mod_scripting_core = { path = "crates/bevy_mod_scripting_core", version = "0.8.0-alpha.1" }
64-
bevy_mod_scripting_common = { path = "crates/bevy_mod_scripting_common", version = "0.8.0-alpha.1" }
63+
bevy = { version = "0.15.0", default-features = false }
64+
bevy_mod_scripting_core = { path = "crates/bevy_mod_scripting_core", version = "0.8.0-alpha.2" }
65+
bevy_mod_scripting_common = { path = "crates/bevy_mod_scripting_common", version = "0.8.0-alpha.2" }
6566
test_utils = { path = "crates/test_utils" }
6667

6768
[dev-dependencies]
6869
bevy = { workspace = true, default-features = true }
6970
clap = { version = "4.1", features = ["derive"] }
7071
rand = "0.8.5"
71-
bevy_console = "0.12"
72+
bevy_console = "0.13"
7273
rhai-rand = "0.1"
7374

7475
[workspace]
@@ -102,26 +103,23 @@ codegen-units = 8
102103
incremental = false
103104
debug = false
104105

105-
# TODO: bump once bevy is released and the lib is updated
106-
# [[example]]
107-
# name = "console_integration_lua"
108-
# path = "examples/lua/console_integration.rs"
109-
# required-features = [
110-
# "lua54",
111-
#
112-
# "bevy/file_watcher",
113-
# "bevy/multi_threaded",
114-
# ]
115-
116-
# [[example]]
117-
# name = "console_integration_rhai"
118-
# path = "examples/rhai/console_integration.rs"
119-
# required-features = [
120-
# "rhai",
121-
# ,
122-
# "bevy/file_watcher",
123-
# "bevy/multi_threaded",
124-
# ]
106+
[[example]]
107+
name = "console_integration_lua"
108+
path = "examples/lua/console_integration.rs"
109+
required-features = [
110+
"lua54",
111+
"bevy/file_watcher",
112+
"bevy/multi_threaded",
113+
]
114+
115+
[[example]]
116+
name = "console_integration_rhai"
117+
path = "examples/rhai/console_integration.rs"
118+
required-features = [
119+
"rhai",
120+
"bevy/file_watcher",
121+
"bevy/multi_threaded",
122+
]
125123

126124
[[example]]
127125
name = "complex_game_loop_lua"

‎crates/bevy_event_priority/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [0.8.0-alpha.2](https://github.com/makspll/bevy_mod_scripting/compare/bevy_event_priority-v0.8.0-alpha.1...bevy_event_priority-v0.8.0-alpha.2) - 2024-12-03
11+
12+
### Other
13+
14+
- Small fixes ([#155](https://github.com/makspll/bevy_mod_scripting/pull/155))
15+
1016
## [0.8.0-alpha.1](https://github.com/makspll/bevy_mod_scripting/compare/bevy_event_priority-v0.8.0-alpha.0...bevy_event_priority-v0.8.0-alpha.1) - 2024-11-10
1117

1218
### Other

‎crates/bevy_event_priority/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "bevy_event_priority"
3-
version = "0.8.0-alpha.1"
3+
version = "0.8.0-alpha.2"
44
authors = ["Maksymilian Mozolewski <makspl17@gmail.com>"]
55
edition = "2021"
66
license = "MIT OR Apache-2.0"

‎crates/bevy_event_priority/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ pub struct PriorityIterator<'w, E: PriorityEvent> {
8989
events: &'w mut PriorityEvents<E>,
9090
}
9191

92-
impl<'w, E: PriorityEvent> Iterator for PriorityIterator<'w, E> {
92+
impl<E: PriorityEvent> Iterator for PriorityIterator<'_, E> {
9393
type Item = E;
9494

9595
fn next(&mut self) -> Option<Self::Item> {
@@ -108,7 +108,7 @@ impl<'w, E: PriorityEvent> Iterator for PriorityIterator<'w, E> {
108108
}
109109
}
110110

111-
impl<'s, E: PriorityEvent> PriorityEventReader<'_, 's, E> {
111+
impl<E: PriorityEvent> PriorityEventReader<'_, '_, E> {
112112
/// Iterates over events this reader has not seen yet, while also clearing them.
113113
/// Will not remove any events of priority lower than min (0 is highest, inf is lowest)
114114
/// but will discard events of higher priority
@@ -140,7 +140,7 @@ pub struct PriorityEventWriter<'w, 's, E: PriorityEvent> {
140140
marker: PhantomData<&'s usize>,
141141
}
142142

143-
impl<'w, 's, E: PriorityEvent> PriorityEventWriter<'w, 's, E> {
143+
impl<E: PriorityEvent> PriorityEventWriter<'_, '_, E> {
144144
pub fn send(&mut self, event: E, prio: u32) {
145145
self.events.events.push(EventInstance::new(event, prio));
146146
}

‎crates/bevy_mod_scripting_common/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [0.8.0-alpha.2](https://github.com/makspll/bevy_mod_scripting/compare/bevy_mod_scripting_common-v0.8.0-alpha.1...bevy_mod_scripting_common-v0.8.0-alpha.2) - 2024-12-03
11+
12+
### Other
13+
14+
- Small fixes ([#155](https://github.com/makspll/bevy_mod_scripting/pull/155))
15+
1016
## [0.7.0](https://github.com/makspll/bevy_mod_scripting/compare/bevy_mod_scripting_common-v0.6.0...bevy_mod_scripting_common-v0.7.0) - 2024-11-03
1117

1218
### Other

‎crates/bevy_mod_scripting_common/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "bevy_mod_scripting_common"
3-
version = "0.8.0-alpha.1"
3+
version = "0.8.0-alpha.2"
44
authors = ["Maksymilian Mozolewski <makspl17@gmail.com>"]
55
edition = "2021"
66
license = "MIT OR Apache-2.0"

‎crates/bevy_mod_scripting_common/src/input.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,6 @@ impl VisitSimpleType<Type> for TypeConstructorVisitor {
540540
#[derive(FromDeriveInput)]
541541
#[darling(attributes(proxy), forward_attrs(allow, doc, cfg))]
542542
#[allow(clippy::manual_unwrap_or_default)]
543-
544543
pub struct ProxyInput {
545544
/// The name of the type for which we are generating a proxy
546545
pub ident: syn::Ident,

‎crates/bevy_mod_scripting_core/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [0.8.0-alpha.2](https://github.com/makspll/bevy_mod_scripting/compare/bevy_mod_scripting_core-v0.8.0-alpha.1...bevy_mod_scripting_core-v0.8.0-alpha.2) - 2024-12-03
11+
12+
### Other
13+
14+
- Bump bevy & bevy console ([#153](https://github.com/makspll/bevy_mod_scripting/pull/153))
15+
1016
## [0.8.0-alpha.1](https://github.com/makspll/bevy_mod_scripting/compare/bevy_mod_scripting_core-v0.8.0-alpha.0...bevy_mod_scripting_core-v0.8.0-alpha.1) - 2024-11-10
1117

1218
### Other

‎crates/bevy_mod_scripting_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 = "bevy_mod_scripting_core"
3-
version = "0.8.0-alpha.1"
3+
version = "0.8.0-alpha.2"
44
authors = ["Maksymilian Mozolewski <makspl17@gmail.com>"]
55
edition = "2021"
66
license = "MIT OR Apache-2.0"
@@ -24,13 +24,13 @@ mlua_impls = ["mlua"]
2424

2525
[dependencies]
2626
mlua = { version = "0.9", optional = true }
27-
2827
bevy = { workspace = true, default-features = false, features = ["bevy_asset"] }
2928
thiserror = "1.0.31"
3029
paste = "1.0.7"
3130
parking_lot = "0.12.1"
3231
lockable = "0.0.8"
3332
smallvec = "1.11"
3433
itertools = "0.13"
34+
3535
[dev-dependencies]
3636
test_utils = { workspace = true }

‎crates/bevy_script_api/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [0.8.0-alpha.2](https://github.com/makspll/bevy_mod_scripting/compare/bevy_script_api-v0.8.0-alpha.1...bevy_script_api-v0.8.0-alpha.2) - 2024-12-03
11+
12+
### Other
13+
14+
- Small fixes ([#155](https://github.com/makspll/bevy_mod_scripting/pull/155))
15+
- Luau support attempt ([#154](https://github.com/makspll/bevy_mod_scripting/pull/154))
16+
- Bump bevy & bevy console ([#153](https://github.com/makspll/bevy_mod_scripting/pull/153))
17+
1018
## [0.8.0-alpha.1](https://github.com/makspll/bevy_mod_scripting/compare/bevy_script_api-v0.8.0-alpha.0...bevy_script_api-v0.8.0-alpha.1) - 2024-11-10
1119

1220
### Other

‎crates/bevy_script_api/Cargo.toml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "bevy_script_api"
3-
version = "0.8.0-alpha.1"
3+
version = "0.8.0-alpha.2"
44
authors = ["Maksymilian Mozolewski <makspl17@gmail.com>"]
55
edition = "2021"
66
license = "MIT OR Apache-2.0"
@@ -18,7 +18,6 @@ rhai = ["bevy_mod_scripting_rhai"]
1818
[dependencies]
1919
bevy = { workspace = true, default-features = false, features = [
2020
"bevy_asset",
21-
"bevy_gltf",
2221
"bevy_animation",
2322
"bevy_core_pipeline",
2423
"bevy_ui",
@@ -35,8 +34,8 @@ parking_lot = "0.12.1"
3534
paste = "1.0.7"
3635
thiserror = "1.0.32"
3736
# lua
38-
bevy_mod_scripting_lua = { path = "../languages/bevy_mod_scripting_lua", version = "0.8.0-alpha.1", optional = true }
39-
bevy_mod_scripting_lua_derive = { path = "../languages/bevy_mod_scripting_lua_derive", version = "0.8.0-alpha.1", optional = true }
40-
bevy_mod_scripting_rhai = { path = "../languages/bevy_mod_scripting_rhai", version = "0.8.0-alpha.1", optional = true }
37+
bevy_mod_scripting_lua = { path = "../languages/bevy_mod_scripting_lua", version = "0.8.0-alpha.2", optional = true }
38+
bevy_mod_scripting_lua_derive = { path = "../languages/bevy_mod_scripting_lua_derive", version = "0.8.0-alpha.2", optional = true }
39+
bevy_mod_scripting_rhai = { path = "../languages/bevy_mod_scripting_rhai", version = "0.8.0-alpha.2", optional = true }
4140
smol_str = "0.2"
4241
allocator-api2 = "0.2"

0 commit comments

Comments
 (0)