From e60824f570be7123566a4e937b8e1b7df4101d6a Mon Sep 17 00:00:00 2001 From: james7132 Date: Thu, 26 May 2022 01:44:34 -0700 Subject: [PATCH 1/4] Update gilrs to v0.9 --- crates/bevy_gilrs/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/bevy_gilrs/Cargo.toml b/crates/bevy_gilrs/Cargo.toml index f67ce8794cfdb..1bcd71340cf17 100644 --- a/crates/bevy_gilrs/Cargo.toml +++ b/crates/bevy_gilrs/Cargo.toml @@ -16,4 +16,4 @@ bevy_input = { path = "../bevy_input", version = "0.8.0-dev" } bevy_utils = { path = "../bevy_utils", version = "0.8.0-dev" } # other -gilrs = { version = "0.8.0", features = ["wasm-bindgen"] } +gilrs = "0.9.0" From b8daa6e6ba74edbb46f302deae15321170b272df Mon Sep 17 00:00:00 2001 From: james7132 Date: Thu, 26 May 2022 02:27:12 -0700 Subject: [PATCH 2/4] Update uuid to 1.1 --- crates/bevy_reflect/bevy_reflect_derive/Cargo.toml | 2 +- crates/bevy_scene/Cargo.toml | 2 +- crates/bevy_utils/Cargo.toml | 5 ++--- crates/bevy_window/src/window.rs | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/crates/bevy_reflect/bevy_reflect_derive/Cargo.toml b/crates/bevy_reflect/bevy_reflect_derive/Cargo.toml index 3663af55af8db..72991cf776e1c 100644 --- a/crates/bevy_reflect/bevy_reflect_derive/Cargo.toml +++ b/crates/bevy_reflect/bevy_reflect_derive/Cargo.toml @@ -17,4 +17,4 @@ bevy_macro_utils = { path = "../../bevy_macro_utils", version = "0.8.0-dev" } syn = { version = "1.0", features = ["full"] } proc-macro2 = "1.0" quote = "1.0" -uuid = { version = "0.8", features = ["v4"] } +uuid = { version = "1.1", features = ["v4"] } diff --git a/crates/bevy_scene/Cargo.toml b/crates/bevy_scene/Cargo.toml index a72240904d096..360d30bdc0216 100644 --- a/crates/bevy_scene/Cargo.toml +++ b/crates/bevy_scene/Cargo.toml @@ -20,6 +20,6 @@ bevy_utils = { path = "../bevy_utils", version = "0.8.0-dev" } # other serde = { version = "1.0", features = ["derive"] } ron = "0.7.0" -uuid = { version = "0.8", features = ["v4", "serde"] } +uuid = { version = "1.1", features = ["v4", "serde"] } anyhow = "1.0.4" thiserror = "1.0" diff --git a/crates/bevy_utils/Cargo.toml b/crates/bevy_utils/Cargo.toml index 6262d70812727..6e0b974bb7815 100644 --- a/crates/bevy_utils/Cargo.toml +++ b/crates/bevy_utils/Cargo.toml @@ -12,9 +12,8 @@ keywords = ["bevy"] ahash = "0.7.0" tracing = { version = "0.1", default-features = false, features = ["std"] } instant = { version = "0.1", features = ["wasm-bindgen"] } -uuid = { version = "0.8", features = ["v4", "serde"] } +uuid = { version = "1.1", features = ["v4", "serde"] } hashbrown = { version = "0.11", features = ["serde"] } [target.'cfg(target_arch = "wasm32")'.dependencies] -getrandom = {version = "0.2.0", features = ["js"]} -uuid = { version = "0.8", features = ["wasm-bindgen"] } +getrandom = {version = "0.2.0", features = ["js"]} \ No newline at end of file diff --git a/crates/bevy_window/src/window.rs b/crates/bevy_window/src/window.rs index f7d0e1d54a857..65874f5a10ae5 100644 --- a/crates/bevy_window/src/window.rs +++ b/crates/bevy_window/src/window.rs @@ -59,7 +59,7 @@ use crate::raw_window_handle::RawWindowHandleWrapper; impl fmt::Display for WindowId { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - self.0.to_simple().fmt(f) + self.0.as_simple().fmt(f) } } From 54e53cefb9a2db66f0a46e42180e07897190f718 Mon Sep 17 00:00:00 2001 From: james7132 Date: Thu, 26 May 2022 02:43:48 -0700 Subject: [PATCH 3/4] Add exceptions for duplicate nix deps --- deny.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deny.toml b/deny.toml index 496a48825a3db..e43026e5e5bda 100644 --- a/deny.toml +++ b/deny.toml @@ -49,6 +49,8 @@ skip = [ { name = "ndk-sys", version = "0.2" }, # from winit v0.26.1 { name = "stdweb", version = "0.1" }, # from rodio v0.15.0 { name = "wasi", version = "0.10"}, # from ahash v0.7.6 + { name = "nix", version = "0.23.1" }, # from alsa v0.6.0 + { name = "nix", version = "0.24.1" }, # from gilrs-core v0.4.0 ] [sources] From 6070799b7a3bbaa7667eaa94805f87a9365b51bd Mon Sep 17 00:00:00 2001 From: James Liu Date: Thu, 26 May 2022 03:48:24 -0700 Subject: [PATCH 4/4] Remove the extra deny.toml entry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: François --- deny.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/deny.toml b/deny.toml index e43026e5e5bda..57716aba74427 100644 --- a/deny.toml +++ b/deny.toml @@ -50,7 +50,6 @@ skip = [ { name = "stdweb", version = "0.1" }, # from rodio v0.15.0 { name = "wasi", version = "0.10"}, # from ahash v0.7.6 { name = "nix", version = "0.23.1" }, # from alsa v0.6.0 - { name = "nix", version = "0.24.1" }, # from gilrs-core v0.4.0 ] [sources]