Skip to content

Commit 20fef0c

Browse files
SkiFire13SkiFire13
committed
Merge remote-tracking branch 'upstream/main' into split-bundle
2 parents 5942b7a + efd17f1 commit 20fef0c

File tree

167 files changed

+3111
-1723
lines changed

Some content is hidden

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

167 files changed

+3111
-1723
lines changed

‎.github/workflows/post-release.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ jobs:
4949
--exclude ci \
5050
--exclude errors \
5151
--exclude bevy_mobile_example \
52-
--exclude build-wasm-example
52+
--exclude build-wasm-example \
53+
--exclude no_std_library
5354
5455
- name: Create PR
5556
uses: peter-evans/create-pull-request@v7

‎Cargo.toml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "bevy"
3-
version = "0.16.0-dev"
3+
version = "0.17.0-dev"
44
edition = "2024"
55
categories = ["game-engines", "graphics", "gui", "rendering"]
66
description = "A refreshingly simple data-driven game engine and app framework"
@@ -558,12 +558,12 @@ hotpatching = ["bevy_internal/hotpatching"]
558558
debug = ["bevy_internal/debug"]
559559

560560
[dependencies]
561-
bevy_internal = { path = "crates/bevy_internal", version = "0.16.0-dev", default-features = false }
561+
bevy_internal = { path = "crates/bevy_internal", version = "0.17.0-dev", default-features = false }
562562
tracing = { version = "0.1", default-features = false, optional = true }
563563

564564
# Wasm does not support dynamic linking.
565565
[target.'cfg(not(target_family = "wasm"))'.dependencies]
566-
bevy_dylib = { path = "crates/bevy_dylib", version = "0.16.0-dev", default-features = false, optional = true }
566+
bevy_dylib = { path = "crates/bevy_dylib", version = "0.17.0-dev", default-features = false, optional = true }
567567

568568
[dev-dependencies]
569569
rand = "0.8.0"
@@ -573,14 +573,14 @@ flate2 = "1.0"
573573
serde = { version = "1", features = ["derive"] }
574574
serde_json = "1.0.140"
575575
bytemuck = "1.7"
576-
bevy_render = { path = "crates/bevy_render", version = "0.16.0-dev", default-features = false }
576+
bevy_render = { path = "crates/bevy_render", version = "0.17.0-dev", default-features = false }
577577
# The following explicit dependencies are needed for proc macros to work inside of examples as they are part of the bevy crate itself.
578-
bevy_ecs = { path = "crates/bevy_ecs", version = "0.16.0-dev", default-features = false }
579-
bevy_state = { path = "crates/bevy_state", version = "0.16.0-dev", default-features = false }
580-
bevy_asset = { path = "crates/bevy_asset", version = "0.16.0-dev", default-features = false }
581-
bevy_reflect = { path = "crates/bevy_reflect", version = "0.16.0-dev", default-features = false }
582-
bevy_image = { path = "crates/bevy_image", version = "0.16.0-dev", default-features = false }
583-
bevy_gizmos = { path = "crates/bevy_gizmos", version = "0.16.0-dev", default-features = false }
578+
bevy_ecs = { path = "crates/bevy_ecs", version = "0.17.0-dev", default-features = false }
579+
bevy_state = { path = "crates/bevy_state", version = "0.17.0-dev", default-features = false }
580+
bevy_asset = { path = "crates/bevy_asset", version = "0.17.0-dev", default-features = false }
581+
bevy_reflect = { path = "crates/bevy_reflect", version = "0.17.0-dev", default-features = false }
582+
bevy_image = { path = "crates/bevy_image", version = "0.17.0-dev", default-features = false }
583+
bevy_gizmos = { path = "crates/bevy_gizmos", version = "0.17.0-dev", default-features = false }
584584
# Needed to poll Task examples
585585
futures-lite = "2.0.1"
586586
async-std = "1.13"
@@ -1284,9 +1284,9 @@ required-features = ["bevy_solari"]
12841284

12851285
[package.metadata.example.solari]
12861286
name = "Solari"
1287-
description = "Demonstrates realtime dynamic global illumination rendering using Bevy Solari."
1287+
description = "Demonstrates realtime dynamic raytraced lighting using Bevy Solari."
12881288
category = "3D Rendering"
1289-
wasm = false
1289+
wasm = false # Raytracing is not supported on the web
12901290

12911291
[[example]]
12921292
name = "spherical_area_lights"

‎benches/benches/bevy_ecs/change_detection.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ impl BenchModify for Table {
4949
black_box(self.0)
5050
}
5151
}
52+
5253
impl BenchModify for Sparse {
5354
fn bench_modify(&mut self) -> f32 {
5455
self.0 += 1f32;

‎crates/bevy_a11y/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "bevy_a11y"
3-
version = "0.16.0-dev"
3+
version = "0.17.0-dev"
44
edition = "2024"
55
description = "Provides accessibility support for Bevy Engine"
66
homepage = "https://bevy.org"
@@ -40,10 +40,10 @@ critical-section = [
4040

4141
[dependencies]
4242
# bevy
43-
bevy_app = { path = "../bevy_app", version = "0.16.0-dev", default-features = false }
44-
bevy_derive = { path = "../bevy_derive", version = "0.16.0-dev" }
45-
bevy_ecs = { path = "../bevy_ecs", version = "0.16.0-dev", default-features = false }
46-
bevy_reflect = { path = "../bevy_reflect", version = "0.16.0-dev", default-features = false, optional = true }
43+
bevy_app = { path = "../bevy_app", version = "0.17.0-dev", default-features = false }
44+
bevy_derive = { path = "../bevy_derive", version = "0.17.0-dev" }
45+
bevy_ecs = { path = "../bevy_ecs", version = "0.17.0-dev", default-features = false }
46+
bevy_reflect = { path = "../bevy_reflect", version = "0.17.0-dev", default-features = false, optional = true }
4747

4848
# other
4949
accesskit = { version = "0.19", default-features = false }

‎crates/bevy_animation/Cargo.toml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "bevy_animation"
3-
version = "0.16.0-dev"
3+
version = "0.17.0-dev"
44
edition = "2024"
55
description = "Provides animation functionality for Bevy Engine"
66
homepage = "https://bevy.org"
@@ -10,22 +10,22 @@ keywords = ["bevy"]
1010

1111
[dependencies]
1212
# bevy
13-
bevy_app = { path = "../bevy_app", version = "0.16.0-dev" }
14-
bevy_asset = { path = "../bevy_asset", version = "0.16.0-dev" }
15-
bevy_color = { path = "../bevy_color", version = "0.16.0-dev" }
16-
bevy_derive = { path = "../bevy_derive", version = "0.16.0-dev" }
17-
bevy_log = { path = "../bevy_log", version = "0.16.0-dev" }
18-
bevy_math = { path = "../bevy_math", version = "0.16.0-dev" }
19-
bevy_mesh = { path = "../bevy_mesh", version = "0.16.0-dev" }
20-
bevy_reflect = { path = "../bevy_reflect", version = "0.16.0-dev", features = [
13+
bevy_app = { path = "../bevy_app", version = "0.17.0-dev" }
14+
bevy_asset = { path = "../bevy_asset", version = "0.17.0-dev" }
15+
bevy_color = { path = "../bevy_color", version = "0.17.0-dev" }
16+
bevy_derive = { path = "../bevy_derive", version = "0.17.0-dev" }
17+
bevy_log = { path = "../bevy_log", version = "0.17.0-dev" }
18+
bevy_math = { path = "../bevy_math", version = "0.17.0-dev" }
19+
bevy_mesh = { path = "../bevy_mesh", version = "0.17.0-dev" }
20+
bevy_reflect = { path = "../bevy_reflect", version = "0.17.0-dev", features = [
2121
"petgraph",
2222
] }
23-
bevy_render = { path = "../bevy_render", version = "0.16.0-dev" }
24-
bevy_time = { path = "../bevy_time", version = "0.16.0-dev" }
25-
bevy_utils = { path = "../bevy_utils", version = "0.16.0-dev" }
26-
bevy_ecs = { path = "../bevy_ecs", version = "0.16.0-dev" }
27-
bevy_transform = { path = "../bevy_transform", version = "0.16.0-dev" }
28-
bevy_platform = { path = "../bevy_platform", version = "0.16.0-dev", default-features = false, features = [
23+
bevy_render = { path = "../bevy_render", version = "0.17.0-dev" }
24+
bevy_time = { path = "../bevy_time", version = "0.17.0-dev" }
25+
bevy_utils = { path = "../bevy_utils", version = "0.17.0-dev" }
26+
bevy_ecs = { path = "../bevy_ecs", version = "0.17.0-dev" }
27+
bevy_transform = { path = "../bevy_transform", version = "0.17.0-dev" }
28+
bevy_platform = { path = "../bevy_platform", version = "0.17.0-dev", default-features = false, features = [
2929
"std",
3030
"serialize",
3131
] }

‎crates/bevy_anti_aliasing/Cargo.toml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "bevy_anti_aliasing"
3-
version = "0.16.0-dev"
3+
version = "0.17.0-dev"
44
edition = "2024"
55
description = "Provides various anti aliasing implementations for Bevy Engine"
66
homepage = "https://bevy.org"
@@ -16,17 +16,17 @@ smaa_luts = ["bevy_render/ktx2", "bevy_image/ktx2", "bevy_image/zstd"]
1616

1717
[dependencies]
1818
# bevy
19-
bevy_asset = { path = "../bevy_asset", version = "0.16.0-dev" }
20-
bevy_reflect = { path = "../bevy_reflect", version = "0.16.0-dev" }
21-
bevy_render = { path = "../bevy_render", version = "0.16.0-dev" }
22-
bevy_math = { path = "../bevy_math", version = "0.16.0-dev" }
23-
bevy_utils = { path = "../bevy_utils", version = "0.16.0-dev" }
24-
bevy_app = { path = "../bevy_app", version = "0.16.0-dev" }
25-
bevy_image = { path = "../bevy_image", version = "0.16.0-dev" }
26-
bevy_derive = { path = "../bevy_derive", version = "0.16.0-dev" }
27-
bevy_ecs = { path = "../bevy_ecs", version = "0.16.0-dev" }
28-
bevy_core_pipeline = { path = "../bevy_core_pipeline", version = "0.16.0-dev" }
29-
bevy_diagnostic = { path = "../bevy_diagnostic", version = "0.16.0-dev" }
19+
bevy_asset = { path = "../bevy_asset", version = "0.17.0-dev" }
20+
bevy_reflect = { path = "../bevy_reflect", version = "0.17.0-dev" }
21+
bevy_render = { path = "../bevy_render", version = "0.17.0-dev" }
22+
bevy_math = { path = "../bevy_math", version = "0.17.0-dev" }
23+
bevy_utils = { path = "../bevy_utils", version = "0.17.0-dev" }
24+
bevy_app = { path = "../bevy_app", version = "0.17.0-dev" }
25+
bevy_image = { path = "../bevy_image", version = "0.17.0-dev" }
26+
bevy_derive = { path = "../bevy_derive", version = "0.17.0-dev" }
27+
bevy_ecs = { path = "../bevy_ecs", version = "0.17.0-dev" }
28+
bevy_core_pipeline = { path = "../bevy_core_pipeline", version = "0.17.0-dev" }
29+
bevy_diagnostic = { path = "../bevy_diagnostic", version = "0.17.0-dev" }
3030

3131
# other
3232
tracing = { version = "0.1", default-features = false, features = ["std"] }

‎crates/bevy_app/Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "bevy_app"
3-
version = "0.16.0-dev"
3+
version = "0.17.0-dev"
44
edition = "2024"
55
description = "Provides core App functionality for Bevy Engine"
66
homepage = "https://bevy.org"
@@ -79,12 +79,12 @@ hotpatching = [
7979

8080
[dependencies]
8181
# bevy
82-
bevy_derive = { path = "../bevy_derive", version = "0.16.0-dev" }
83-
bevy_ecs = { path = "../bevy_ecs", version = "0.16.0-dev", default-features = false }
84-
bevy_reflect = { path = "../bevy_reflect", version = "0.16.0-dev", default-features = false, optional = true }
85-
bevy_utils = { path = "../bevy_utils", version = "0.16.0-dev", default-features = false }
86-
bevy_tasks = { path = "../bevy_tasks", version = "0.16.0-dev", default-features = false }
87-
bevy_platform = { path = "../bevy_platform", version = "0.16.0-dev", default-features = false }
82+
bevy_derive = { path = "../bevy_derive", version = "0.17.0-dev" }
83+
bevy_ecs = { path = "../bevy_ecs", version = "0.17.0-dev", default-features = false }
84+
bevy_reflect = { path = "../bevy_reflect", version = "0.17.0-dev", default-features = false, optional = true }
85+
bevy_utils = { path = "../bevy_utils", version = "0.17.0-dev", default-features = false }
86+
bevy_tasks = { path = "../bevy_tasks", version = "0.17.0-dev", default-features = false }
87+
bevy_platform = { path = "../bevy_platform", version = "0.17.0-dev", default-features = false }
8888

8989
# other
9090
downcast-rs = { version = "2", default-features = false }

‎crates/bevy_app/src/app.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1583,7 +1583,7 @@ mod tests {
15831583
app.add_systems(EnterMainMenu, (foo, bar));
15841584

15851585
app.world_mut().run_schedule(EnterMainMenu);
1586-
assert_eq!(app.world().entities().len(), 2);
1586+
assert_eq!(app.world().entity_count(), 2);
15871587
}
15881588

15891589
#[test]

‎crates/bevy_app/src/propagate.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ impl<C: Component + Clone + PartialEq> core::fmt::Debug for PropagateSet<C> {
8888
}
8989

9090
impl<C: Component + Clone + PartialEq> Eq for PropagateSet<C> {}
91+
9192
impl<C: Component + Clone + PartialEq> core::hash::Hash for PropagateSet<C> {
9293
fn hash<H: core::hash::Hasher>(&self, state: &mut H) {
9394
self._p.hash(state);

‎crates/bevy_asset/Cargo.toml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "bevy_asset"
3-
version = "0.16.0-dev"
3+
version = "0.17.0-dev"
44
edition = "2024"
55
description = "Provides asset functionality for Bevy Engine"
66
homepage = "https://bevy.org"
@@ -19,19 +19,19 @@ watch = []
1919
trace = []
2020

2121
[dependencies]
22-
bevy_app = { path = "../bevy_app", version = "0.16.0-dev", default-features = false, features = [
22+
bevy_app = { path = "../bevy_app", version = "0.17.0-dev", default-features = false, features = [
2323
"bevy_reflect",
2424
] }
25-
bevy_asset_macros = { path = "macros", version = "0.16.0-dev" }
26-
bevy_ecs = { path = "../bevy_ecs", version = "0.16.0-dev", default-features = false }
27-
bevy_reflect = { path = "../bevy_reflect", version = "0.16.0-dev", default-features = false, features = [
25+
bevy_asset_macros = { path = "macros", version = "0.17.0-dev" }
26+
bevy_ecs = { path = "../bevy_ecs", version = "0.17.0-dev", default-features = false }
27+
bevy_reflect = { path = "../bevy_reflect", version = "0.17.0-dev", default-features = false, features = [
2828
"uuid",
2929
] }
30-
bevy_tasks = { path = "../bevy_tasks", version = "0.16.0-dev", default-features = false, features = [
30+
bevy_tasks = { path = "../bevy_tasks", version = "0.17.0-dev", default-features = false, features = [
3131
"async_executor",
3232
] }
33-
bevy_utils = { path = "../bevy_utils", version = "0.16.0-dev", default-features = false }
34-
bevy_platform = { path = "../bevy_platform", version = "0.16.0-dev", default-features = false, features = [
33+
bevy_utils = { path = "../bevy_utils", version = "0.17.0-dev", default-features = false }
34+
bevy_platform = { path = "../bevy_platform", version = "0.17.0-dev", default-features = false, features = [
3535
"std",
3636
] }
3737

@@ -65,7 +65,7 @@ uuid = { version = "1.13.1", default-features = false, features = [
6565
tracing = { version = "0.1", default-features = false }
6666

6767
[target.'cfg(target_os = "android")'.dependencies]
68-
bevy_window = { path = "../bevy_window", version = "0.16.0-dev" }
68+
bevy_window = { path = "../bevy_window", version = "0.17.0-dev" }
6969

7070
[target.'cfg(target_arch = "wasm32")'.dependencies]
7171
# TODO: Assuming all wasm builds are for the browser. Require `no_std` support to break assumption.
@@ -78,13 +78,13 @@ web-sys = { version = "0.3", features = [
7878
wasm-bindgen-futures = "0.4"
7979
js-sys = "0.3"
8080
uuid = { version = "1.13.1", default-features = false, features = ["js"] }
81-
bevy_app = { path = "../bevy_app", version = "0.16.0-dev", default-features = false, features = [
81+
bevy_app = { path = "../bevy_app", version = "0.17.0-dev", default-features = false, features = [
8282
"web",
8383
] }
84-
bevy_tasks = { path = "../bevy_tasks", version = "0.16.0-dev", default-features = false, features = [
84+
bevy_tasks = { path = "../bevy_tasks", version = "0.17.0-dev", default-features = false, features = [
8585
"web",
8686
] }
87-
bevy_reflect = { path = "../bevy_reflect", version = "0.16.0-dev", default-features = false, features = [
87+
bevy_reflect = { path = "../bevy_reflect", version = "0.17.0-dev", default-features = false, features = [
8888
"web",
8989
] }
9090

0 commit comments

Comments
 (0)