Skip to content

Commit f0a501b

Browse files
update dependencies (#189)
* update depencies * update codebase to bevy 16 * fmt * fix depricated methods * fix clippy * fix deprecated methods --------- Co-authored-by: Sashiri <ali.reanc@gmail.com>
1 parent 497dd3e commit f0a501b

File tree

47 files changed

+131
-157
lines changed

Some content is hidden

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

47 files changed

+131
-157
lines changed

Cargo.toml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,20 @@ unsafe_op_in_unsafe_fn = "warn"
2727
unused_qualifications = "warn"
2828

2929
[workspace.dependencies]
30-
bevy = { git = "https://github.com/bevyengine/bevy.git", rev = "d6725d3b1baa6a730fa6bfab1bb8f2a9e5f4716e", features = [
30+
bevy = { git = "https://github.com/bevyengine/bevy.git", rev = "e9418b3845c1ffc9624a3a4003bde66a2ad6566a", features = [
3131
"wayland",
3232
] }
33-
bevy_derive = { git = "https://github.com/bevyengine/bevy.git", rev = "d6725d3b1baa6a730fa6bfab1bb8f2a9e5f4716e" }
34-
bevy_macro_utils = { git = "https://github.com/bevyengine/bevy.git", rev = "d6725d3b1baa6a730fa6bfab1bb8f2a9e5f4716e" }
33+
bevy_derive = { git = "https://github.com/bevyengine/bevy.git", rev = "e9418b3845c1ffc9624a3a4003bde66a2ad6566a" }
34+
bevy_macro_utils = { git = "https://github.com/bevyengine/bevy.git", rev = "e9418b3845c1ffc9624a3a4003bde66a2ad6566a" }
3535
thiserror = "2.0"
3636
serde = { version = "1", features = ["derive"] }
3737
tracing-test = "0.2.5"
38-
tracing = "0.1.40"
39-
atomicow = "1.0.0"
40-
rfd = "0.15"
41-
ron = "0.8.1"
38+
tracing = "0.1.41"
39+
atomicow = "1.1.0"
40+
rfd = "0.15.3"
41+
ron = "0.10.1"
4242
variadics_please = "1.0"
4343

44-
# This is a temporary workaround for https://github.com/bilelmoussaoui/ashpd/issues/264
45-
# Should be ok to remove once the issue is fixed, published, and `rfd` points to the new version.
46-
futures-util = { version = "0.3", features = ["io"] }
47-
4844
# local crates
4945

5046
# bevy_editor_panes

bevy_editor_panes/bevy_3d_viewport/src/view_gizmo.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ fn update_view_gizmo(
157157
viewport_camera: Query<&Transform, (Without<ViewGizmoCamera>, With<Camera3d>, With<EditorCam>)>,
158158
) {
159159
for mut transform in &mut view_cube_camera {
160-
if let Ok(viewport_camera_transform) = viewport_camera.get_single() {
160+
if let Ok(viewport_camera_transform) = viewport_camera.single() {
161161
transform.translation = viewport_camera_transform.back() * GIZMO_CAMERA_ZOOM;
162162
transform.rotation = viewport_camera_transform.rotation;
163163
}

bevy_editor_panes/bevy_asset_browser/src/io/task.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pub(crate) fn poll_task(
2121
mut commands: Commands,
2222
mut task_query: Query<(Entity, &mut FetchDirectoryContentTask)>,
2323
) {
24-
let (task_entity, mut task) = task_query.single_mut();
24+
let (task_entity, mut task) = task_query.single_mut().unwrap();
2525
if let Some(content) = block_on(poll_once(&mut task.0)) {
2626
commands.entity(task_entity).despawn();
2727
commands.insert_resource(content);

bevy_editor_panes/bevy_asset_browser/src/ui/nodes.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ fn spawn_base_node<'a>(commands: &'a mut Commands, theme: &Res<Theme>) -> Entity
223223
move |_trigger: Trigger<Pointer<Move>>,
224224
window_query: Query<Entity, With<Window>>,
225225
mut commands: Commands| {
226-
let window = window_query.single();
226+
let window = window_query.single().unwrap();
227227
commands
228228
.entity(window)
229229
.insert(CursorIcon::System(SystemCursorIcon::Pointer));
@@ -233,7 +233,7 @@ fn spawn_base_node<'a>(commands: &'a mut Commands, theme: &Res<Theme>) -> Entity
233233
move |_trigger: Trigger<Pointer<Out>>,
234234
window_query: Query<Entity, With<Window>>,
235235
mut commands: Commands| {
236-
let window = window_query.single();
236+
let window = window_query.single().unwrap();
237237
commands
238238
.entity(window)
239239
.insert(CursorIcon::System(SystemCursorIcon::Default));

bevy_editor_panes/bevy_asset_browser/src/ui/top_bar.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ fn spawn_path_segment_ui<'a>(
160160
location.path.clear();
161161
}
162162
LocationSegmentType::Directory => {
163-
let location_segments = query_children.get(parent.get()).unwrap();
163+
let location_segments = query_children.get(parent.parent()).unwrap();
164164
// Last segment is the current directory, no need to reload
165165
if *location_segments.last().unwrap() == segment {
166166
return;
@@ -183,7 +183,7 @@ fn spawn_path_segment_ui<'a>(
183183
move |_trigger: Trigger<Pointer<Move>>,
184184
window_query: Query<Entity, With<Window>>,
185185
mut commands: Commands| {
186-
let window = window_query.single();
186+
let window = window_query.single().unwrap();
187187
commands
188188
.entity(window)
189189
.insert(CursorIcon::System(SystemCursorIcon::Pointer));
@@ -193,7 +193,7 @@ fn spawn_path_segment_ui<'a>(
193193
move |_trigger: Trigger<Pointer<Out>>,
194194
window_query: Query<Entity, With<Window>>,
195195
mut commands: Commands| {
196-
let window = window_query.single();
196+
let window = window_query.single().unwrap();
197197
commands
198198
.entity(window)
199199
.insert(CursorIcon::System(SystemCursorIcon::Default));

bevy_editor_panes/bevy_properties_pane/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ fn component_list(entity: Entity, world: &World) -> Template {
6262
let type_registry = world.resource::<AppTypeRegistry>().read();
6363
world
6464
.inspect_entity(entity)
65+
.unwrap()
6566
.flat_map(|component_info| {
6667
let (_, name) = component_info.name().rsplit_once("::").unwrap();
6768
let type_info = component_info

bevy_widgets/bevy_context_menu/src/ui.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ pub(crate) fn spawn_option<'a>(
7272
move |_trigger: Trigger<Pointer<Over>>,
7373
window_query: Query<Entity, With<Window>>,
7474
mut commands: Commands| {
75-
let window = window_query.single();
75+
let window = window_query.single().unwrap();
7676
commands
7777
.entity(window)
7878
.insert(CursorIcon::System(SystemCursorIcon::Pointer));
@@ -82,7 +82,7 @@ pub(crate) fn spawn_option<'a>(
8282
|_trigger: Trigger<Pointer<Out>>,
8383
window_query: Query<Entity, With<Window>>,
8484
mut commands: Commands| {
85-
let window = window_query.single();
85+
let window = window_query.single().unwrap();
8686
commands
8787
.entity(window)
8888
.insert(CursorIcon::System(SystemCursorIcon::Default));

bevy_widgets/bevy_field_forms/examples/nickname.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! This example demonstrates how to use the `ValidatedInputFieldPlugin` to create a validated input field for a character name.
22
3-
use bevy::{platform_support::collections::HashSet, prelude::*};
3+
use bevy::{platform::collections::HashSet, prelude::*};
44
use bevy_field_forms::{
55
input_field::{InputField, InputFieldPlugin, Validable, ValidationChanged, ValidationState},
66
validate_highlight::SimpleBorderHighlight,

bevy_widgets/bevy_field_forms/src/input_field.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ impl<T: Validable> Plugin for InputFieldPlugin<T> {
3737
/// It will not contain special style updates for validation state, because it's expected that it will be
3838
/// combined with other widgets to form a custom UI.
3939
#[derive(Component, Clone)]
40-
#[require(EditableTextLine(construct_editable_label))]
40+
#[require(EditableTextLine::controlled(""))]
4141
pub struct InputField<T: Validable> {
4242
/// The last valid value
4343
pub value: T,
@@ -50,10 +50,6 @@ pub struct InputField<T: Validable> {
5050
pub old_value: T,
5151
}
5252

53-
fn construct_editable_label() -> EditableTextLine {
54-
EditableTextLine::controlled("")
55-
}
56-
5753
impl<T: Validable> Default for InputField<T> {
5854
fn default() -> Self {
5955
Self::new(T::default())

bevy_widgets/bevy_footer_bar/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ fn footer_setup(
3333
theme: Res<Theme>,
3434
) {
3535
commands
36-
.entity(root.single())
36+
.entity(root.single().unwrap())
3737
.insert((
3838
Node {
3939
width: Val::Percent(100.0),

0 commit comments

Comments
 (0)