diff --git a/crates/bevy_animation/Cargo.toml b/crates/bevy_animation/Cargo.toml index 11e819806c506..515c24325fd76 100644 --- a/crates/bevy_animation/Cargo.toml +++ b/crates/bevy_animation/Cargo.toml @@ -37,7 +37,7 @@ serde = "1" blake3 = { version = "1.0" } downcast-rs = { version = "2", default-features = false, features = ["std"] } thiserror = { version = "2", default-features = false } -derive_more = { version = "1", default-features = false, features = ["from"] } +derive_more = { version = "2", default-features = false, features = ["from"] } either = "1.13" thread_local = "1" uuid = { version = "1.13.1", features = ["v4"] } diff --git a/crates/bevy_asset/Cargo.toml b/crates/bevy_asset/Cargo.toml index 07a45a3f6d210..ce0ba1fedc123 100644 --- a/crates/bevy_asset/Cargo.toml +++ b/crates/bevy_asset/Cargo.toml @@ -57,7 +57,7 @@ parking_lot = { version = "0.12", default-features = false, features = [ ron = { version = "0.8", default-features = false } serde = { version = "1", default-features = false, features = ["derive"] } thiserror = { version = "2", default-features = false } -derive_more = { version = "1", default-features = false, features = ["from"] } +derive_more = { version = "2", default-features = false, features = ["from"] } uuid = { version = "1.13.1", default-features = false, features = [ "v4", "serde", diff --git a/crates/bevy_color/Cargo.toml b/crates/bevy_color/Cargo.toml index 9b6d7d8cf6b8d..b4b7284c7106d 100644 --- a/crates/bevy_color/Cargo.toml +++ b/crates/bevy_color/Cargo.toml @@ -19,7 +19,7 @@ serde = { version = "1.0", features = [ "derive", ], default-features = false, optional = true } thiserror = { version = "2", default-features = false } -derive_more = { version = "1", default-features = false, features = ["from"] } +derive_more = { version = "2", default-features = false, features = ["from"] } wgpu-types = { version = "24", default-features = false, optional = true } encase = { version = "0.10", default-features = false, optional = true } diff --git a/crates/bevy_ecs/Cargo.toml b/crates/bevy_ecs/Cargo.toml index 97cdcee0824b7..e839b723388e7 100644 --- a/crates/bevy_ecs/Cargo.toml +++ b/crates/bevy_ecs/Cargo.toml @@ -117,7 +117,7 @@ serde = { version = "1", default-features = false, features = [ "serde_derive", ], optional = true } thiserror = { version = "2", default-features = false } -derive_more = { version = "1", default-features = false, features = [ +derive_more = { version = "2", default-features = false, features = [ "from", "display", "into", diff --git a/crates/bevy_input/Cargo.toml b/crates/bevy_input/Cargo.toml index 570273a00ac59..524f262b1bfd6 100644 --- a/crates/bevy_input/Cargo.toml +++ b/crates/bevy_input/Cargo.toml @@ -76,7 +76,7 @@ serde = { version = "1", features = [ "derive", ], default-features = false, optional = true } thiserror = { version = "2", default-features = false } -derive_more = { version = "1", default-features = false, features = ["from"] } +derive_more = { version = "2", default-features = false, features = ["from"] } smol_str = { version = "0.2", default-features = false, optional = true } log = { version = "0.4", default-features = false } diff --git a/crates/bevy_math/Cargo.toml b/crates/bevy_math/Cargo.toml index 7aae1ec74be45..8a0122f399e08 100644 --- a/crates/bevy_math/Cargo.toml +++ b/crates/bevy_math/Cargo.toml @@ -12,7 +12,7 @@ rust-version = "1.85.0" [dependencies] glam = { version = "0.29.3", default-features = false, features = ["bytemuck"] } thiserror = { version = "2", default-features = false } -derive_more = { version = "1", default-features = false, features = [ +derive_more = { version = "2", default-features = false, features = [ "from", "into", ] } diff --git a/crates/bevy_pbr/Cargo.toml b/crates/bevy_pbr/Cargo.toml index 82642812b4644..bba5202c4c2d6 100644 --- a/crates/bevy_pbr/Cargo.toml +++ b/crates/bevy_pbr/Cargo.toml @@ -54,7 +54,7 @@ bevy_platform = { path = "../bevy_platform", version = "0.16.0-dev", default-fea bitflags = "2.3" fixedbitset = "0.5" thiserror = { version = "2", default-features = false } -derive_more = { version = "1", default-features = false, features = ["from"] } +derive_more = { version = "2", default-features = false, features = ["from"] } # meshlet lz4_flex = { version = "0.11", default-features = false, features = [ "frame", diff --git a/crates/bevy_reflect/Cargo.toml b/crates/bevy_reflect/Cargo.toml index bb72226ab85a7..2a8d3f4ceb220 100644 --- a/crates/bevy_reflect/Cargo.toml +++ b/crates/bevy_reflect/Cargo.toml @@ -99,7 +99,7 @@ erased-serde = { version = "0.4", default-features = false, features = [ disqualified = { version = "1.0", default-features = false } downcast-rs = { version = "2", default-features = false } thiserror = { version = "2", default-features = false } -derive_more = { version = "1", default-features = false, features = ["from"] } +derive_more = { version = "2", default-features = false, features = ["from"] } serde = { version = "1", default-features = false, features = ["alloc"] } assert_type_match = "0.1.1" smallvec = { version = "1.11", default-features = false, optional = true } diff --git a/crates/bevy_render/Cargo.toml b/crates/bevy_render/Cargo.toml index aa6b6e239cbfd..f35ad06347182 100644 --- a/crates/bevy_render/Cargo.toml +++ b/crates/bevy_render/Cargo.toml @@ -95,7 +95,7 @@ serde = { version = "1", features = ["derive"] } bytemuck = { version = "1.5", features = ["derive", "must_cast"] } downcast-rs = { version = "2", default-features = false, features = ["std"] } thiserror = { version = "2", default-features = false } -derive_more = { version = "1", default-features = false, features = ["from"] } +derive_more = { version = "2", default-features = false, features = ["from"] } futures-lite = "2.0.1" ktx2 = { version = "0.4.0", optional = true } encase = { version = "0.10", features = ["glam"] } diff --git a/crates/bevy_scene/Cargo.toml b/crates/bevy_scene/Cargo.toml index 3bb913c85908b..73809940a895a 100644 --- a/crates/bevy_scene/Cargo.toml +++ b/crates/bevy_scene/Cargo.toml @@ -35,7 +35,7 @@ bevy_platform = { path = "../bevy_platform", version = "0.16.0-dev", default-fea serde = { version = "1.0", features = ["derive"], optional = true } uuid = { version = "1.13.1", features = ["v4"] } thiserror = { version = "2", default-features = false } -derive_more = { version = "1", default-features = false, features = ["from"] } +derive_more = { version = "2", default-features = false, features = ["from"] } [target.'cfg(target_arch = "wasm32")'.dependencies] # TODO: Assuming all wasm builds are for the browser. Require `no_std` support to break assumption. diff --git a/crates/bevy_sprite/Cargo.toml b/crates/bevy_sprite/Cargo.toml index 8fa5bae2ccefe..fee8c92dcf52d 100644 --- a/crates/bevy_sprite/Cargo.toml +++ b/crates/bevy_sprite/Cargo.toml @@ -36,7 +36,7 @@ bevy_platform = { path = "../bevy_platform", version = "0.16.0-dev", default-fea # other bytemuck = { version = "1", features = ["derive", "must_cast"] } fixedbitset = "0.5" -derive_more = { version = "1", default-features = false, features = ["from"] } +derive_more = { version = "2", default-features = false, features = ["from"] } bitflags = "2.3" radsort = "0.1" nonmax = "0.5" diff --git a/crates/bevy_tasks/Cargo.toml b/crates/bevy_tasks/Cargo.toml index 07c20b9750f5b..6b54aec410374 100644 --- a/crates/bevy_tasks/Cargo.toml +++ b/crates/bevy_tasks/Cargo.toml @@ -50,7 +50,7 @@ futures-lite = { version = "2.0.1", default-features = false, features = [ "alloc", ] } async-task = { version = "4.4.0", default-features = false } -derive_more = { version = "1", default-features = false, features = [ +derive_more = { version = "2", default-features = false, features = [ "deref", "deref_mut", ] } diff --git a/crates/bevy_transform/Cargo.toml b/crates/bevy_transform/Cargo.toml index 348db148ce66a..0d93b1aad25a8 100644 --- a/crates/bevy_transform/Cargo.toml +++ b/crates/bevy_transform/Cargo.toml @@ -21,7 +21,7 @@ serde = { version = "1", default-features = false, features = [ "derive", ], optional = true } thiserror = { version = "2", default-features = false } -derive_more = { version = "1", default-features = false, features = ["from"] } +derive_more = { version = "2", default-features = false, features = ["from"] } [dev-dependencies] bevy_tasks = { path = "../bevy_tasks", version = "0.16.0-dev" } diff --git a/crates/bevy_ui/Cargo.toml b/crates/bevy_ui/Cargo.toml index 2874d8738b3b2..39e07702eaf31 100644 --- a/crates/bevy_ui/Cargo.toml +++ b/crates/bevy_ui/Cargo.toml @@ -38,7 +38,7 @@ serde = { version = "1", features = ["derive"], optional = true } uuid = { version = "1.1", features = ["v4"], optional = true } bytemuck = { version = "1.5", features = ["derive"] } thiserror = { version = "2", default-features = false } -derive_more = { version = "1", default-features = false, features = ["from"] } +derive_more = { version = "2", default-features = false, features = ["from"] } nonmax = "0.5" smallvec = "1.11" accesskit = "0.18"