From d2057a97e6b2b962ade0157a46ba3016b49be763 Mon Sep 17 00:00:00 2001 From: Thom Bruce Date: Wed, 8 Nov 2023 01:13:33 +0000 Subject: [PATCH 01/13] update Bevy to 0.12 and ready crates --- Cargo.lock | 1815 +++++++++++++++++++++++++++++++++++++++------------- Cargo.toml | 12 +- 2 files changed, 1364 insertions(+), 463 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 51d1f82..6a353e3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -24,13 +24,28 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76eb1adf08c5bcaa8490b9851fd53cca27fa9880076f178ea9d29f05196728a8" +[[package]] +name = "accesskit" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca8410747ed85a17c4a1e9ed3f5a74d3e7bdcc876cf9a18ff40ae21d645997b2" + [[package]] name = "accesskit_consumer" version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04bb4d9e4772fe0d47df57d0d5dbe5d85dd05e2f37ae1ddb6b105e76be58fb00" dependencies = [ - "accesskit", + "accesskit 0.11.2", +] + +[[package]] +name = "accesskit_consumer" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c17cca53c09fbd7288667b22a201274b9becaa27f0b91bf52a526db95de45e6" +dependencies = [ + "accesskit 0.12.1", ] [[package]] @@ -39,8 +54,20 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "134d0acf6acb667c89d3332999b1a5df4edbc8d6113910f392ebb73f2b03bb56" dependencies = [ - "accesskit", - "accesskit_consumer", + "accesskit 0.11.2", + "accesskit_consumer 0.15.2", + "objc2", + "once_cell", +] + +[[package]] +name = "accesskit_macos" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd3b6ae1eabbfbced10e840fd3fce8a93ae84f174b3e4ba892ab7bcb42e477a7" +dependencies = [ + "accesskit 0.12.1", + "accesskit_consumer 0.16.1", "objc2", "once_cell", ] @@ -51,23 +78,49 @@ version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9eac0a7f2d7cd7a93b938af401d3d8e8b7094217989a7c25c55a953023436e31" dependencies = [ - "accesskit", - "accesskit_consumer", + "accesskit 0.11.2", + "accesskit_consumer 0.15.2", "arrayvec", "once_cell", "paste", "windows 0.48.0", ] +[[package]] +name = "accesskit_windows" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afcae27ec0974fc7c3b0b318783be89fd1b2e66dd702179fe600166a38ff4a0b" +dependencies = [ + "accesskit 0.12.1", + "accesskit_consumer 0.16.1", + "once_cell", + "paste", + "static_assertions", + "windows 0.48.0", +] + [[package]] name = "accesskit_winit" version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "825d23acee1bd6d25cbaa3ca6ed6e73faf24122a774ec33d52c5c86c6ab423c0" dependencies = [ - "accesskit", - "accesskit_macos", - "accesskit_windows", + "accesskit 0.11.2", + "accesskit_macos 0.9.0", + "accesskit_windows 0.14.3", + "winit", +] + +[[package]] +name = "accesskit_winit" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88e39fcec2e10971e188730b7a76bab60647dacc973d4591855ebebcadfaa738" +dependencies = [ + "accesskit 0.12.1", + "accesskit_macos 0.10.1", + "accesskit_windows 0.15.1", "winit", ] @@ -229,6 +282,16 @@ dependencies = [ "libloading 0.7.4", ] +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener", + "futures-core", +] + [[package]] name = "async-channel" version = "1.9.0" @@ -250,10 +313,22 @@ dependencies = [ "async-task", "concurrent-queue", "fastrand 2.0.1", - "futures-lite", + "futures-lite 1.13.0", "slab", ] +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock", + "autocfg", + "blocking", + "futures-lite 1.13.0", +] + [[package]] name = "async-lock" version = "2.8.0" @@ -269,6 +344,12 @@ version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "autocfg" version = "1.1.0" @@ -308,30 +389,39 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91c6d3ec4f89e85294dc97334c5b271ddc301fdf67ac9bb994fe44d9273e6ed7" dependencies = [ - "bevy_internal", + "bevy_internal 0.11.3", +] + +[[package]] +name = "bevy" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "329e344f835f5a9a4c46a6d1d57371f726aa2c482d1bd669b2b9c4eb1ee91fd7" +dependencies = [ + "bevy_internal 0.12.0", ] [[package]] name = "bevy-inspector-egui" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "452f1258251b85c06c5bc9df9ea994d8f3b8c0696f346d43878eec52fce8a09c" +checksum = "d65b98d6fca1209c36c4d403c377f303aad22d940281fe1a9e431217516f0622" dependencies = [ "bevy-inspector-egui-derive", - "bevy_app", - "bevy_asset", - "bevy_core", - "bevy_core_pipeline", - "bevy_ecs", + "bevy_app 0.12.0", + "bevy_asset 0.12.0", + "bevy_core 0.12.0", + "bevy_core_pipeline 0.12.0", + "bevy_ecs 0.12.0", "bevy_egui", - "bevy_hierarchy", - "bevy_log", - "bevy_math", + "bevy_hierarchy 0.12.0", + "bevy_log 0.12.0", + "bevy_math 0.12.0", "bevy_pbr", - "bevy_reflect", - "bevy_render", - "bevy_utils", - "bevy_window", + "bevy_reflect 0.12.0", + "bevy_render 0.12.0", + "bevy_utils 0.12.0", + "bevy_window 0.12.0", "egui", "image", "once_cell", @@ -341,9 +431,9 @@ dependencies = [ [[package]] name = "bevy-inspector-egui-derive" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a60a8d711fa10879a4e7d10127077505ba9890cead8d1f5ecedc64d14b22b6c" +checksum = "ec800b7cf98151b5dbff80f0eb6dffcb4bcfceef6e457888b395ead4eb7e75ba" dependencies = [ "proc-macro2", "quote", @@ -356,7 +446,7 @@ version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea489c1999072befdd555259cd85038b1ed46d09577ad6d2b759f81a2ef4e281" dependencies = [ - "bevy", + "bevy 0.11.3", "bevy_mod_picking", "non-empty-vec", ] @@ -367,29 +457,41 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "132c9e35a77c5395951f6d25fa2c52ee92296353426df4f961e60f3ff47e2e42" dependencies = [ - "accesskit", - "bevy_app", - "bevy_derive", - "bevy_ecs", + "accesskit 0.11.2", + "bevy_app 0.11.3", + "bevy_derive 0.11.3", + "bevy_ecs 0.11.3", +] + +[[package]] +name = "bevy_a11y" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "271b812e5734f5056a400f7d64592dd82d6c0e6179389c2f066f433ab8bc7692" +dependencies = [ + "accesskit 0.12.1", + "bevy_app 0.12.0", + "bevy_derive 0.12.0", + "bevy_ecs 0.12.0", ] [[package]] name = "bevy_animation" -version = "0.11.3" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f44eae3f1c35a87e38ad146f72317f19ce7616dad8bbdfb88ee752c1282d28c5" +checksum = "ab94187a1253433e14f175293d8a86ec1c2822fda2a17807908f11ec21f45f00" dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_core", - "bevy_ecs", - "bevy_hierarchy", - "bevy_math", - "bevy_reflect", - "bevy_render", - "bevy_time", - "bevy_transform", - "bevy_utils", + "bevy_app 0.12.0", + "bevy_asset 0.12.0", + "bevy_core 0.12.0", + "bevy_ecs 0.12.0", + "bevy_hierarchy 0.12.0", + "bevy_math 0.12.0", + "bevy_reflect 0.12.0", + "bevy_render 0.12.0", + "bevy_time 0.12.0", + "bevy_transform 0.12.0", + "bevy_utils 0.12.0", ] [[package]] @@ -398,11 +500,27 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f557a7d59e1e16892d7544fc37316506ee598cb5310ef0365125a30783c11531" dependencies = [ - "bevy_derive", - "bevy_ecs", - "bevy_reflect", - "bevy_tasks", - "bevy_utils", + "bevy_derive 0.11.3", + "bevy_ecs 0.11.3", + "bevy_reflect 0.11.3", + "bevy_tasks 0.11.3", + "bevy_utils 0.11.3", + "downcast-rs", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "bevy_app" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "172d532ea812e5954fa814dae003c207f2a0b20c6e50431787c94a7159677ece" +dependencies = [ + "bevy_derive 0.12.0", + "bevy_ecs 0.12.0", + "bevy_reflect 0.12.0", + "bevy_tasks 0.12.0", + "bevy_utils 0.12.0", "downcast-rs", "wasm-bindgen", "web-sys", @@ -416,19 +534,18 @@ checksum = "9714af523da4cdf58c42a317e5ed40349708ad954a18533991fd64c8ae0a6f68" dependencies = [ "anyhow", "async-channel", - "bevy_app", - "bevy_diagnostic", - "bevy_ecs", - "bevy_log", - "bevy_reflect", - "bevy_tasks", - "bevy_utils", - "bevy_winit", + "bevy_app 0.11.3", + "bevy_diagnostic 0.11.3", + "bevy_ecs 0.11.3", + "bevy_log 0.11.3", + "bevy_reflect 0.11.3", + "bevy_tasks 0.11.3", + "bevy_utils 0.11.3", + "bevy_winit 0.11.3", "crossbeam-channel", "downcast-rs", "fastrand 1.9.0", "js-sys", - "notify", "parking_lot", "serde", "thiserror", @@ -437,6 +554,38 @@ dependencies = [ "web-sys", ] +[[package]] +name = "bevy_asset" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccb2b67984088b23e223cfe9ec1befd89a110665a679acb06839bc4334ed37d6" +dependencies = [ + "async-broadcast", + "async-fs", + "async-lock", + "bevy_app 0.12.0", + "bevy_asset_macros", + "bevy_ecs 0.12.0", + "bevy_log 0.12.0", + "bevy_reflect 0.12.0", + "bevy_tasks 0.12.0", + "bevy_utils 0.12.0", + "bevy_winit 0.12.0", + "blake3", + "crossbeam-channel", + "downcast-rs", + "futures-io", + "futures-lite 1.13.0", + "js-sys", + "parking_lot", + "ron", + "serde", + "thiserror", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "bevy_asset_loader" version = "0.17.0" @@ -444,7 +593,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67504fe2bfe56b0c58a2e042a7f5b1dd242a9b9f28e78e3fe63e2c3d62692bea" dependencies = [ "anyhow", - "bevy", + "bevy 0.11.3", "bevy_asset_loader_derive", "path-slash", ] @@ -460,36 +609,47 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "bevy_asset_macros" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b3245193e90fc8abcf1059a467cb224501dcda083d114c67c10ac66b7171e3a" +dependencies = [ + "bevy_macro_utils 0.12.0", + "proc-macro2", + "quote", + "syn 2.0.38", +] + [[package]] name = "bevy_audio" -version = "0.11.3" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4de308bd63a2f7a0b77ffeb7cf00cc185ec01393c5db2091fe03964f97152749" +checksum = "478de80ff25cb7decbcb22797774d1597e8c32914e81431c67d64faadc08f84a" dependencies = [ - "anyhow", - "bevy_app", - "bevy_asset", - "bevy_derive", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_transform", - "bevy_utils", + "bevy_app 0.12.0", + "bevy_asset 0.12.0", + "bevy_derive 0.12.0", + "bevy_ecs 0.12.0", + "bevy_math 0.12.0", + "bevy_reflect 0.12.0", + "bevy_transform 0.12.0", + "bevy_utils 0.12.0", "oboe", - "parking_lot", "rodio", ] [[package]] name = "bevy_common_assets" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0e5659f20aeaa1703e76d87c62d66f92aaa56e431fbed71bb38345b576aa6f0" +checksum = "9397adf1558aa3f08e20aa567538a7238b451362fc8c6b678d409c040c221799" dependencies = [ "anyhow", - "bevy", + "bevy 0.12.0", "ron", "serde", + "thiserror", ] [[package]] @@ -498,12 +658,27 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d5272321be5fcf5ce2fb16023bc825bb10dfcb71611117296537181ce950f48" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_tasks", - "bevy_utils", + "bevy_app 0.11.3", + "bevy_ecs 0.11.3", + "bevy_math 0.11.3", + "bevy_reflect 0.11.3", + "bevy_tasks 0.11.3", + "bevy_utils 0.11.3", + "bytemuck", +] + +[[package]] +name = "bevy_core" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "025e6800b73048092a55c3611e9327ad4c4c17b60517ec1c0086bb40b4b19ea8" +dependencies = [ + "bevy_app 0.12.0", + "bevy_ecs 0.12.0", + "bevy_math 0.12.0", + "bevy_reflect 0.12.0", + "bevy_tasks 0.12.0", + "bevy_utils 0.12.0", "bytemuck", "serde", ] @@ -514,16 +689,38 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67382fa9c96ce4f4e5833ed7cedd9886844a8f3284b4a717bd4ac738dcdea0c3" dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_core", - "bevy_derive", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_render", - "bevy_transform", - "bevy_utils", + "bevy_app 0.11.3", + "bevy_asset 0.11.3", + "bevy_core 0.11.3", + "bevy_derive 0.11.3", + "bevy_ecs 0.11.3", + "bevy_math 0.11.3", + "bevy_reflect 0.11.3", + "bevy_render 0.11.3", + "bevy_transform 0.11.3", + "bevy_utils 0.11.3", + "bitflags 2.4.1", + "radsort", + "serde", +] + +[[package]] +name = "bevy_core_pipeline" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e4b08a2d53ba62d9ec1fca3f7f4e0f556e9f59e1c8e63a4b7c2a18c0701152c" +dependencies = [ + "bevy_app 0.12.0", + "bevy_asset 0.12.0", + "bevy_core 0.12.0", + "bevy_derive 0.12.0", + "bevy_ecs 0.12.0", + "bevy_log 0.12.0", + "bevy_math 0.12.0", + "bevy_reflect 0.12.0", + "bevy_render 0.12.0", + "bevy_transform 0.12.0", + "bevy_utils 0.12.0", "bitflags 2.4.1", "radsort", "serde", @@ -535,7 +732,18 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a44e4e2784a81430199e4157e02903a987a32127c773985506f020e7d501b62e" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.11.3", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "bevy_derive" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24bf40259be12a1a24d9fd536f5ff18d31eeb5665b77e2732899783be6edc5d6" +dependencies = [ + "bevy_macro_utils 0.12.0", "quote", "syn 2.0.38", ] @@ -546,12 +754,27 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6babb230dc383c98fdfc9603e3a7a2a49e1e2879dbe8291059ef37dca897932e" dependencies = [ - "bevy_app", - "bevy_core", - "bevy_ecs", - "bevy_log", - "bevy_time", - "bevy_utils", + "bevy_app 0.11.3", + "bevy_core 0.11.3", + "bevy_ecs 0.11.3", + "bevy_log 0.11.3", + "bevy_time 0.11.3", + "bevy_utils 0.11.3", + "sysinfo", +] + +[[package]] +name = "bevy_diagnostic" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b5a99a9fb6cd7d1eb1714fad193944a0317f0887a15cccb8309c8d37951132" +dependencies = [ + "bevy_app 0.12.0", + "bevy_core 0.12.0", + "bevy_ecs 0.12.0", + "bevy_log 0.12.0", + "bevy_time 0.12.0", + "bevy_utils 0.12.0", "sysinfo", ] @@ -562,11 +785,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "266144b36df7e834d5198049e037ecdf2a2310a76ce39ed937d1b0a6a2c4e8c6" dependencies = [ "async-channel", - "bevy_ecs_macros", - "bevy_ptr", - "bevy_reflect", - "bevy_tasks", - "bevy_utils", + "bevy_ecs_macros 0.11.3", + "bevy_ptr 0.11.3", + "bevy_reflect 0.11.3", + "bevy_tasks 0.11.3", + "bevy_utils 0.11.3", + "downcast-rs", + "event-listener", + "fixedbitset", + "rustc-hash", + "serde", + "thiserror", + "thread_local", +] + +[[package]] +name = "bevy_ecs" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae11a1f467c372b50e9d4b55e78370f5420c9db7416200cc441cc84f08174dd3" +dependencies = [ + "async-channel", + "bevy_ecs_macros 0.12.0", + "bevy_ptr 0.12.0", + "bevy_reflect 0.12.0", + "bevy_tasks 0.12.0", + "bevy_utils 0.12.0", "downcast-rs", "event-listener", "fixedbitset", @@ -582,7 +826,19 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7157a9c3be038d5008ee3f114feb6cf6b39c1d3d32ee21a7cacb8f81fccdfa80" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.11.3", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "bevy_ecs_macros" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f642c2b67c4d0daf8edf15074f6351457eb487a34b3de1290c760d8f3ac9ec16" +dependencies = [ + "bevy_macro_utils 0.12.0", "proc-macro2", "quote", "syn 2.0.38", @@ -590,12 +846,12 @@ dependencies = [ [[package]] name = "bevy_egui" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1c1f6ad293c60fd8559c4502cda5e832e92b0e0f3d994929b33f24d4352d70" +checksum = "85450af551b7e1cb766f710763b60a12a82ffd6323945a8f776c6334c59ccdc1" dependencies = [ "arboard", - "bevy", + "bevy 0.12.0", "egui", "thread_local", "webbrowser", @@ -607,7 +863,17 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0ac0f55ad6bca1be7b0f35bbd5fc95ed3d31e4e9db158fee8e5327f59006001" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.11.3", + "encase_derive_impl", +] + +[[package]] +name = "bevy_encase_derive" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65b9fb5a62c4e3ab70caaa839470d35fa932001b1b34b08bc7f7f1909bd2b3a7" +dependencies = [ + "bevy_macro_utils 0.12.0", "encase_derive_impl", ] @@ -627,7 +893,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccd344e21cb61878a24169bff3f2e0bc5584df77b06732b5223a13a96a92dfe9" dependencies = [ - "bevy", + "bevy 0.11.3", ] [[package]] @@ -644,17 +910,15 @@ dependencies = [ [[package]] name = "bevy_fluent" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34e59cfd5ebf486092bbe21501df2f60d67f8126740d90c30015a3c17a825512" +version = "0.8.0" +source = "git+https://github.com/kgv/bevy_fluent.git?branch=debug#ee9ab0fff6f412c211ff4349ab0dae09ec4ba38f" dependencies = [ - "anyhow", - "bevy", + "bevy 0.12.0", "fluent", "fluent-langneg", "fluent_content", - "globset", - "indexmap 2.0.2", + "futures-lite 2.0.1", + "indexmap 2.1.0", "intl-memoizer", "ron", "serde", @@ -667,16 +931,16 @@ dependencies = [ [[package]] name = "bevy_gilrs" -version = "0.11.3" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65f4d79c55829f8016014593a42453f61a564ffb06ef79460d25696ccdfac67b" +checksum = "ad31cc2c84315e0759d793d6c5bcb7d8789bbc16359c98d1b766e708c1bbae49" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_input", - "bevy_log", - "bevy_time", - "bevy_utils", + "bevy_app 0.12.0", + "bevy_ecs 0.12.0", + "bevy_input 0.12.0", + "bevy_log 0.12.0", + "bevy_time 0.12.0", + "bevy_utils 0.12.0", "gilrs", "thiserror", ] @@ -687,44 +951,62 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e286a3e7276431963f4aa29165ea5429fa7dbbc6d5c5ba0c531e7dd44ecc88a2" dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_core", - "bevy_core_pipeline", - "bevy_ecs", - "bevy_math", + "bevy_app 0.11.3", + "bevy_asset 0.11.3", + "bevy_core 0.11.3", + "bevy_core_pipeline 0.11.3", + "bevy_ecs 0.11.3", + "bevy_math 0.11.3", + "bevy_reflect 0.11.3", + "bevy_render 0.11.3", + "bevy_sprite 0.11.3", + "bevy_transform 0.11.3", + "bevy_utils 0.11.3", +] + +[[package]] +name = "bevy_gizmos" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87d1cc978b91f416b23eb16f00e69f95c3a04582021827d8082e92d4725cc510" +dependencies = [ + "bevy_app 0.12.0", + "bevy_asset 0.12.0", + "bevy_core 0.12.0", + "bevy_core_pipeline 0.12.0", + "bevy_ecs 0.12.0", + "bevy_math 0.12.0", "bevy_pbr", - "bevy_reflect", - "bevy_render", - "bevy_sprite", - "bevy_transform", - "bevy_utils", + "bevy_reflect 0.12.0", + "bevy_render 0.12.0", + "bevy_sprite 0.12.0", + "bevy_transform 0.12.0", + "bevy_utils 0.12.0", ] [[package]] name = "bevy_gltf" -version = "0.11.3" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f07494a733dca032e71a20f4b1f423de765da49cbff34406ae6cd813f9b50c41" +checksum = "6f933745c0c86e2c07948def581259b466f99708328657054e956275430ccfd7" dependencies = [ - "anyhow", "base64 0.13.1", "bevy_animation", - "bevy_app", - "bevy_asset", - "bevy_core", - "bevy_core_pipeline", - "bevy_ecs", - "bevy_hierarchy", - "bevy_log", - "bevy_math", + "bevy_app 0.12.0", + "bevy_asset 0.12.0", + "bevy_core 0.12.0", + "bevy_core_pipeline 0.12.0", + "bevy_ecs 0.12.0", + "bevy_hierarchy 0.12.0", + "bevy_log 0.12.0", + "bevy_math 0.12.0", "bevy_pbr", - "bevy_reflect", - "bevy_render", - "bevy_scene", - "bevy_tasks", - "bevy_transform", - "bevy_utils", + "bevy_reflect 0.12.0", + "bevy_render 0.12.0", + "bevy_scene 0.12.0", + "bevy_tasks 0.12.0", + "bevy_transform 0.12.0", + "bevy_utils 0.12.0", "gltf", "percent-encoding", "serde", @@ -738,12 +1020,27 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "103f8f58416ac6799b8c7f0b418f1fac9eba44fa924df3b0e16b09256b897e3d" dependencies = [ - "bevy_app", - "bevy_core", - "bevy_ecs", - "bevy_log", - "bevy_reflect", - "bevy_utils", + "bevy_app 0.11.3", + "bevy_core 0.11.3", + "bevy_ecs 0.11.3", + "bevy_log 0.11.3", + "bevy_reflect 0.11.3", + "bevy_utils 0.11.3", + "smallvec", +] + +[[package]] +name = "bevy_hierarchy" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64fa240011fce8ee23f9b46e5a26a628a31d7860d6d2e4e0e361bb3ea6d5a703" +dependencies = [ + "bevy_app 0.12.0", + "bevy_core 0.12.0", + "bevy_ecs 0.12.0", + "bevy_log 0.12.0", + "bevy_reflect 0.12.0", + "bevy_utils 0.12.0", "smallvec", ] @@ -753,11 +1050,25 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbd935401101ac8003f3c3aea70788c65ad03f7a32716a10608bedda7a648bc" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_utils", + "bevy_app 0.11.3", + "bevy_ecs 0.11.3", + "bevy_math 0.11.3", + "bevy_reflect 0.11.3", + "bevy_utils 0.11.3", + "thiserror", +] + +[[package]] +name = "bevy_input" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e86e241b3a10b79f65a69205552546723b855d3d4c1bd8261637c076144d32f" +dependencies = [ + "bevy_app 0.12.0", + "bevy_ecs 0.12.0", + "bevy_math 0.12.0", + "bevy_reflect 0.12.0", + "bevy_utils 0.12.0", "serde", "thiserror", ] @@ -768,37 +1079,70 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0e35a9b2bd29aa784b3cc416bcbf2a298f69f00ca51fd042ea39d9af7fad37e" dependencies = [ - "bevy_a11y", + "bevy_a11y 0.11.3", + "bevy_app 0.11.3", + "bevy_asset 0.11.3", + "bevy_core 0.11.3", + "bevy_core_pipeline 0.11.3", + "bevy_derive 0.11.3", + "bevy_diagnostic 0.11.3", + "bevy_ecs 0.11.3", + "bevy_gizmos 0.11.3", + "bevy_hierarchy 0.11.3", + "bevy_input 0.11.3", + "bevy_log 0.11.3", + "bevy_math 0.11.3", + "bevy_ptr 0.11.3", + "bevy_reflect 0.11.3", + "bevy_render 0.11.3", + "bevy_scene 0.11.3", + "bevy_sprite 0.11.3", + "bevy_tasks 0.11.3", + "bevy_text 0.11.3", + "bevy_time 0.11.3", + "bevy_transform 0.11.3", + "bevy_ui 0.11.3", + "bevy_utils 0.11.3", + "bevy_window 0.11.3", +] + +[[package]] +name = "bevy_internal" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55124e486814c4d3632d5cfad9c4f4e46d052c028593ec46fef5bfbfb0f840b1" +dependencies = [ + "bevy_a11y 0.12.0", "bevy_animation", - "bevy_app", - "bevy_asset", + "bevy_app 0.12.0", + "bevy_asset 0.12.0", "bevy_audio", - "bevy_core", - "bevy_core_pipeline", - "bevy_derive", - "bevy_diagnostic", - "bevy_ecs", + "bevy_core 0.12.0", + "bevy_core_pipeline 0.12.0", + "bevy_derive 0.12.0", + "bevy_diagnostic 0.12.0", + "bevy_ecs 0.12.0", "bevy_gilrs", - "bevy_gizmos", + "bevy_gizmos 0.12.0", "bevy_gltf", - "bevy_hierarchy", - "bevy_input", - "bevy_log", - "bevy_math", + "bevy_hierarchy 0.12.0", + "bevy_input 0.12.0", + "bevy_log 0.12.0", + "bevy_math 0.12.0", "bevy_pbr", - "bevy_ptr", - "bevy_reflect", - "bevy_render", - "bevy_scene", - "bevy_sprite", - "bevy_tasks", - "bevy_text", - "bevy_time", - "bevy_transform", - "bevy_ui", - "bevy_utils", - "bevy_window", - "bevy_winit", + "bevy_ptr 0.12.0", + "bevy_reflect 0.12.0", + "bevy_render 0.12.0", + "bevy_scene 0.12.0", + "bevy_sprite 0.12.0", + "bevy_tasks 0.12.0", + "bevy_text 0.12.0", + "bevy_time 0.12.0", + "bevy_transform 0.12.0", + "bevy_ui 0.12.0", + "bevy_utils 0.12.0", + "bevy_window 0.12.0", + "bevy_winit 0.12.0", ] [[package]] @@ -808,9 +1152,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07dcc615ff4f617b06c3f9522fca3c55d56f9644db293318f8ab68fcdea5d4fe" dependencies = [ "android_log-sys", - "bevy_app", - "bevy_ecs", - "bevy_utils", + "bevy_app 0.11.3", + "bevy_ecs 0.11.3", + "bevy_utils 0.11.3", + "console_error_panic_hook", + "tracing-log", + "tracing-subscriber", + "tracing-wasm", +] + +[[package]] +name = "bevy_log" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "011417debf7868b45932bb97fc0d5bfdeaf9304e324aa94840e2f1e6deeed69d" +dependencies = [ + "android_log-sys", + "bevy_app 0.12.0", + "bevy_ecs 0.12.0", + "bevy_utils 0.12.0", "console_error_panic_hook", "tracing-log", "tracing-subscriber", @@ -826,24 +1186,56 @@ dependencies = [ "quote", "rustc-hash", "syn 2.0.38", - "toml_edit", + "toml_edit 0.19.15", +] + +[[package]] +name = "bevy_macro_utils" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf6fba87c6d069fcbcd8a48625ca8ab4392ad40d2b260863ce7d641a0f42986d" +dependencies = [ + "proc-macro2", + "quote", + "rustc-hash", + "syn 2.0.38", + "toml_edit 0.20.7", +] + +[[package]] +name = "bevy_math" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78286a81fead796dc4b45ab14f4f02fe29a94423d3587bcfef872b2a8e0a474b" +dependencies = [ + "glam", + "serde", +] + +[[package]] +name = "bevy_math" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "752764558a1f429c20704c3b836a019fa308961c43fdfef4f08e339d456c96be" +dependencies = [ + "glam", + "serde", ] [[package]] -name = "bevy_math" +name = "bevy_mikktspace" version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78286a81fead796dc4b45ab14f4f02fe29a94423d3587bcfef872b2a8e0a474b" +checksum = "6cfc2a21ea47970a9b1f0f4735af3256a8f204815bd756110051d10f9d909497" dependencies = [ "glam", - "serde", ] [[package]] name = "bevy_mikktspace" -version = "0.11.3" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cfc2a21ea47970a9b1f0f4735af3256a8f204815bd756110051d10f9d909497" +checksum = "b596c41a56f2268ec7cde560edc588bc7b5886e4b49c8b27c4dcc9f7c743424c" dependencies = [ "glam", ] @@ -854,7 +1246,7 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ce0837727f451ec62dad98a7bd35a8ff929e5a148bb0044122aba02683c09df" dependencies = [ - "bevy", + "bevy 0.11.3", "bevy_eventlistener", "bevy_picking_core", "bevy_picking_input", @@ -863,25 +1255,28 @@ dependencies = [ [[package]] name = "bevy_pbr" -version = "0.11.3" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63ca796a619e61cd43a0a3b11fde54644f7f0732a1fba1eef5d406248c6eba85" -dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_core_pipeline", - "bevy_derive", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_render", - "bevy_transform", - "bevy_utils", - "bevy_window", +checksum = "eeb6a35a78d355cc21c10f277dcd171eca65e30a90e76eb89f4dacf606621fe1" +dependencies = [ + "bevy_app 0.12.0", + "bevy_asset 0.12.0", + "bevy_core_pipeline 0.12.0", + "bevy_derive 0.12.0", + "bevy_ecs 0.12.0", + "bevy_math 0.12.0", + "bevy_reflect 0.12.0", + "bevy_render 0.12.0", + "bevy_transform 0.12.0", + "bevy_utils 0.12.0", + "bevy_window 0.12.0", "bitflags 2.4.1", "bytemuck", - "naga_oil", + "fixedbitset", + "naga_oil 0.10.0", "radsort", + "smallvec", + "thread_local", ] [[package]] @@ -890,7 +1285,7 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37b10f159071accb3f17f86b70a2cafed27f96a828f155721d8f82706d5a65af" dependencies = [ - "bevy", + "bevy 0.11.3", "bevy_eventlistener", ] @@ -900,7 +1295,7 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1cc165dccadf85856cd713f1dabf5c845c7b6fd56e2c901a53f69f3693c5149" dependencies = [ - "bevy", + "bevy 0.11.3", "bevy_picking_core", ] @@ -910,7 +1305,7 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1533a7723939a1dfad933da76a4cfb0d37eb15abd64519c0db2477f04de1ee8b" dependencies = [ - "bevy", + "bevy 0.11.3", "bevy_picking_core", ] @@ -920,13 +1315,19 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72c7586401a46f7d8e436028225c1df5288f2e0082d066b247a82466fea155c6" +[[package]] +name = "bevy_ptr" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "308a02679f6ce21ef71de20fae6d6a2016c07baa21d8e8d0558e6b7851e8adf2" + [[package]] name = "bevy_rapier2d" version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e8ffc72387774ca14a98c8c820a32d9d9f37b33c4c862362e89cbfde1620bfa" dependencies = [ - "bevy", + "bevy 0.11.3", "bitflags 1.3.2", "log", "nalgebra", @@ -939,10 +1340,10 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0778197a1eb3e095a71417c74b7152ede02975cdc95b5ea4ddc5251ed00a2eb5" dependencies = [ - "bevy_math", - "bevy_ptr", - "bevy_reflect_derive", - "bevy_utils", + "bevy_math 0.11.3", + "bevy_ptr 0.11.3", + "bevy_reflect_derive 0.11.3", + "bevy_utils 0.11.3", "downcast-rs", "erased-serde", "glam", @@ -954,13 +1355,32 @@ dependencies = [ "thiserror", ] +[[package]] +name = "bevy_reflect" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdd56914a8ad57621d7a1a099f7e6b1f7482c9c76cedc9c3d4c175a203939c5d" +dependencies = [ + "bevy_math 0.12.0", + "bevy_ptr 0.12.0", + "bevy_reflect_derive 0.12.0", + "bevy_utils 0.12.0", + "downcast-rs", + "erased-serde", + "glam", + "serde", + "smallvec", + "smol_str", + "thiserror", +] + [[package]] name = "bevy_reflect_derive" version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "342a4b2d09db22c48607d23ad59a056aff1ee004549050a51d490d375ba29528" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.11.3", "bit-set", "proc-macro2", "quote", @@ -968,6 +1388,19 @@ dependencies = [ "uuid", ] +[[package]] +name = "bevy_reflect_derive" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25f627907c40ac552f798423447fc331fc1ddacd94c5f7a2a70942eb06bc8447" +dependencies = [ + "bevy_macro_utils 0.12.0", + "proc-macro2", + "quote", + "syn 2.0.38", + "uuid", +] + [[package]] name = "bevy_render" version = "0.11.3" @@ -976,37 +1409,82 @@ checksum = "39df4824b760928c27afc7b00fb649c7a63c9d76661ab014ff5c86537ee906cb" dependencies = [ "anyhow", "async-channel", - "bevy_app", - "bevy_asset", - "bevy_core", - "bevy_derive", - "bevy_ecs", - "bevy_encase_derive", - "bevy_hierarchy", - "bevy_log", - "bevy_math", - "bevy_mikktspace", - "bevy_reflect", - "bevy_render_macros", - "bevy_tasks", - "bevy_time", - "bevy_transform", - "bevy_utils", - "bevy_window", + "bevy_app 0.11.3", + "bevy_asset 0.11.3", + "bevy_core 0.11.3", + "bevy_derive 0.11.3", + "bevy_ecs 0.11.3", + "bevy_encase_derive 0.11.3", + "bevy_hierarchy 0.11.3", + "bevy_log 0.11.3", + "bevy_math 0.11.3", + "bevy_mikktspace 0.11.3", + "bevy_reflect 0.11.3", + "bevy_render_macros 0.11.3", + "bevy_tasks 0.11.3", + "bevy_time 0.11.3", + "bevy_transform 0.11.3", + "bevy_utils 0.11.3", + "bevy_window 0.11.3", "bitflags 2.4.1", "bytemuck", "codespan-reporting", "downcast-rs", "encase", - "futures-lite", + "futures-lite 1.13.0", "hexasphere", "image", "js-sys", - "ktx2", - "naga", - "naga_oil", + "naga 0.12.3", + "naga_oil 0.8.2", "parking_lot", "regex", + "serde", + "smallvec", + "thiserror", + "thread_local", + "wasm-bindgen", + "web-sys", + "wgpu 0.16.3", + "wgpu-hal 0.16.2", +] + +[[package]] +name = "bevy_render" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90d777f4c51bd58e9e40777c6cb8dde0778df7e2c5298b3f9e3455bd12a9856c" +dependencies = [ + "async-channel", + "bevy_app 0.12.0", + "bevy_asset 0.12.0", + "bevy_core 0.12.0", + "bevy_derive 0.12.0", + "bevy_ecs 0.12.0", + "bevy_encase_derive 0.12.0", + "bevy_hierarchy 0.12.0", + "bevy_log 0.12.0", + "bevy_math 0.12.0", + "bevy_mikktspace 0.12.0", + "bevy_reflect 0.12.0", + "bevy_render_macros 0.12.0", + "bevy_tasks 0.12.0", + "bevy_time 0.12.0", + "bevy_transform 0.12.0", + "bevy_utils 0.12.0", + "bevy_window 0.12.0", + "bitflags 2.4.1", + "bytemuck", + "codespan-reporting", + "downcast-rs", + "encase", + "futures-lite 1.13.0", + "hexasphere", + "image", + "js-sys", + "ktx2", + "naga 0.13.0", + "naga_oil 0.10.0", "ruzstd", "serde", "smallvec", @@ -1014,8 +1492,7 @@ dependencies = [ "thread_local", "wasm-bindgen", "web-sys", - "wgpu", - "wgpu-hal", + "wgpu 0.17.1", ] [[package]] @@ -1024,7 +1501,19 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bd08c740aac73363e32fb45af869b10cec65bcb76fe3e6cd0f8f7eebf4c36c9" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.11.3", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "bevy_render_macros" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35b00c3d0abff94a729460fc9aa95c2ceac71b49b3041166bb5ba3098e9657e7" +dependencies = [ + "bevy_macro_utils 0.12.0", "proc-macro2", "quote", "syn 2.0.38", @@ -1037,15 +1526,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd47e1263506153bef3a8be97fe2d856f206d315668c4f97510ca6cc181d9681" dependencies = [ "anyhow", - "bevy_app", - "bevy_asset", - "bevy_derive", - "bevy_ecs", - "bevy_hierarchy", - "bevy_reflect", - "bevy_render", - "bevy_transform", - "bevy_utils", + "bevy_app 0.11.3", + "bevy_asset 0.11.3", + "bevy_derive 0.11.3", + "bevy_ecs 0.11.3", + "bevy_hierarchy 0.11.3", + "bevy_reflect 0.11.3", + "bevy_render 0.11.3", + "bevy_transform 0.11.3", + "bevy_utils 0.11.3", + "ron", + "serde", + "thiserror", + "uuid", +] + +[[package]] +name = "bevy_scene" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba6294396a6375f0b14341d8003408c10aa040e3f833ac8bd49677170ec55d73" +dependencies = [ + "bevy_app 0.12.0", + "bevy_asset 0.12.0", + "bevy_derive 0.12.0", + "bevy_ecs 0.12.0", + "bevy_hierarchy 0.12.0", + "bevy_reflect 0.12.0", + "bevy_render 0.12.0", + "bevy_transform 0.12.0", + "bevy_utils 0.12.0", "ron", "serde", "thiserror", @@ -1054,11 +1564,11 @@ dependencies = [ [[package]] name = "bevy_spatial" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d7afe191bc2344f113d2159c2ebb7bdc673413e877036d5bdf40374bd252205" +checksum = "56e846c2c81c0f82e098b5b3b0b25e74b6f110e87930008ed7359a20c47d832a" dependencies = [ - "bevy", + "bevy 0.12.0", "kd-tree", "num-traits", "typenum", @@ -1070,21 +1580,47 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68a8ca824fad75c6ef74cfbbba0a4ce3ccc435fa23d6bf3f003f260548813397" dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_core_pipeline", - "bevy_derive", - "bevy_ecs", - "bevy_log", - "bevy_math", - "bevy_reflect", - "bevy_render", - "bevy_transform", - "bevy_utils", + "bevy_app 0.11.3", + "bevy_asset 0.11.3", + "bevy_core_pipeline 0.11.3", + "bevy_derive 0.11.3", + "bevy_ecs 0.11.3", + "bevy_log 0.11.3", + "bevy_math 0.11.3", + "bevy_reflect 0.11.3", + "bevy_render 0.11.3", + "bevy_transform 0.11.3", + "bevy_utils 0.11.3", + "bitflags 2.4.1", + "bytemuck", + "fixedbitset", + "guillotiere", + "rectangle-pack", + "thiserror", +] + +[[package]] +name = "bevy_sprite" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4f7d1f88a6e5497fdafd95c20984a1d1b5517bc39d51600b4988cd60c51837a" +dependencies = [ + "bevy_app 0.12.0", + "bevy_asset 0.12.0", + "bevy_core_pipeline 0.12.0", + "bevy_derive 0.12.0", + "bevy_ecs 0.12.0", + "bevy_log 0.12.0", + "bevy_math 0.12.0", + "bevy_reflect 0.12.0", + "bevy_render 0.12.0", + "bevy_transform 0.12.0", + "bevy_utils 0.12.0", "bitflags 2.4.1", "bytemuck", "fixedbitset", "guillotiere", + "radsort", "rectangle-pack", "thiserror", ] @@ -1099,7 +1635,21 @@ dependencies = [ "async-executor", "async-task", "concurrent-queue", - "futures-lite", + "futures-lite 1.13.0", + "wasm-bindgen-futures", +] + +[[package]] +name = "bevy_tasks" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a45be906618192515bc613e46546150089adbb4a82178dc462045acd1e89e92" +dependencies = [ + "async-channel", + "async-executor", + "async-task", + "concurrent-queue", + "futures-lite 1.13.0", "wasm-bindgen-futures", ] @@ -1111,16 +1661,38 @@ checksum = "692288ab7b0a9f8b38058964c52789fc6bcb63703b23de51cce90ec41bfca355" dependencies = [ "ab_glyph", "anyhow", - "bevy_app", - "bevy_asset", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_render", - "bevy_sprite", - "bevy_transform", - "bevy_utils", - "bevy_window", + "bevy_app 0.11.3", + "bevy_asset 0.11.3", + "bevy_ecs 0.11.3", + "bevy_math 0.11.3", + "bevy_reflect 0.11.3", + "bevy_render 0.11.3", + "bevy_sprite 0.11.3", + "bevy_transform 0.11.3", + "bevy_utils 0.11.3", + "bevy_window 0.11.3", + "glyph_brush_layout", + "serde", + "thiserror", +] + +[[package]] +name = "bevy_text" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c136af700af4f87c94f68d6e019528c371bf09ebf4a8ff7468bb3c73806b34f5" +dependencies = [ + "ab_glyph", + "bevy_app 0.12.0", + "bevy_asset 0.12.0", + "bevy_ecs 0.12.0", + "bevy_math 0.12.0", + "bevy_reflect 0.12.0", + "bevy_render 0.12.0", + "bevy_sprite 0.12.0", + "bevy_transform 0.12.0", + "bevy_utils 0.12.0", + "bevy_window 0.12.0", "glyph_brush_layout", "serde", "thiserror", @@ -1131,7 +1703,7 @@ name = "bevy_tiling_background" version = "0.10.0" source = "git+https://github.com/rparrett/bevy_tiling_background.git?branch=tex-typo#87c3046a21d128c9963c04a7cd646113e24af4f8" dependencies = [ - "bevy", + "bevy 0.11.3", ] [[package]] @@ -1140,10 +1712,24 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d58d6dbae9c8225d8c0e0f04d2c5dbb71d22adc01ecd5ab3cebc364139e4a6d" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_reflect", - "bevy_utils", + "bevy_app 0.11.3", + "bevy_ecs 0.11.3", + "bevy_reflect 0.11.3", + "bevy_utils 0.11.3", + "crossbeam-channel", + "thiserror", +] + +[[package]] +name = "bevy_time" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b29709cadf22d318a0b7c79f763e9c5ac414292bd0e850066fa935959021b276" +dependencies = [ + "bevy_app 0.12.0", + "bevy_ecs 0.12.0", + "bevy_reflect 0.12.0", + "bevy_utils 0.12.0", "crossbeam-channel", "serde", "thiserror", @@ -1155,12 +1741,26 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b9b0ac0149a57cd846cb357a35fc99286f9848e53d4481954608ac9552ed2d4" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_hierarchy", - "bevy_math", - "bevy_reflect", + "bevy_app 0.11.3", + "bevy_ecs 0.11.3", + "bevy_hierarchy 0.11.3", + "bevy_math 0.11.3", + "bevy_reflect 0.11.3", +] + +[[package]] +name = "bevy_transform" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70262c51e915b6224129206d23823364e650cf5eb5f4b6ce3ee379f608c180d2" +dependencies = [ + "bevy_app 0.12.0", + "bevy_ecs 0.12.0", + "bevy_hierarchy 0.12.0", + "bevy_math 0.12.0", + "bevy_reflect 0.12.0", "serde", + "thiserror", ] [[package]] @@ -1169,23 +1769,53 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59b6d295a755e5b79e869a09e087029d72974562a521ec7ccfba7141fa948a32" dependencies = [ - "bevy_a11y", - "bevy_app", - "bevy_asset", - "bevy_core_pipeline", - "bevy_derive", - "bevy_ecs", - "bevy_hierarchy", - "bevy_input", - "bevy_log", - "bevy_math", - "bevy_reflect", - "bevy_render", - "bevy_sprite", - "bevy_text", - "bevy_transform", - "bevy_utils", - "bevy_window", + "bevy_a11y 0.11.3", + "bevy_app 0.11.3", + "bevy_asset 0.11.3", + "bevy_core_pipeline 0.11.3", + "bevy_derive 0.11.3", + "bevy_ecs 0.11.3", + "bevy_hierarchy 0.11.3", + "bevy_input 0.11.3", + "bevy_log 0.11.3", + "bevy_math 0.11.3", + "bevy_reflect 0.11.3", + "bevy_render 0.11.3", + "bevy_sprite 0.11.3", + "bevy_text 0.11.3", + "bevy_transform 0.11.3", + "bevy_utils 0.11.3", + "bevy_window 0.11.3", + "bytemuck", + "serde", + "smallvec", + "taffy", + "thiserror", +] + +[[package]] +name = "bevy_ui" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd5ecbf2dceaab118769dd870e34d780bfde556af561fd10d8d613b0f237297e" +dependencies = [ + "bevy_a11y 0.12.0", + "bevy_app 0.12.0", + "bevy_asset 0.12.0", + "bevy_core_pipeline 0.12.0", + "bevy_derive 0.12.0", + "bevy_ecs 0.12.0", + "bevy_hierarchy 0.12.0", + "bevy_input 0.12.0", + "bevy_log 0.12.0", + "bevy_math 0.12.0", + "bevy_reflect 0.12.0", + "bevy_render 0.12.0", + "bevy_sprite 0.12.0", + "bevy_text 0.12.0", + "bevy_transform 0.12.0", + "bevy_utils 0.12.0", + "bevy_window 0.12.0", "bytemuck", "serde", "smallvec", @@ -1200,10 +1830,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d9484e32434ea84dc548cff246ce0c6f756c1336f5ea03f24ac120a48595c7" dependencies = [ "ahash", - "bevy_utils_proc_macros", + "bevy_utils_proc_macros 0.11.3", + "getrandom", + "hashbrown 0.14.2", + "instant", + "petgraph", + "thiserror", + "tracing", + "uuid", +] + +[[package]] +name = "bevy_utils" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8e75d4a34ef0b15dffd1ee9079ef1f0f5139527e192b9d5708b3e158777c753" +dependencies = [ + "ahash", + "bevy_utils_proc_macros 0.12.0", "getrandom", "hashbrown 0.14.2", "instant", + "nonmax", "petgraph", "thiserror", "tracing", @@ -1221,18 +1869,45 @@ dependencies = [ "syn 2.0.38", ] +[[package]] +name = "bevy_utils_proc_macros" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7dfd3735a61a1b681ed1e176afe4eae731bbb03e51ad871e9eb39e76a2d170e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + [[package]] name = "bevy_window" version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd584c0da7c4ada6557b09f57f30fb7cff21ccedc641473fc391574b4c9b7944" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_input", - "bevy_math", - "bevy_reflect", - "bevy_utils", + "bevy_app 0.11.3", + "bevy_ecs 0.11.3", + "bevy_input 0.11.3", + "bevy_math 0.11.3", + "bevy_reflect 0.11.3", + "bevy_utils 0.11.3", + "raw-window-handle", +] + +[[package]] +name = "bevy_window" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e60d1830b3fbd7db5bfea7ac9fcd0f5e1d1af88c91ab469e697ab176d8b3140b" +dependencies = [ + "bevy_a11y 0.12.0", + "bevy_app 0.12.0", + "bevy_ecs 0.12.0", + "bevy_input 0.12.0", + "bevy_math 0.12.0", + "bevy_reflect 0.12.0", + "bevy_utils 0.12.0", "raw-window-handle", "serde", ] @@ -1243,18 +1918,43 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfdc044abdb95790c20053e6326760f0a2985f0dcd78613d397bf35f16039d53" dependencies = [ - "accesskit_winit", + "accesskit_winit 0.14.4", + "approx", + "bevy_a11y 0.11.3", + "bevy_app 0.11.3", + "bevy_derive 0.11.3", + "bevy_ecs 0.11.3", + "bevy_hierarchy 0.11.3", + "bevy_input 0.11.3", + "bevy_math 0.11.3", + "bevy_tasks 0.11.3", + "bevy_utils 0.11.3", + "bevy_window 0.11.3", + "crossbeam-channel", + "raw-window-handle", + "wasm-bindgen", + "web-sys", + "winit", +] + +[[package]] +name = "bevy_winit" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f8294e78c6a1f9c34d36501a377c5d20bf0fa23a0958187bb270187741448ba" +dependencies = [ + "accesskit_winit 0.15.0", "approx", - "bevy_a11y", - "bevy_app", - "bevy_derive", - "bevy_ecs", - "bevy_hierarchy", - "bevy_input", - "bevy_math", - "bevy_tasks", - "bevy_utils", - "bevy_window", + "bevy_a11y 0.12.0", + "bevy_app 0.12.0", + "bevy_derive 0.12.0", + "bevy_ecs 0.12.0", + "bevy_hierarchy 0.12.0", + "bevy_input 0.12.0", + "bevy_math 0.12.0", + "bevy_tasks 0.12.0", + "bevy_utils 0.12.0", + "bevy_window 0.12.0", "crossbeam-channel", "raw-window-handle", "wasm-bindgen", @@ -1318,6 +2018,19 @@ dependencies = [ "serde", ] +[[package]] +name = "blake3" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", +] + [[package]] name = "block" version = "0.1.6" @@ -1344,13 +2057,19 @@ dependencies = [ ] [[package]] -name = "bstr" -version = "1.7.0" +name = "blocking" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" +checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" dependencies = [ - "memchr", - "serde", + "async-channel", + "async-lock", + "async-task", + "fastrand 2.0.1", + "futures-io", + "futures-lite 1.13.0", + "piper", + "tracing", ] [[package]] @@ -1527,6 +2246,12 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87ca1caa64ef4ed453e68bb3db612e51cf1b2f5b871337f0fcab1c8f87cc3dff" +[[package]] +name = "constant_time_eq" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" + [[package]] name = "constgebra" version = "0.1.3" @@ -1561,7 +2286,7 @@ dependencies = [ "bitflags 1.3.2", "core-foundation", "core-graphics-types", - "foreign-types", + "foreign-types 0.3.2", "libc", ] @@ -1714,6 +2439,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "d3d12" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20" +dependencies = [ + "bitflags 2.4.1", + "libloading 0.8.1", + "winapi", +] + [[package]] name = "dasp_sample" version = "0.11.0" @@ -1931,18 +2667,6 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "filetime" -version = "0.2.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", -] - [[package]] name = "fixedbitset" version = "0.4.2" @@ -2036,9 +2760,30 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" name = "foreign-types" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ - "foreign-types-shared", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] @@ -2047,6 +2792,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + [[package]] name = "form_urlencoded" version = "1.2.0" @@ -2056,15 +2807,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "fsevent-sys" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" -dependencies = [ - "libc", -] - [[package]] name = "futures-core" version = "0.3.28" @@ -2092,6 +2834,20 @@ dependencies = [ "waker-fn", ] +[[package]] +name = "futures-lite" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" +dependencies = [ + "fastrand 2.0.1", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", +] + [[package]] name = "gethostname" version = "0.2.3" @@ -2180,19 +2936,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" -[[package]] -name = "globset" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" -dependencies = [ - "aho-corasick", - "bstr", - "fnv", - "log", - "regex", -] - [[package]] name = "glow" version = "0.12.3" @@ -2258,7 +3001,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62" dependencies = [ "bitflags 1.3.2", - "gpu-alloc-types", + "gpu-alloc-types 0.2.0", +] + +[[package]] +name = "gpu-alloc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" +dependencies = [ + "bitflags 2.4.1", + "gpu-alloc-types 0.3.0", ] [[package]] @@ -2270,6 +3023,15 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "gpu-alloc-types" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" +dependencies = [ + "bitflags 2.4.1", +] + [[package]] name = "gpu-allocator" version = "0.22.0" @@ -2426,9 +3188,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", "hashbrown 0.14.2", @@ -2441,26 +3203,6 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a" -[[package]] -name = "inotify" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" -dependencies = [ - "bitflags 1.3.2", - "inotify-sys", - "libc", -] - -[[package]] -name = "inotify-sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" -dependencies = [ - "libc", -] - [[package]] name = "instant" version = "0.1.12" @@ -2619,26 +3361,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "kqueue" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" -dependencies = [ - "kqueue-sys", - "libc", -] - -[[package]] -name = "kqueue-sys" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" -dependencies = [ - "bitflags 1.3.2", - "libc", -] - [[package]] name = "ktx2" version = "0.3.0" @@ -2662,11 +3384,11 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "leafwing-input-manager" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b56a6f71e8f5beefc8d3841ffa6ea9bbb1123956fa7c75fd673e69b65a8ca62f" +checksum = "5f5730f7b7b516b7ede475443aca506769e7527b576975133d97d6d912ece4d2" dependencies = [ - "bevy", + "bevy 0.12.0", "derive_more", "fixedbitset", "itertools", @@ -2678,14 +3400,14 @@ dependencies = [ [[package]] name = "leafwing_input_manager_macros" -version = "0.9.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11aefabfcc9ef0a78bc97eea053d2f1bb050d5278a4134bdc1b769064a90064a" +checksum = "cde8ae98d45607e4015d0b772d4a234788ebd7a41f09879f408c7f772b81e5bf" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] @@ -2842,9 +3564,24 @@ dependencies = [ "bitflags 1.3.2", "block", "core-graphics-types", - "foreign-types", + "foreign-types 0.3.2", + "log", + "objc", +] + +[[package]] +name = "metal" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "623b5e6cefd76e58f774bd3cc0c6f5c7615c58c03a97815245a25c3c9bdee318" +dependencies = [ + "bitflags 2.4.1", + "block", + "core-graphics-types", + "foreign-types 0.5.0", "log", "objc", + "paste", ] [[package]] @@ -2896,6 +3633,27 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "naga" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ceaaa4eedaece7e4ec08c55c640ba03dbb73fb812a6570a59bcf1930d0f70e" +dependencies = [ + "bit-set", + "bitflags 2.4.1", + "codespan-reporting", + "hexf-parse", + "indexmap 1.9.3", + "log", + "num-traits", + "pp-rs", + "rustc-hash", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", +] + [[package]] name = "naga_oil" version = "0.8.2" @@ -2906,7 +3664,7 @@ dependencies = [ "codespan-reporting", "data-encoding", "indexmap 1.9.3", - "naga", + "naga 0.12.3", "once_cell", "regex", "regex-syntax 0.6.29", @@ -2916,6 +3674,26 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "naga_oil" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1fa9518ff79ae8a98c3abe3897d873a85561d1b5642981c2245c1c4b9b2429d" +dependencies = [ + "bit-set", + "codespan-reporting", + "data-encoding", + "indexmap 1.9.3", + "naga 0.13.0", + "once_cell", + "regex", + "regex-syntax 0.7.5", + "rustc-hash", + "thiserror", + "tracing", + "unicode-ident", +] + [[package]] name = "nalgebra" version = "0.32.3" @@ -3032,23 +3810,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ceeba69aa8d4c53cdceeac8f17eb2656bb88b468bbe6c0889d34edfdea26ec8b" [[package]] -name = "notify" -version = "6.1.1" +name = "nonmax" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" -dependencies = [ - "bitflags 2.4.1", - "crossbeam-channel", - "filetime", - "fsevent-sys", - "inotify", - "kqueue", - "libc", - "log", - "mio", - "walkdir", - "windows-sys 0.48.0", -] +checksum = "99756f5493e135528f0cd660ac67b4c3a542bb65a3565efe92bb2c2317eb3669" [[package]] name = "ntapi" @@ -3144,7 +3909,7 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -3156,7 +3921,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 2.0.38", @@ -3400,7 +4165,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.0.2", + "indexmap 2.1.0", ] [[package]] @@ -3418,6 +4183,17 @@ version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + [[package]] name = "pkg-config" version = "0.3.27" @@ -3465,7 +4241,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +dependencies = [ + "toml_edit 0.20.7", ] [[package]] @@ -3663,6 +4448,12 @@ version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +[[package]] +name = "regex-syntax" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" + [[package]] name = "regex-syntax" version = "0.8.2" @@ -3818,7 +4609,7 @@ version = "0.9.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.1.0", "itoa", "ryu", "serde", @@ -4144,9 +4935,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" [[package]] name = "toml_edit" @@ -4154,7 +4945,18 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.1.0", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.1.0", "toml_datetime", "winnow", ] @@ -4383,7 +5185,7 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" name = "verse" version = "0.0.22" dependencies = [ - "bevy", + "bevy 0.12.0", "bevy-inspector-egui", "bevy-ui-navigation", "bevy_asset_loader", @@ -4613,7 +5415,31 @@ dependencies = [ "cfg-if", "js-sys", "log", - "naga", + "naga 0.12.3", + "parking_lot", + "profiling", + "raw-window-handle", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core 0.16.1", + "wgpu-hal 0.16.2", + "wgpu-types 0.16.1", +] + +[[package]] +name = "wgpu" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed547920565c56c7a29afb4538ac5ae5048865a5d2f05bff3ad4fbeb921a9a2c" +dependencies = [ + "arrayvec", + "cfg-if", + "js-sys", + "log", + "naga 0.13.0", "parking_lot", "profiling", "raw-window-handle", @@ -4622,9 +5448,9 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "wgpu-core", - "wgpu-hal", - "wgpu-types", + "wgpu-core 0.17.1", + "wgpu-hal 0.17.2", + "wgpu-types 0.17.0", ] [[package]] @@ -4638,7 +5464,30 @@ dependencies = [ "bitflags 2.4.1", "codespan-reporting", "log", - "naga", + "naga 0.12.3", + "parking_lot", + "profiling", + "raw-window-handle", + "rustc-hash", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal 0.16.2", + "wgpu-types 0.16.1", +] + +[[package]] +name = "wgpu-core" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f8a44dd301a30ceeed3c27d8c0090433d3da04d7b2a4042738095a424d12ae7" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.4.1", + "codespan-reporting", + "log", + "naga 0.13.0", "parking_lot", "profiling", "raw-window-handle", @@ -4646,8 +5495,8 @@ dependencies = [ "smallvec", "thiserror", "web-sys", - "wgpu-hal", - "wgpu-types", + "wgpu-hal 0.17.2", + "wgpu-types 0.17.0", ] [[package]] @@ -4663,10 +5512,51 @@ dependencies = [ "bitflags 2.4.1", "block", "core-graphics-types", - "d3d12", - "foreign-types", + "d3d12 0.6.0", + "foreign-types 0.3.2", + "glow", + "gpu-alloc 0.5.4", + "gpu-allocator", + "gpu-descriptor", + "hassle-rs", + "js-sys", + "khronos-egl", + "libc", + "libloading 0.8.1", + "log", + "metal 0.24.0", + "naga 0.12.3", + "objc", + "parking_lot", + "profiling", + "range-alloc", + "raw-window-handle", + "renderdoc-sys", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types 0.16.1", + "winapi", +] + +[[package]] +name = "wgpu-hal" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a80bf0e3c77399bb52850cb0830af9bad073d5cfcb9dd8253bef8125c42db17" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.4.1", + "block", + "core-graphics-types", + "d3d12 0.7.0", "glow", - "gpu-alloc", + "gpu-alloc 0.6.0", "gpu-allocator", "gpu-descriptor", "hassle-rs", @@ -4675,8 +5565,8 @@ dependencies = [ "libc", "libloading 0.8.1", "log", - "metal", - "naga", + "metal 0.26.0", + "naga 0.13.0", "objc", "parking_lot", "profiling", @@ -4688,7 +5578,7 @@ dependencies = [ "thiserror", "wasm-bindgen", "web-sys", - "wgpu-types", + "wgpu-types 0.17.0", "winapi", ] @@ -4703,6 +5593,17 @@ dependencies = [ "web-sys", ] +[[package]] +name = "wgpu-types" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee64d7398d0c2f9ca48922c902ef69c42d000c759f3db41e355f4a570b052b67" +dependencies = [ + "bitflags 2.4.1", + "js-sys", + "web-sys", +] + [[package]] name = "wide" version = "0.7.13" diff --git a/Cargo.toml b/Cargo.toml index fcb7f00..b4247ed 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,18 +6,18 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -bevy = "0.11.3" -bevy-inspector-egui = "0.20.0" +bevy = "0.12.0" +bevy-inspector-egui = "0.21.0" bevy-ui-navigation = "0.32.0" bevy_asset_loader = { version = "0.17.0", features = ["2d"] } -bevy_common_assets = { version = "0.7.0", features = ["ron"] } -bevy_fluent = "0.7.0" +bevy_common_assets = { version = "0.8.0", features = ["ron"] } +bevy_fluent = { git = "https://github.com/kgv/bevy_fluent.git", branch = "debug" } # Temporary Bevy 0.12 patch; TODO: Update bevy_rapier2d = "0.22.0" -bevy_spatial = "0.6.0" +bevy_spatial = "0.7.0" bevy_tiling_background = { git = "https://github.com/rparrett/bevy_tiling_background.git", branch = "tex-typo" } fluent_content = "0.0.5" image = "0.24.7" -leafwing-input-manager = "0.10.0" +leafwing-input-manager = "0.11.1" rand = "0.8.5" regex = "1.10.2" ron = "0.8.1" From 6b14c201d90ca4d5bb958b745626fe9f8401f4c7 Mon Sep 17 00:00:00 2001 From: Thom Bruce Date: Wed, 8 Nov 2023 01:26:06 +0000 Subject: [PATCH 02/13] add temporary upgrades to git branches --- Cargo.lock | 125 +++++++++++++++++++++++++++-------------------------- Cargo.toml | 6 +-- 2 files changed, 66 insertions(+), 65 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6a353e3..1f8ea2d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -442,11 +442,10 @@ dependencies = [ [[package]] name = "bevy-ui-navigation" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea489c1999072befdd555259cd85038b1ed46d09577ad6d2b759f81a2ef4e281" +version = "0.33.0" +source = "git+https://github.com/TristanCacqueray/ui-navigation.git?branch=bevy-0.12#a0edef86568b914d1bff30f84c518898c351c323" dependencies = [ - "bevy 0.11.3", + "bevy 0.12.0", "bevy_mod_picking", "non-empty-vec", ] @@ -589,11 +588,10 @@ dependencies = [ [[package]] name = "bevy_asset_loader" version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67504fe2bfe56b0c58a2e042a7f5b1dd242a9b9f28e78e3fe63e2c3d62692bea" +source = "git+https://github.com/NiklasEi/bevy_asset_loader.git?branch=bevy_main#ea40892df808b8ca3aabb99d0c09fc31ee8390dc" dependencies = [ "anyhow", - "bevy 0.11.3", + "bevy 0.12.0", "bevy_asset_loader_derive", "path-slash", ] @@ -601,12 +599,11 @@ dependencies = [ [[package]] name = "bevy_asset_loader_derive" version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf0d73cdac61fd6f9cb4df9c936ffe6d1343a63470c91c6a6823e1664d298fcb" +source = "git+https://github.com/NiklasEi/bevy_asset_loader.git?branch=bevy_main#ea40892df808b8ca3aabb99d0c09fc31ee8390dc" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] @@ -879,9 +876,9 @@ dependencies = [ [[package]] name = "bevy_eventlistener" -version = "0.3.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233f729a5a2c7182f89b17c5d603cd604d095ee68d22c81b29be3cd30324f77d" +checksum = "0b089d6bee5e75b1bc2793752ce94c461d4ce581281c15ca44cbd84bb7794073" dependencies = [ "bevy_eventlistener_core", "bevy_eventlistener_derive", @@ -889,20 +886,22 @@ dependencies = [ [[package]] name = "bevy_eventlistener_core" -version = "0.3.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccd344e21cb61878a24169bff3f2e0bc5584df77b06732b5223a13a96a92dfe9" +checksum = "f4c94b227693f271fd7dad522214f1a371c7856d88cedb6473d4c945e8169103" dependencies = [ - "bevy 0.11.3", + "bevy_app 0.11.3", + "bevy_ecs 0.11.3", + "bevy_hierarchy 0.11.3", + "bevy_utils 0.11.3", ] [[package]] name = "bevy_eventlistener_derive" -version = "0.3.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "407110082f2a861eb198c254226aa4a24c239fcff235f2aec41b0b0db5e8937f" +checksum = "3b88fc692e14d483c9aedd74958d1a39f5adbc6f94d97d87a2b330e27fa6a616" dependencies = [ - "bevy_eventlistener_core", "proc-macro2", "quote", "syn 2.0.38", @@ -1098,10 +1097,8 @@ dependencies = [ "bevy_scene 0.11.3", "bevy_sprite 0.11.3", "bevy_tasks 0.11.3", - "bevy_text 0.11.3", "bevy_time 0.11.3", "bevy_transform 0.11.3", - "bevy_ui 0.11.3", "bevy_utils 0.11.3", "bevy_window 0.11.3", ] @@ -1136,7 +1133,7 @@ dependencies = [ "bevy_scene 0.12.0", "bevy_sprite 0.12.0", "bevy_tasks 0.12.0", - "bevy_text 0.12.0", + "bevy_text", "bevy_time 0.12.0", "bevy_transform 0.12.0", "bevy_ui 0.12.0", @@ -1242,15 +1239,23 @@ dependencies = [ [[package]] name = "bevy_mod_picking" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce0837727f451ec62dad98a7bd35a8ff929e5a148bb0044122aba02683c09df" +checksum = "aebb845900d5da6314f261cb982079266840820032fa29679341a5a901e2c5b9" dependencies = [ - "bevy 0.11.3", + "bevy_app 0.11.3", + "bevy_core 0.11.3", + "bevy_ecs 0.11.3", "bevy_eventlistener", + "bevy_math 0.11.3", "bevy_picking_core", "bevy_picking_input", "bevy_picking_ui", + "bevy_reflect 0.11.3", + "bevy_render 0.11.3", + "bevy_ui 0.11.3", + "bevy_utils 0.11.3", + "bevy_window 0.11.3", ] [[package]] @@ -1281,32 +1286,53 @@ dependencies = [ [[package]] name = "bevy_picking_core" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b10f159071accb3f17f86b70a2cafed27f96a828f155721d8f82706d5a65af" +checksum = "fa8194c5c1baf84c4a377223ece3cb7514fc8b9736c0c758efbc188898d19b27" dependencies = [ - "bevy 0.11.3", + "bevy_app 0.11.3", + "bevy_derive 0.11.3", + "bevy_ecs 0.11.3", "bevy_eventlistener", + "bevy_math 0.11.3", + "bevy_reflect 0.11.3", + "bevy_render 0.11.3", + "bevy_utils 0.11.3", + "bevy_window 0.11.3", ] [[package]] name = "bevy_picking_input" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc165dccadf85856cd713f1dabf5c845c7b6fd56e2c901a53f69f3693c5149" +checksum = "71676712915c8ade223e58bccce29556977f497381497149de435358389d4b5e" dependencies = [ - "bevy 0.11.3", + "bevy_app 0.11.3", + "bevy_ecs 0.11.3", + "bevy_hierarchy 0.11.3", + "bevy_input 0.11.3", + "bevy_math 0.11.3", "bevy_picking_core", + "bevy_reflect 0.11.3", + "bevy_render 0.11.3", + "bevy_utils 0.11.3", + "bevy_window 0.11.3", ] [[package]] name = "bevy_picking_ui" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1533a7723939a1dfad933da76a4cfb0d37eb15abd64519c0db2477f04de1ee8b" +checksum = "093df7c568d357edde0b8c114cae35ca985ac5666a2ddea23977883108829393" dependencies = [ - "bevy 0.11.3", + "bevy_app 0.11.3", + "bevy_ecs 0.11.3", + "bevy_math 0.11.3", "bevy_picking_core", + "bevy_render 0.11.3", + "bevy_transform 0.11.3", + "bevy_ui 0.11.3", + "bevy_window 0.11.3", ] [[package]] @@ -1324,11 +1350,10 @@ checksum = "308a02679f6ce21ef71de20fae6d6a2016c07baa21d8e8d0558e6b7851e8adf2" [[package]] name = "bevy_rapier2d" version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8ffc72387774ca14a98c8c820a32d9d9f37b33c4c862362e89cbfde1620bfa" +source = "git+https://github.com/devil-ira/bevy_rapier.git?branch=bevy-0.12#aa4aa2c046221a237a8fb7a7e635f116e36b3ab3" dependencies = [ - "bevy 0.11.3", - "bitflags 1.3.2", + "bevy 0.12.0", + "bitflags 2.4.1", "log", "nalgebra", "rapier2d", @@ -1653,29 +1678,6 @@ dependencies = [ "wasm-bindgen-futures", ] -[[package]] -name = "bevy_text" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692288ab7b0a9f8b38058964c52789fc6bcb63703b23de51cce90ec41bfca355" -dependencies = [ - "ab_glyph", - "anyhow", - "bevy_app 0.11.3", - "bevy_asset 0.11.3", - "bevy_ecs 0.11.3", - "bevy_math 0.11.3", - "bevy_reflect 0.11.3", - "bevy_render 0.11.3", - "bevy_sprite 0.11.3", - "bevy_transform 0.11.3", - "bevy_utils 0.11.3", - "bevy_window 0.11.3", - "glyph_brush_layout", - "serde", - "thiserror", -] - [[package]] name = "bevy_text" version = "0.12.0" @@ -1782,7 +1784,6 @@ dependencies = [ "bevy_reflect 0.11.3", "bevy_render 0.11.3", "bevy_sprite 0.11.3", - "bevy_text 0.11.3", "bevy_transform 0.11.3", "bevy_utils 0.11.3", "bevy_window 0.11.3", @@ -1812,7 +1813,7 @@ dependencies = [ "bevy_reflect 0.12.0", "bevy_render 0.12.0", "bevy_sprite 0.12.0", - "bevy_text 0.12.0", + "bevy_text", "bevy_transform 0.12.0", "bevy_utils 0.12.0", "bevy_window 0.12.0", diff --git a/Cargo.toml b/Cargo.toml index b4247ed..c738396 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,11 +8,11 @@ edition = "2021" [dependencies] bevy = "0.12.0" bevy-inspector-egui = "0.21.0" -bevy-ui-navigation = "0.32.0" -bevy_asset_loader = { version = "0.17.0", features = ["2d"] } +bevy-ui-navigation = { git = "https://github.com/TristanCacqueray/ui-navigation.git", branch = "bevy-0.12" } # Temporary Bevy 0.12 patch; TODO: Update +bevy_asset_loader = { git = "https://github.com/NiklasEi/bevy_asset_loader.git", branch = "bevy_main", features = ["2d"] } # Temporary Bevy 0.12 patch; TODO: Update bevy_common_assets = { version = "0.8.0", features = ["ron"] } bevy_fluent = { git = "https://github.com/kgv/bevy_fluent.git", branch = "debug" } # Temporary Bevy 0.12 patch; TODO: Update -bevy_rapier2d = "0.22.0" +bevy_rapier2d = { git = "https://github.com/devil-ira/bevy_rapier.git", branch = "bevy-0.12" } # Temporary Bevy 0.12 patch; TODO: Update bevy_spatial = "0.7.0" bevy_tiling_background = { git = "https://github.com/rparrett/bevy_tiling_background.git", branch = "tex-typo" } fluent_content = "0.0.5" From 017673365e2f8f7321d978e1c6246d8e2a4fe2e0 Mon Sep 17 00:00:00 2001 From: Thom Bruce Date: Wed, 8 Nov 2023 01:42:55 +0000 Subject: [PATCH 03/13] use cargo.toml patch key --- Cargo.toml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c738396..c67583a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,11 +8,11 @@ edition = "2021" [dependencies] bevy = "0.12.0" bevy-inspector-egui = "0.21.0" -bevy-ui-navigation = { git = "https://github.com/TristanCacqueray/ui-navigation.git", branch = "bevy-0.12" } # Temporary Bevy 0.12 patch; TODO: Update -bevy_asset_loader = { git = "https://github.com/NiklasEi/bevy_asset_loader.git", branch = "bevy_main", features = ["2d"] } # Temporary Bevy 0.12 patch; TODO: Update +bevy-ui-navigation = "0.33.0" # Temporary Bevy 0.12 patch; TODO: Update +bevy_asset_loader = { version = "0.17.0", features = ["2d"] } bevy_common_assets = { version = "0.8.0", features = ["ron"] } -bevy_fluent = { git = "https://github.com/kgv/bevy_fluent.git", branch = "debug" } # Temporary Bevy 0.12 patch; TODO: Update -bevy_rapier2d = { git = "https://github.com/devil-ira/bevy_rapier.git", branch = "bevy-0.12" } # Temporary Bevy 0.12 patch; TODO: Update +bevy_fluent = "0.8.0" +bevy_rapier2d = "0.22.0" # Temporary Bevy 0.12 patch; TODO: Update bevy_spatial = "0.7.0" bevy_tiling_background = { git = "https://github.com/rparrett/bevy_tiling_background.git", branch = "tex-typo" } fluent_content = "0.0.5" @@ -25,6 +25,14 @@ serde = "1.0.190" unic-langid = { version = "0.9.1", features = ["macros"] } winit = "0.28.7" +# Override dependencies to patched versions +[patch.crates-io] +bevy-ui-navigation = { git = "https://github.com/TristanCacqueray/ui-navigation.git", branch = "bevy-0.12" } # Temporary Bevy 0.12 patch; TODO: Update +bevy_asset_loader = { git = "https://github.com/NiklasEi/bevy_asset_loader.git", branch = "bevy_main" } # Temporary Bevy 0.12 patch; TODO: Update +bevy_fluent = { git = "https://github.com/kgv/bevy_fluent.git", branch = "debug" } # Temporary Bevy 0.12 patch; TODO: Update +bevy_rapier2d = { git = "https://github.com/devil-ira/bevy_rapier.git", branch = "bevy-0.12" } # Temporary Bevy 0.12 patch; TODO: Update +bevy_tiling_background = { git = "https://github.com/rparrett/bevy_tiling_background.git", branch = "tex-typo" } + # Enable a small amount of optimization in debug mode [profile.dev] opt-level = 1 From 2abc9d5483f997b9f327ad6936226747ccec1e94 Mon Sep 17 00:00:00 2001 From: Thom Bruce Date: Wed, 8 Nov 2023 02:12:07 +0000 Subject: [PATCH 04/13] code migrations --- Cargo.lock | 108 ++++++++++++++++++-------------------- Cargo.toml | 4 +- src/core/effects/blink.rs | 2 +- src/i18n/mod.rs | 2 +- src/ui/hud/indicator.rs | 4 +- src/ui/menus/credits.rs | 2 +- 6 files changed, 59 insertions(+), 63 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1f8ea2d..3ff3cb6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -442,10 +442,11 @@ dependencies = [ [[package]] name = "bevy-ui-navigation" -version = "0.33.0" -source = "git+https://github.com/TristanCacqueray/ui-navigation.git?branch=bevy-0.12#a0edef86568b914d1bff30f84c518898c351c323" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea489c1999072befdd555259cd85038b1ed46d09577ad6d2b759f81a2ef4e281" dependencies = [ - "bevy 0.12.0", + "bevy 0.11.3", "bevy_mod_picking", "non-empty-vec", ] @@ -876,9 +877,9 @@ dependencies = [ [[package]] name = "bevy_eventlistener" -version = "0.5.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b089d6bee5e75b1bc2793752ce94c461d4ce581281c15ca44cbd84bb7794073" +checksum = "233f729a5a2c7182f89b17c5d603cd604d095ee68d22c81b29be3cd30324f77d" dependencies = [ "bevy_eventlistener_core", "bevy_eventlistener_derive", @@ -886,22 +887,20 @@ dependencies = [ [[package]] name = "bevy_eventlistener_core" -version = "0.5.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c94b227693f271fd7dad522214f1a371c7856d88cedb6473d4c945e8169103" +checksum = "ccd344e21cb61878a24169bff3f2e0bc5584df77b06732b5223a13a96a92dfe9" dependencies = [ - "bevy_app 0.11.3", - "bevy_ecs 0.11.3", - "bevy_hierarchy 0.11.3", - "bevy_utils 0.11.3", + "bevy 0.11.3", ] [[package]] name = "bevy_eventlistener_derive" -version = "0.5.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b88fc692e14d483c9aedd74958d1a39f5adbc6f94d97d87a2b330e27fa6a616" +checksum = "407110082f2a861eb198c254226aa4a24c239fcff235f2aec41b0b0db5e8937f" dependencies = [ + "bevy_eventlistener_core", "proc-macro2", "quote", "syn 2.0.38", @@ -1097,8 +1096,10 @@ dependencies = [ "bevy_scene 0.11.3", "bevy_sprite 0.11.3", "bevy_tasks 0.11.3", + "bevy_text 0.11.3", "bevy_time 0.11.3", "bevy_transform 0.11.3", + "bevy_ui 0.11.3", "bevy_utils 0.11.3", "bevy_window 0.11.3", ] @@ -1133,7 +1134,7 @@ dependencies = [ "bevy_scene 0.12.0", "bevy_sprite 0.12.0", "bevy_tasks 0.12.0", - "bevy_text", + "bevy_text 0.12.0", "bevy_time 0.12.0", "bevy_transform 0.12.0", "bevy_ui 0.12.0", @@ -1239,23 +1240,15 @@ dependencies = [ [[package]] name = "bevy_mod_picking" -version = "0.16.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aebb845900d5da6314f261cb982079266840820032fa29679341a5a901e2c5b9" +checksum = "9ce0837727f451ec62dad98a7bd35a8ff929e5a148bb0044122aba02683c09df" dependencies = [ - "bevy_app 0.11.3", - "bevy_core 0.11.3", - "bevy_ecs 0.11.3", + "bevy 0.11.3", "bevy_eventlistener", - "bevy_math 0.11.3", "bevy_picking_core", "bevy_picking_input", "bevy_picking_ui", - "bevy_reflect 0.11.3", - "bevy_render 0.11.3", - "bevy_ui 0.11.3", - "bevy_utils 0.11.3", - "bevy_window 0.11.3", ] [[package]] @@ -1286,53 +1279,32 @@ dependencies = [ [[package]] name = "bevy_picking_core" -version = "0.16.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa8194c5c1baf84c4a377223ece3cb7514fc8b9736c0c758efbc188898d19b27" +checksum = "37b10f159071accb3f17f86b70a2cafed27f96a828f155721d8f82706d5a65af" dependencies = [ - "bevy_app 0.11.3", - "bevy_derive 0.11.3", - "bevy_ecs 0.11.3", + "bevy 0.11.3", "bevy_eventlistener", - "bevy_math 0.11.3", - "bevy_reflect 0.11.3", - "bevy_render 0.11.3", - "bevy_utils 0.11.3", - "bevy_window 0.11.3", ] [[package]] name = "bevy_picking_input" -version = "0.16.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71676712915c8ade223e58bccce29556977f497381497149de435358389d4b5e" +checksum = "c1cc165dccadf85856cd713f1dabf5c845c7b6fd56e2c901a53f69f3693c5149" dependencies = [ - "bevy_app 0.11.3", - "bevy_ecs 0.11.3", - "bevy_hierarchy 0.11.3", - "bevy_input 0.11.3", - "bevy_math 0.11.3", + "bevy 0.11.3", "bevy_picking_core", - "bevy_reflect 0.11.3", - "bevy_render 0.11.3", - "bevy_utils 0.11.3", - "bevy_window 0.11.3", ] [[package]] name = "bevy_picking_ui" -version = "0.16.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "093df7c568d357edde0b8c114cae35ca985ac5666a2ddea23977883108829393" +checksum = "1533a7723939a1dfad933da76a4cfb0d37eb15abd64519c0db2477f04de1ee8b" dependencies = [ - "bevy_app 0.11.3", - "bevy_ecs 0.11.3", - "bevy_math 0.11.3", + "bevy 0.11.3", "bevy_picking_core", - "bevy_render 0.11.3", - "bevy_transform 0.11.3", - "bevy_ui 0.11.3", - "bevy_window 0.11.3", ] [[package]] @@ -1678,6 +1650,29 @@ dependencies = [ "wasm-bindgen-futures", ] +[[package]] +name = "bevy_text" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "692288ab7b0a9f8b38058964c52789fc6bcb63703b23de51cce90ec41bfca355" +dependencies = [ + "ab_glyph", + "anyhow", + "bevy_app 0.11.3", + "bevy_asset 0.11.3", + "bevy_ecs 0.11.3", + "bevy_math 0.11.3", + "bevy_reflect 0.11.3", + "bevy_render 0.11.3", + "bevy_sprite 0.11.3", + "bevy_transform 0.11.3", + "bevy_utils 0.11.3", + "bevy_window 0.11.3", + "glyph_brush_layout", + "serde", + "thiserror", +] + [[package]] name = "bevy_text" version = "0.12.0" @@ -1784,6 +1779,7 @@ dependencies = [ "bevy_reflect 0.11.3", "bevy_render 0.11.3", "bevy_sprite 0.11.3", + "bevy_text 0.11.3", "bevy_transform 0.11.3", "bevy_utils 0.11.3", "bevy_window 0.11.3", @@ -1813,7 +1809,7 @@ dependencies = [ "bevy_reflect 0.12.0", "bevy_render 0.12.0", "bevy_sprite 0.12.0", - "bevy_text", + "bevy_text 0.12.0", "bevy_transform 0.12.0", "bevy_utils 0.12.0", "bevy_window 0.12.0", diff --git a/Cargo.toml b/Cargo.toml index c67583a..edc26ed 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" [dependencies] bevy = "0.12.0" bevy-inspector-egui = "0.21.0" -bevy-ui-navigation = "0.33.0" # Temporary Bevy 0.12 patch; TODO: Update +bevy-ui-navigation = "0.32.0" bevy_asset_loader = { version = "0.17.0", features = ["2d"] } bevy_common_assets = { version = "0.8.0", features = ["ron"] } bevy_fluent = "0.8.0" @@ -27,7 +27,7 @@ winit = "0.28.7" # Override dependencies to patched versions [patch.crates-io] -bevy-ui-navigation = { git = "https://github.com/TristanCacqueray/ui-navigation.git", branch = "bevy-0.12" } # Temporary Bevy 0.12 patch; TODO: Update +# bevy-ui-navigation = { git = "https://github.com/TristanCacqueray/ui-navigation.git", branch = "bevy-0.12" } # Temporary Bevy 0.12 patch; TODO: Update bevy_asset_loader = { git = "https://github.com/NiklasEi/bevy_asset_loader.git", branch = "bevy_main" } # Temporary Bevy 0.12 patch; TODO: Update bevy_fluent = { git = "https://github.com/kgv/bevy_fluent.git", branch = "debug" } # Temporary Bevy 0.12 patch; TODO: Update bevy_rapier2d = { git = "https://github.com/devil-ira/bevy_rapier.git", branch = "bevy-0.12" } # Temporary Bevy 0.12 patch; TODO: Update diff --git a/src/core/effects/blink.rs b/src/core/effects/blink.rs index 16471ef..9110f0d 100644 --- a/src/core/effects/blink.rs +++ b/src/core/effects/blink.rs @@ -6,7 +6,7 @@ pub struct DrawBlinkTimer(pub Timer); pub(crate) fn menu_blink_system( mut commands: Commands, time: Res