From de3c70a8d31058a682f526d4ba233167cb650777 Mon Sep 17 00:00:00 2001 From: targrub <62773321+targrub@users.noreply.github.com> Date: Mon, 23 Sep 2024 15:44:02 -0400 Subject: [PATCH] Update ``glam`` to 0.29, ``encase`` to 0.10. (#15249) # Objective Updating ``glam`` to 0.29, ``encase`` to 0.10. ## Solution Update the necessary ``Cargo.toml`` files. ## Testing Ran ``cargo run -p ci`` on Windows; no issues came up. --------- Co-authored-by: aecsocket --- benches/Cargo.toml | 2 +- crates/bevy_color/Cargo.toml | 2 +- crates/bevy_encase_derive/Cargo.toml | 2 +- crates/bevy_math/Cargo.toml | 4 ++-- crates/bevy_mikktspace/Cargo.toml | 2 +- crates/bevy_reflect/Cargo.toml | 2 +- crates/bevy_render/Cargo.toml | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/benches/Cargo.toml b/benches/Cargo.toml index 5e28ffb444..cc586a3e66 100644 --- a/benches/Cargo.toml +++ b/benches/Cargo.toml @@ -6,7 +6,7 @@ publish = false license = "MIT OR Apache-2.0" [dev-dependencies] -glam = "0.28" +glam = "0.29" rand = "0.8" rand_chacha = "0.3" criterion = { version = "0.3", features = ["html_reports"] } diff --git a/crates/bevy_color/Cargo.toml b/crates/bevy_color/Cargo.toml index 215cf712af..27f0e5bdbe 100644 --- a/crates/bevy_color/Cargo.toml +++ b/crates/bevy_color/Cargo.toml @@ -18,7 +18,7 @@ bytemuck = { version = "1", features = ["derive"] } serde = { version = "1.0", features = ["derive"], optional = true } thiserror = "1.0" wgpu-types = { version = "22", default-features = false, optional = true } -encase = { version = "0.9", default-features = false } +encase = { version = "0.10", default-features = false } [features] default = ["bevy_reflect"] diff --git a/crates/bevy_encase_derive/Cargo.toml b/crates/bevy_encase_derive/Cargo.toml index 8a8eb22fa9..9184bddd25 100644 --- a/crates/bevy_encase_derive/Cargo.toml +++ b/crates/bevy_encase_derive/Cargo.toml @@ -13,7 +13,7 @@ proc-macro = true [dependencies] bevy_macro_utils = { path = "../bevy_macro_utils", version = "0.15.0-dev" } -encase_derive_impl = "0.8" +encase_derive_impl = "0.10" [lints] workspace = true diff --git a/crates/bevy_math/Cargo.toml b/crates/bevy_math/Cargo.toml index d158075608..8662b029b2 100644 --- a/crates/bevy_math/Cargo.toml +++ b/crates/bevy_math/Cargo.toml @@ -10,7 +10,7 @@ keywords = ["bevy"] rust-version = "1.68.2" [dependencies] -glam = { version = "0.28", features = ["bytemuck"] } +glam = { version = "0.29", features = ["bytemuck"] } thiserror = "1.0" itertools = "0.13.0" serde = { version = "1", features = ["derive"], optional = true } @@ -33,7 +33,7 @@ rand = "0.8" rand_chacha = "0.3" # Enable the approx feature when testing. bevy_math = { path = ".", version = "0.15.0-dev", features = ["approx"] } -glam = { version = "0.28", features = ["approx"] } +glam = { version = "0.29", features = ["approx"] } [features] default = ["rand", "bevy_reflect"] diff --git a/crates/bevy_mikktspace/Cargo.toml b/crates/bevy_mikktspace/Cargo.toml index 30372a6997..2207a1ca2a 100644 --- a/crates/bevy_mikktspace/Cargo.toml +++ b/crates/bevy_mikktspace/Cargo.toml @@ -16,7 +16,7 @@ keywords = ["bevy", "3D", "graphics", "algorithm", "tangent"] rust-version = "1.76.0" [dependencies] -glam = "0.28" +glam = "0.29" [[example]] name = "generate" diff --git a/crates/bevy_reflect/Cargo.toml b/crates/bevy_reflect/Cargo.toml index 336f002d41..328fb47ebc 100644 --- a/crates/bevy_reflect/Cargo.toml +++ b/crates/bevy_reflect/Cargo.toml @@ -42,7 +42,7 @@ thiserror = "1.0" serde = "1" smallvec = { version = "1.11", optional = true } -glam = { version = "0.28", features = ["serde"], optional = true } +glam = { version = "0.29", features = ["serde"], optional = true } petgraph = { version = "0.6", features = ["serde-1"], optional = true } smol_str = { version = "0.2.0", features = ["serde"], optional = true } uuid = { version = "1.0", optional = true, features = ["v4", "serde"] } diff --git a/crates/bevy_render/Cargo.toml b/crates/bevy_render/Cargo.toml index 628b5e6e21..812e389ff7 100644 --- a/crates/bevy_render/Cargo.toml +++ b/crates/bevy_render/Cargo.toml @@ -87,7 +87,7 @@ bytemuck = { version = "1.5", features = ["derive", "must_cast"] } downcast-rs = "1.2.0" thiserror = "1.0" futures-lite = "2.0.1" -hexasphere = "14.0" +hexasphere = "15.0" ddsfile = { version = "0.5.2", optional = true } ktx2 = { version = "0.3.0", optional = true } # For ktx2 supercompression @@ -95,7 +95,7 @@ flate2 = { version = "1.0.22", optional = true } ruzstd = { version = "0.7.0", optional = true } # For transcoding of UASTC/ETC1S universal formats, and for .basis file support basis-universal = { version = "0.3.0", optional = true } -encase = { version = "0.9", features = ["glam"] } +encase = { version = "0.10", features = ["glam"] } # For wgpu profiling using tracing. Use `RUST_LOG=info` to also capture the wgpu spans. profiling = { version = "1", features = [ "profile-with-tracing",