From aaf5ab8d0ad29396f7cd117cf75e85c79eaf4212 Mon Sep 17 00:00:00 2001
From: StarArawn <toasterthegamer@gmail.com>
Date: Sun, 2 Jan 2022 09:33:43 -0500
Subject: [PATCH] Updated to latest bevy
---
Cargo.lock | 261 +++++++++++++++++++++------------------
Cargo.toml | 4 +-
bevy_kayak_ui/Cargo.toml | 4 +-
kayak_core/Cargo.toml | 2 +-
kayak_font/Cargo.toml | 4 +-
5 files changed, 148 insertions(+), 127 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 3e2280c..32e7fe8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
[[package]]
name = "ab_glyph"
-version = "0.2.12"
+version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20b228f2c198f98d4337ceb560333fb12cbb2f4948a953bf8c57d09deb219603"
+checksum = "61caed9aec6daeee1ea38ccf5fb225e4f96c1eeead1b4a5c267324a63cf02326"
dependencies = [
"ab_glyph_rasterizer",
"owned_ttf_parser",
@@ -59,7 +59,7 @@ dependencies = [
"alsa-sys",
"bitflags",
"libc",
- "nix",
+ "nix 0.20.0",
]
[[package]]
@@ -107,9 +107,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.51"
+version = "1.0.52"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b26702f315f53b6071259e15dd9d64528213b44d61de1ec926eca7715d62203"
+checksum = "84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3"
[[package]]
name = "approx"
@@ -134,9 +134,9 @@ checksum = "088ccb346677e658e7ccd9627c62576fba881f4db7fab71fa9e21bf31c0aa4cb"
[[package]]
name = "ash"
-version = "0.33.3+1.2.191"
+version = "0.34.0+1.2.203"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc4f1d82f164f838ae413296d1131aa6fa79b917d25bebaa7033d25620c09219"
+checksum = "b0f780da53d0063880d45554306489f09dd8d1bda47688b4a57bc579119356df"
dependencies = [
"libloading",
]
@@ -193,7 +193,7 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
[[package]]
name = "bevy"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_internal",
]
@@ -201,7 +201,7 @@ dependencies = [
[[package]]
name = "bevy-crevice-derive"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_macro_utils",
"proc-macro2",
@@ -212,7 +212,7 @@ dependencies = [
[[package]]
name = "bevy_app"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_derive",
"bevy_ecs",
@@ -225,7 +225,7 @@ dependencies = [
[[package]]
name = "bevy_asset"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"anyhow",
"bevy_app",
@@ -252,7 +252,7 @@ dependencies = [
[[package]]
name = "bevy_audio"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"anyhow",
"bevy_app",
@@ -267,7 +267,7 @@ dependencies = [
[[package]]
name = "bevy_core"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_app",
"bevy_derive",
@@ -282,7 +282,7 @@ dependencies = [
[[package]]
name = "bevy_core_pipeline"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_app",
"bevy_asset",
@@ -294,7 +294,7 @@ dependencies = [
[[package]]
name = "bevy_crevice"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy-crevice-derive",
"bytemuck",
@@ -305,7 +305,7 @@ dependencies = [
[[package]]
name = "bevy_derive"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"Inflector",
"bevy_macro_utils",
@@ -316,7 +316,7 @@ dependencies = [
[[package]]
name = "bevy_diagnostic"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_app",
"bevy_core",
@@ -328,7 +328,7 @@ dependencies = [
[[package]]
name = "bevy_ecs"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"async-channel",
"bevy_ecs_macros",
@@ -345,7 +345,7 @@ dependencies = [
[[package]]
name = "bevy_ecs_macros"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_macro_utils",
"proc-macro2",
@@ -356,7 +356,7 @@ dependencies = [
[[package]]
name = "bevy_gilrs"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_app",
"bevy_ecs",
@@ -368,7 +368,7 @@ dependencies = [
[[package]]
name = "bevy_gltf"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"anyhow",
"base64",
@@ -392,7 +392,7 @@ dependencies = [
[[package]]
name = "bevy_input"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_app",
"bevy_ecs",
@@ -403,7 +403,7 @@ dependencies = [
[[package]]
name = "bevy_internal"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_app",
"bevy_asset",
@@ -450,7 +450,7 @@ dependencies = [
[[package]]
name = "bevy_log"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"android_log-sys",
"bevy_app",
@@ -464,7 +464,7 @@ dependencies = [
[[package]]
name = "bevy_macro_utils"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"cargo-manifest",
"quote",
@@ -474,7 +474,7 @@ dependencies = [
[[package]]
name = "bevy_math"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_reflect",
"glam",
@@ -483,7 +483,7 @@ dependencies = [
[[package]]
name = "bevy_pbr"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_app",
"bevy_asset",
@@ -503,7 +503,7 @@ dependencies = [
[[package]]
name = "bevy_reflect"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_reflect_derive",
"bevy_utils",
@@ -519,7 +519,7 @@ dependencies = [
[[package]]
name = "bevy_reflect_derive"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_macro_utils",
"proc-macro2",
@@ -531,7 +531,7 @@ dependencies = [
[[package]]
name = "bevy_render"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"anyhow",
"bevy_app",
@@ -565,7 +565,7 @@ dependencies = [
[[package]]
name = "bevy_scene"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"anyhow",
"bevy_app",
@@ -583,7 +583,7 @@ dependencies = [
[[package]]
name = "bevy_sprite"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_app",
"bevy_asset",
@@ -606,7 +606,7 @@ dependencies = [
[[package]]
name = "bevy_tasks"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"async-channel",
"async-executor",
@@ -619,7 +619,7 @@ dependencies = [
[[package]]
name = "bevy_text"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"ab_glyph",
"anyhow",
@@ -642,7 +642,7 @@ dependencies = [
[[package]]
name = "bevy_transform"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_app",
"bevy_ecs",
@@ -655,7 +655,7 @@ dependencies = [
[[package]]
name = "bevy_ui"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_app",
"bevy_asset",
@@ -682,7 +682,7 @@ dependencies = [
[[package]]
name = "bevy_utils"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"ahash",
"bevy_derive",
@@ -695,7 +695,7 @@ dependencies = [
[[package]]
name = "bevy_window"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_app",
"bevy_math",
@@ -707,7 +707,7 @@ dependencies = [
[[package]]
name = "bevy_winit"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
+source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"approx",
"bevy_app",
@@ -776,9 +776,9 @@ checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c"
[[package]]
name = "bytemuck"
-version = "1.7.2"
+version = "1.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72957246c41db82b8ef88a5486143830adeb8227ef9837740bdec67724cf2c5b"
+checksum = "439989e6b8c38d1b6570a384ef1e49c8848128f5a97f3914baef02920842712f"
dependencies = [
"bytemuck_derive",
]
@@ -808,9 +808,9 @@ checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
[[package]]
name = "cache-padded"
-version = "1.1.1"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
+checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
[[package]]
name = "cargo-manifest"
@@ -1091,7 +1091,7 @@ dependencies = [
"mach 0.3.2",
"ndk 0.3.0",
"ndk-glue 0.3.0",
- "nix",
+ "nix 0.20.0",
"oboe",
"parking_lot",
"stdweb 0.1.3",
@@ -1285,9 +1285,9 @@ dependencies = [
[[package]]
name = "erased-serde"
-version = "0.3.16"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3de9ad4541d99dc22b59134e7ff8dc3d6c988c89ecd7324bf10a8362b07a2afa"
+checksum = "44a5d80251b806a14cd3e4e1a582e912d5cbf6904ab19fdefbd7a56adca088e1"
dependencies = [
"serde",
]
@@ -1309,9 +1309,9 @@ checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59"
[[package]]
name = "fastrand"
-version = "1.5.0"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b394ed3d285a429378d3b384b9eb1285267e7df4b166df24b7a6939a04dc392e"
+checksum = "779d043b6a0b90cc4c0ed7ee380a6504394cee7efd7db050e3774eee387324b2"
dependencies = [
"instant",
]
@@ -1330,9 +1330,9 @@ dependencies = [
[[package]]
name = "fixedbitset"
-version = "0.4.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "398ea4fabe40b9b0d885340a2a991a44c8a645624075ad966d21f88688e2b69e"
+checksum = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e"
[[package]]
name = "flo_binding"
@@ -1383,9 +1383,9 @@ dependencies = [
[[package]]
name = "futures"
-version = "0.3.18"
+version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cd0210d8c325c245ff06fd95a3b13689a1a276ac8cfa8e8720cb840bfb84b9e"
+checksum = "28560757fe2bb34e79f907794bb6b22ae8b0e5c669b638a1132f2592b19035b4"
dependencies = [
"futures-channel",
"futures-core",
@@ -1398,9 +1398,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.18"
+version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fc8cd39e3dbf865f7340dce6a2d401d24fd37c6fe6c4f0ee0de8bfca2252d27"
+checksum = "ba3dda0b6588335f360afc675d0564c17a77a2bda81ca178a4b6081bd86c7f0b"
dependencies = [
"futures-core",
"futures-sink",
@@ -1408,15 +1408,15 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.18"
+version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "629316e42fe7c2a0b9a65b47d159ceaa5453ab14e8f0a3c5eedbb8cd55b4a445"
+checksum = "d0c8ff0461b82559810cdccfde3215c3f373807f5e5232b71479bff7bb2583d7"
[[package]]
name = "futures-executor"
-version = "0.3.18"
+version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b808bf53348a36cab739d7e04755909b9fcaaa69b7d7e588b37b6ec62704c97"
+checksum = "29d6d2ff5bb10fb95c85b8ce46538a2e5f5e7fdc755623a7d4529ab8a4ed9d2a"
dependencies = [
"futures-core",
"futures-task",
@@ -1425,9 +1425,9 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.18"
+version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e481354db6b5c353246ccf6a728b0c5511d752c08da7260546fc0933869daa11"
+checksum = "b1f9d34af5a1aac6fb380f735fe510746c38067c5bf16c7fd250280503c971b2"
[[package]]
name = "futures-lite"
@@ -1446,9 +1446,9 @@ dependencies = [
[[package]]
name = "futures-macro"
-version = "0.3.18"
+version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a89f17b21645bc4ed773c69af9c9a0effd4a3f1a3876eadd453469f8854e7fdd"
+checksum = "6dbd947adfffb0efc70599b3ddcf7b5597bb5fa9e245eb99f62b3a5f7bb8bd3c"
dependencies = [
"proc-macro2",
"quote",
@@ -1457,21 +1457,21 @@ dependencies = [
[[package]]
name = "futures-sink"
-version = "0.3.18"
+version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "996c6442437b62d21a32cd9906f9c41e7dc1e19a9579843fad948696769305af"
+checksum = "e3055baccb68d74ff6480350f8d6eb8fcfa3aa11bdc1a1ae3afdd0514617d508"
[[package]]
name = "futures-task"
-version = "0.3.18"
+version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dabf1872aaab32c886832f2276d2f5399887e2bd613698a02359e4ea83f8de12"
+checksum = "6ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72"
[[package]]
name = "futures-util"
-version = "0.3.18"
+version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d22213122356472061ac0f1ab2cee28d2bac8491410fd68c2af53d1cedb83e"
+checksum = "d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164"
dependencies = [
"futures-channel",
"futures-core",
@@ -1509,9 +1509,9 @@ dependencies = [
[[package]]
name = "gilrs"
-version = "0.8.1"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e986f911d937f4395dfc2a39618dcef452773d32dcdbe0828c623f76588f749"
+checksum = "1550c8bdebc993576e343d600a954654708a9a1182396ee1e805d6fe60c72909"
dependencies = [
"fnv",
"gilrs-core",
@@ -1522,9 +1522,9 @@ dependencies = [
[[package]]
name = "gilrs-core"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a5e5bb97bf9a0d9519a28cf38839cf1d6d9bb572b48e3c67202271fec2ed5e7"
+checksum = "84c7262ce1e88429c9b1d847820c9d2ba00adafc955218393d9c0861d5aaab88"
dependencies = [
"core-foundation 0.6.4",
"io-kit-sys",
@@ -1532,7 +1532,7 @@ dependencies = [
"libc",
"libudev-sys",
"log",
- "nix",
+ "nix 0.23.1",
"rusty-xinput",
"stdweb 0.4.20",
"uuid",
@@ -1543,9 +1543,9 @@ dependencies = [
[[package]]
name = "glam"
-version = "0.20.1"
+version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68270e16582ea40f9c5b2fcd588fbc9cb696577222e04a64d9085cc314806a8a"
+checksum = "e4fa84eead97d5412b2a20aed4d66612a97a9e41e08eababdb9ae2bf88667490"
dependencies = [
"bytemuck",
"mint",
@@ -1560,9 +1560,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
[[package]]
name = "glow"
-version = "0.11.1"
+version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c07210904884e8e2e6a2d7f36f39040a9cefe3b379b721969b5275e9f5b464a"
+checksum = "d8bd5877156a19b8ac83a29b2306fe20537429d318f3ff0a1a2119f8d9c61919"
dependencies = [
"js-sys",
"slotmap",
@@ -1793,9 +1793,9 @@ dependencies = [
[[package]]
name = "itoa"
-version = "0.4.8"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
+checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
[[package]]
name = "jni"
@@ -1940,9 +1940,9 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.111"
+version = "0.2.112"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e167738f1866a7ec625567bae89ca0d44477232a4f7c52b1c7f2adc2c98804f"
+checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
[[package]]
name = "libloading"
@@ -2030,6 +2030,15 @@ version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
+[[package]]
+name = "memoffset"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+dependencies = [
+ "autocfg",
+]
+
[[package]]
name = "metal"
version = "0.23.1"
@@ -2105,9 +2114,9 @@ dependencies = [
[[package]]
name = "naga"
-version = "0.8.0"
+version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc7216bec6be822a562dda435236539c7fb5aa5e5ceecc8c565e81139ed1d4b0"
+checksum = "a4419062f8aa39fb25938169486341945758679e260ddbc1f94bfd1f33924dc2"
dependencies = [
"bit-set",
"bitflags",
@@ -2248,6 +2257,19 @@ dependencies = [
"libc",
]
+[[package]]
+name = "nix"
+version = "0.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6"
+dependencies = [
+ "bitflags",
+ "cc",
+ "cfg-if 1.0.0",
+ "libc",
+ "memoffset",
+]
+
[[package]]
name = "nom"
version = "5.1.2"
@@ -2339,9 +2361,9 @@ dependencies = [
[[package]]
name = "num_cpus"
-version = "1.13.0"
+version = "1.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
+checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
dependencies = [
"hermit-abi",
"libc",
@@ -2349,19 +2371,18 @@ dependencies = [
[[package]]
name = "num_enum"
-version = "0.5.4"
+version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9bd055fb730c4f8f4f57d45d35cd6b3f0980535b056dc7ff119cee6a66ed6f"
+checksum = "720d3ea1055e4e4574c0c0b0f8c3fd4f24c4cdaf465948206dea090b57b526ad"
dependencies = [
- "derivative",
"num_enum_derive",
]
[[package]]
name = "num_enum_derive"
-version = "0.5.4"
+version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "486ea01961c4a818096de679a8b740b26d9033146ac5291b1c98557658f8cdd9"
+checksum = "0d992b768490d7fe0d8586d9b5745f6c49f557da6d81dc982b1d167ad4edbb21"
dependencies = [
"proc-macro-crate 1.1.0",
"proc-macro2",
@@ -2422,15 +2443,15 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.8.0"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
+checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5"
[[package]]
name = "owned_ttf_parser"
-version = "0.13.2"
+version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65ee3f72636e6f164cc41c9f9057f4e58c4e13507699ea7f5e5242b64b8198ee"
+checksum = "4ef05f2882a8b3e7acc10c153ade2631f7bfc8ce00d2bf3fb8f4e9d2ae6ea5c3"
dependencies = [
"ttf-parser",
]
@@ -2490,9 +2511,9 @@ dependencies = [
[[package]]
name = "pin-project-lite"
-version = "0.2.7"
+version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
+checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c"
[[package]]
name = "pin-utils"
@@ -2529,9 +2550,9 @@ dependencies = [
[[package]]
name = "ppv-lite86"
-version = "0.2.15"
+version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba"
+checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
[[package]]
name = "pretty_assertions"
@@ -2588,9 +2609,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.33"
+version = "1.0.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb37d2df5df740e582f28f8560cf425f52bb267d872fe58358eadb554909f07a"
+checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
dependencies = [
"unicode-xid",
]
@@ -2603,9 +2624,9 @@ checksum = "9926767b8b8244d7b6b64546585121d193c3d0b4856ccd656b7bfa9deb91ab6a"
[[package]]
name = "quote"
-version = "1.0.10"
+version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05"
+checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d"
dependencies = [
"proc-macro2",
]
@@ -2814,18 +2835,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
[[package]]
name = "serde"
-version = "1.0.131"
+version = "1.0.133"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4ad69dfbd3e45369132cc64e6748c2d65cdfb001a2b1c232d128b4ad60561c1"
+checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.131"
+version = "1.0.133"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b710a83c4e0dff6a3d511946b95274ad9ca9e5d3ae497b63fda866ac955358d2"
+checksum = "ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537"
dependencies = [
"proc-macro2",
"quote",
@@ -2834,9 +2855,9 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.72"
+version = "1.0.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0ffa0837f2dfa6fb90868c2b5468cad482e175f7dad97e7421951e663f2b527"
+checksum = "ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142"
dependencies = [
"itoa",
"ryu",
@@ -2994,9 +3015,9 @@ checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2"
[[package]]
name = "syn"
-version = "1.0.82"
+version = "1.0.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8daf5dd0bb60cbd4137b1b587d2fc0ae729bc07cf01cd70b36a1ed5ade3b9d59"
+checksum = "ecb2e6da8ee5eb9a61068762a32fa9619cc591ceb055b3687f4cd4051ec2e06b"
dependencies = [
"proc-macro2",
"quote",
@@ -3111,9 +3132,9 @@ dependencies = [
[[package]]
name = "tracing-subscriber"
-version = "0.3.3"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "245da694cc7fc4729f3f418b304cb57789f1bed2a78c575407ab8a23f53cb4d3"
+checksum = "5d81bfa81424cc98cb034b837c985b7a290f592e5b4322f353f94a0ab0f9f594"
dependencies = [
"ansi_term 0.12.1",
"lazy_static",
@@ -3140,9 +3161,9 @@ dependencies = [
[[package]]
name = "ttf-parser"
-version = "0.13.4"
+version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76dacc724328b3d5e2ed67f9e30cdb56893a34ab239032502cc8f19f8dae4bbc"
+checksum = "4ccbe8381883510b6a2d8f1e32905bddd178c11caef8083086d0c0c9ab0ac281"
[[package]]
name = "unicode-width"
@@ -3174,9 +3195,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
[[package]]
name = "version_check"
-version = "0.9.3"
+version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]]
name = "waker-fn"
@@ -3300,9 +3321,9 @@ dependencies = [
[[package]]
name = "wgpu-core"
-version = "0.12.0"
+version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "659a371d93a66fd0c15f0a5a730d0877416c82e0c539fd46741673a49f02afad"
+checksum = "cfe9cb9c9d728c0f7ea0c309f1b3d5e9d5c7d379890d0a4e3df3103323ff7a84"
dependencies = [
"arrayvec",
"bitflags",
@@ -3323,9 +3344,9 @@ dependencies = [
[[package]]
name = "wgpu-hal"
-version = "0.12.0"
+version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1abbd51f4f3d61db9c02dd776f643437823b6fa85e8642b4bb6d278b74335fc1"
+checksum = "742ec904d0577e1a88b82dba6cf0347c12197cd664b859b05f868bceb8cfff4d"
dependencies = [
"arrayvec",
"ash",
diff --git a/Cargo.toml b/Cargo.toml
index f671f35..92f72fe 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,14 +17,14 @@ bevy_renderer = [
]
[dependencies]
-bevy = { git = "https://github.com/bevyengine/bevy", rev = "1d0d8a3397bd6fc2c14d42ffd0668d2443748912", optional = true }
+bevy = { git = "https://github.com/bevyengine/bevy", rev = "50b3f27a767e3b538694d5e7b3ccfdffca647f1b", optional = true }
kayak_core = { path = "kayak_core" }
bevy_kayak_ui = { path = "bevy_kayak_ui", optional = true }
kayak_font = { path = "kayak_font", optional = true }
kayak_render_macros = { path = "kayak_render_macros" }
[dev-dependencies]
-bevy = { git = "https://github.com/bevyengine/bevy", rev = "1d0d8a3397bd6fc2c14d42ffd0668d2443748912" }
+bevy = { git = "https://github.com/bevyengine/bevy", rev = "50b3f27a767e3b538694d5e7b3ccfdffca647f1b" }
[[example]]
name = "todo"
diff --git a/bevy_kayak_ui/Cargo.toml b/bevy_kayak_ui/Cargo.toml
index f5b25b9..0812c90 100644
--- a/bevy_kayak_ui/Cargo.toml
+++ b/bevy_kayak_ui/Cargo.toml
@@ -5,8 +5,8 @@ edition = "2021"
[dependencies]
bytemuck = "1.7.2"
-bevy = { git = "https://github.com/bevyengine/bevy", rev = "1d0d8a3397bd6fc2c14d42ffd0668d2443748912" }
-bevy_crevice = { git = "https://github.com/bevyengine/bevy", rev = "1d0d8a3397bd6fc2c14d42ffd0668d2443748912" }
+bevy = { git = "https://github.com/bevyengine/bevy", rev = "50b3f27a767e3b538694d5e7b3ccfdffca647f1b" }
+bevy_crevice = { git = "https://github.com/bevyengine/bevy", rev = "50b3f27a767e3b538694d5e7b3ccfdffca647f1b" }
kayak_core = { path = "../kayak_core" }
kayak_font = { path = "../kayak_font" }
serde = "1.0"
diff --git a/kayak_core/Cargo.toml b/kayak_core/Cargo.toml
index 792c504..cb50bcf 100644
--- a/kayak_core/Cargo.toml
+++ b/kayak_core/Cargo.toml
@@ -12,7 +12,7 @@ bevy_renderer = ["bevy"]
[dependencies]
as-any = "0.2"
derivative = "2.2"
-bevy = { git = "https://github.com/bevyengine/bevy", rev = "1d0d8a3397bd6fc2c14d42ffd0668d2443748912", optional = true }
+bevy = { git = "https://github.com/bevyengine/bevy", rev = "50b3f27a767e3b538694d5e7b3ccfdffca647f1b", optional = true }
flo_binding = { git = "https://github.com/StarArawn/flo_binding.git", rev = "c78431a56df5ec082b7e1c271871e6c0ac75e81e" }
kayak_render_macros = { path = "../kayak_render_macros" }
morphorm = { git = "https://github.com/geom3trik/morphorm", rev = "1243152d4cebea46fd3e5098df26402c73acae91" }
diff --git a/kayak_font/Cargo.toml b/kayak_font/Cargo.toml
index ce61931..caac64c 100644
--- a/kayak_font/Cargo.toml
+++ b/kayak_font/Cargo.toml
@@ -7,8 +7,8 @@ edition = "2021"
[dependencies]
anyhow = { version = "1.0" }
-bevy = { git = "https://github.com/bevyengine/bevy", rev = "1d0d8a3397bd6fc2c14d42ffd0668d2443748912" }
-bevy_crevice = { git = "https://github.com/bevyengine/bevy", rev = "1d0d8a3397bd6fc2c14d42ffd0668d2443748912" }
+bevy = { git = "https://github.com/bevyengine/bevy", rev = "50b3f27a767e3b538694d5e7b3ccfdffca647f1b" }
+bevy_crevice = { git = "https://github.com/bevyengine/bevy", rev = "50b3f27a767e3b538694d5e7b3ccfdffca647f1b" }
bytemuck = "1.7.2"
serde = "1.0"
serde_json = "1.0"
--
GitLab