Upgrade to 0.17 (#262)

* A minimal upgrade

* Correct the dependencies

* Continue

* Copy from @viridia (cart/bevy@ab73319)

* Continue

* target() -> event().event_target()

* EventWriter/Reader -> MessageWriter/Reader & add_event -> add_message

* Fix display issue

* Pass all checks

* I hope this work

---------

Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>

Author: Sieluna

Cargo.toml

@@ -27,14 +27,10 @@ unsafe_op_in_unsafe_fn = "warn"
 unused_qualifications = "warn"
 
 [workspace.dependencies]
-bevy = { git = "https://github.com/cart/bevy.git", rev = "05b79c229a070224c007994e5c2be8b67439d7d9", features = [
-    "wayland",
-    "experimental_bevy_feathers",
-] }
-bevy_render = { git = "https://github.com/cart/bevy.git", rev = "05b79c229a070224c007994e5c2be8b67439d7d9" }
-bevy_derive = { git = "https://github.com/cart/bevy.git", rev = "05b79c229a070224c007994e5c2be8b67439d7d9" }
-bevy_macro_utils = { git = "https://github.com/cart/bevy.git", rev = "05b79c229a070224c007994e5c2be8b67439d7d9" }
-thiserror = "2.0"
+bevy = { git = "https://github.com/cart/bevy.git", rev = "87a21ecafa51bfaea02834b5933f08397b45b984", features = ["experimental_bevy_feathers"] }
+bevy_derive = { git = "https://github.com/cart/bevy.git", rev = "87a21ecafa51bfaea02834b5933f08397b45b984" }
+bevy_macro_utils = { git = "https://github.com/cart/bevy.git", rev = "87a21ecafa51bfaea02834b5933f08397b45b984" }
+thiserror = "2"
 serde = { version = "1", features = ["derive"] }
 tracing-test = "0.2.5"
 tracing = "0.1.41"

bevy_editor_panes/bevy_2d_viewport/src/lib.rs

@@ -1,12 +1,9 @@
 //! 2d Viewport for Bevy
 use bevy::{
+    camera::{RenderTarget, visibility::RenderLayers},
     feathers::theme::ThemedText,
     prelude::*,
-    render::{
-        camera::RenderTarget,
-        render_resource::{Extent3d, TextureFormat, TextureUsages},
-        view::RenderLayers,
-    },
+    render::render_resource::{Extent3d, TextureFormat, TextureUsages},
     scene2::{CommandsSpawnScene, bsn, on},
     ui::ui_layout_system,
 };
@@ -50,7 +47,7 @@ impl Plugin for Viewport2dPanePlugin {
                  query: Query<&Bevy2dViewport>| {
                     // Despawn the viewport camera
                     commands
-                        .entity(query.get(trigger.target()).unwrap().camera_id)
+                        .entity(query.get(trigger.event().event_target()).unwrap().camera_id)
                         .despawn();
                 },
             );

bevy_editor_panes/bevy_3d_viewport/Cargo.toml

@@ -10,7 +10,6 @@ bevy_editor_cam.workspace = true
 bevy_editor_styles.workspace = true
 bevy_infinite_grid.workspace = true
 bevy_editor_core.workspace = true
-bevy_render.workspace = true
 bevy_transform_gizmos.workspace = true
 
 [lints]

bevy_editor_panes/bevy_3d_viewport/src/lib.rs

@@ -1,18 +1,15 @@
 //! 3D Viewport for Bevy
 use bevy::{
     asset::uuid::Uuid,
+    camera::{NormalizedRenderTarget, RenderTarget, visibility::RenderLayers},
     feathers::theme::ThemedText,
     picking::{
         PickingSystems,
         input::{mouse_pick_events, touch_pick_events},
         pointer::{Location, PointerId, PointerInput},
     },
     prelude::*,
-    render::{
-        camera::{NormalizedRenderTarget, RenderTarget},
-        render_resource::{Extent3d, TextureFormat, TextureUsages},
-        view::RenderLayers,
-    },
+    render::render_resource::{Extent3d, TextureFormat, TextureUsages},
     scene2::{CommandsSpawnScene, bsn, on},
     ui::ui_layout_system,
 };
@@ -74,7 +71,7 @@ impl Plugin for Viewport3dPanePlugin {
                  query: Query<&Bevy3dViewport>| {
                     // Despawn the viewport camera
                     commands
-                        .entity(query.get(trigger.target()).unwrap().camera_id)
+                        .entity(query.get(trigger.event().event_target()).unwrap().camera_id)
                         .despawn();
                 },
             );
@@ -108,8 +105,8 @@ fn render_target_picking_passthrough(
     content: Query<&PaneContentNode>,
     children_query: Query<&Children>,
     node_query: Query<(&ComputedNode, &UiGlobalTransform, &ImageNode), With<Active>>,
-    mut pointer_input_reader: EventReader<PointerInput>,
-    // Using commands to output PointerInput events to avoid clashing with the EventReader
+    mut pointer_input_reader: MessageReader<PointerInput>,
+    // Using commands to output PointerInput events to avoid clashing with the MessageReader
     mut commands: Commands,
 ) {
     for event in pointer_input_reader.read() {
@@ -140,7 +137,7 @@ fn render_target_picking_passthrough(
                 pointer_id: pointer_id_from_entity(pane_root),
             };
 
-            commands.write_event(event_copy);
+            commands.write_message(event_copy);
         }
     }
 }
@@ -196,10 +193,10 @@ fn on_pane_creation(
                     ImageNode::new(image.clone())
                     :fit_to_parent
                     on(|trigger: On<Pointer<Over>>, mut commands: Commands| {
-                        commands.entity(trigger.target()).insert(Active);
+                        commands.entity(trigger.event().event_target()).insert(Active);
                     })
                     on(|trigger: On<Pointer<Out>>, mut commands: Commands| {
-                        commands.entity(trigger.target()).remove::<Active>();
+                        commands.entity(trigger.event().event_target()).remove::<Active>();
                     })
                     [ :view_gizmo_node ]
                 ],

bevy_editor_panes/bevy_3d_viewport/src/selection_box.rs

@@ -1,7 +1,7 @@
+use bevy::camera::primitives::Aabb;
 use bevy::ecs::system::SystemParam;
 use bevy::prelude::*;
 use bevy_editor_core::selection::EditorSelection;
-use bevy_render::primitives::Aabb;
 
 #[derive(SystemParam)]
 pub struct SelectionBoxQueries<'w, 's> {