From e46b0151f2f4bb697a302dbfd3834864ba6f9cfc Mon Sep 17 00:00:00 2001 From: Jan Hohenheim Date: Sun, 28 Jan 2024 22:19:30 +0100 Subject: [PATCH] Clean up deps a bit --- Cargo.lock | 130 ++++++++++++++++++++++++++++++++++++++--------------- Cargo.toml | 26 ++--------- 2 files changed, 99 insertions(+), 57 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3746aa99..fc10ef81 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -651,6 +651,24 @@ dependencies = [ "syn 2.0.48", ] +[[package]] +name = "bevy_audio" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18a69889e1bfa4dbac4e641536b94f91c441da55796ad9832e77836b8264688b" +dependencies = [ + "bevy_app 0.12.1", + "bevy_asset 0.12.1", + "bevy_derive 0.12.1", + "bevy_ecs 0.12.1", + "bevy_math 0.12.1", + "bevy_reflect 0.12.1", + "bevy_transform 0.12.1", + "bevy_utils 0.12.1", + "oboe", + "rodio", +] + [[package]] name = "bevy_common_assets" version = "0.9.0" @@ -900,7 +918,7 @@ dependencies = [ "bevy 0.12.1", "bevy-inspector-egui", "egui_dock", - "indexmap 2.1.0", + "indexmap 2.2.0", ] [[package]] @@ -914,7 +932,7 @@ dependencies = [ "bevy_editor_pls_core", "bevy_mod_debugdump", "egui-gizmo", - "indexmap 2.1.0", + "indexmap 2.2.0", "opener", "pretty-type-name", ] @@ -1156,6 +1174,7 @@ dependencies = [ "bevy_animation", "bevy_app 0.12.1", "bevy_asset 0.12.1", + "bevy_audio", "bevy_core 0.12.1", "bevy_core_pipeline 0.12.1", "bevy_derive 0.12.1", @@ -2055,7 +2074,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" dependencies = [ "memchr", - "regex-automata 0.4.4", + "regex-automata 0.4.5", "serde", ] @@ -2067,9 +2086,9 @@ checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "ed2490600f404f2b94c167e31d3ed1d5f3c225a0f3b80230053b3e0b7b962bd9" dependencies = [ "bytemuck_derive", ] @@ -2136,9 +2155,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "chrono" -version = "0.4.32" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41daef31d7a747c5c847246f36de49ced6f7403b4cdabc807a97b5cc184cda7a" +checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb" dependencies = [ "android-tzdata", "iana-time-zone", @@ -2806,7 +2825,7 @@ dependencies = [ "embed-resource", "glob", "image", - "indexmap 2.1.0", + "indexmap 2.2.0", "iyes_progress", "leafwing-input-manager", "oxidized_navigation", @@ -3230,9 +3249,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "cf2a4f498956c7723dc280afc6a37d0dec50b39a29e232c6187ce4503703e8c2" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -3290,9 +3309,9 @@ dependencies = [ [[package]] name = "inventory" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8573b2b1fb643a372c73b23f4da5f888677feef3305146d68a539250a9bccc7" +checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767" [[package]] name = "io-kit-sys" @@ -3499,6 +3518,17 @@ dependencies = [ "syn 2.0.48", ] +[[package]] +name = "lewton" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030" +dependencies = [ + "byteorder", + "ogg", + "tinyvec", +] + [[package]] name = "libc" version = "0.2.152" @@ -3970,6 +4000,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "num-derive" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "num-integer" version = "0.1.45" @@ -4126,7 +4167,7 @@ dependencies = [ "jni 0.20.0", "ndk", "ndk-context", - "num-derive", + "num-derive 0.3.3", "num-traits", "oboe-sys", ] @@ -4140,6 +4181,15 @@ dependencies = [ "cc", ] +[[package]] +name = "ogg" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e" +dependencies = [ + "byteorder", +] + [[package]] name = "once_cell" version = "1.19.0" @@ -4225,9 +4275,9 @@ dependencies = [ [[package]] name = "parry3d" -version = "0.13.5" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55dc0e6db79bddbc5fd583569f7356cdcc63e1e9b2b93a9ab70dd8e717160e0" +checksum = "13d0bdaf533851feec5cba9af11cefcc753ecefba05f758cf6abe886086bc3f5" dependencies = [ "approx", "arrayvec", @@ -4235,7 +4285,7 @@ dependencies = [ "downcast-rs", "either", "nalgebra", - "num-derive", + "num-derive 0.4.1", "num-traits", "rustc-hash", "serde", @@ -4276,7 +4326,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.1.0", + "indexmap 2.2.0", ] [[package]] @@ -4482,7 +4532,7 @@ dependencies = [ "crossbeam", "downcast-rs", "nalgebra", - "num-derive", + "num-derive 0.3.3", "num-traits", "parry3d", "rayon", @@ -4556,7 +4606,7 @@ checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.4", + "regex-automata 0.4.5", "regex-syntax 0.8.2", ] @@ -4571,9 +4621,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", @@ -4619,6 +4669,16 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbf4a6aa5f6d6888f39e980649f3ad6b666acdce1d78e95b8a2cb076e687ae30" +[[package]] +name = "rodio" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b1bb7b48ee48471f55da122c0044fcc7600cfcc85db88240b89cb832935e611" +dependencies = [ + "cpal", + "lewton", +] + [[package]] name = "ron" version = "0.8.1" @@ -4722,18 +4782,18 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.195" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.195" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", @@ -4742,9 +4802,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.111" +version = "1.0.112" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +checksum = "4d1bd37ce2324cf3bf85e5a25f96eb4baf0d5aa6eba43e7ae8958870c4ec48ed" dependencies = [ "itoa", "ryu", @@ -4875,15 +4935,15 @@ checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" [[package]] name = "strum" -version = "0.25.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f" [[package]] name = "strum_macros" -version = "0.25.3" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" dependencies = [ "heck", "proc-macro2", @@ -5129,7 +5189,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.0", "toml_datetime", "winnow", ] @@ -5140,7 +5200,7 @@ version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.0", "serde", "serde_spanned", "toml_datetime", @@ -6094,9 +6154,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.5.34" +version = "0.5.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" +checksum = "1931d78a9c73861da0134f453bb1f790ce49b2e30eba8410b4b79bac72b46a2d" dependencies = [ "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index 88a7a153..db7a7a75 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,8 +28,8 @@ bevy_common_assets = { version = "0.9", features = ["ron", "toml"] } bevy_egui = "0.24" serde = { version = "1", features = ["derive"] } indexmap = { version = "2", features = ["serde"] } -strum = "0.25" -strum_macros = "0.25" +strum = "0.26" +strum_macros = "0.26" ron = "0.8" regex = "1" chrono = "0.4" @@ -42,11 +42,12 @@ anyhow = "1" # Activate the egui feature when https://github.com/Leafwing-Studios/leafwing-input-manager/pull/442 lands leafwing-input-manager = { version = "0.11", features = [] } warbler_grass = "0.4" -rand = { version = "0.8", features = ["small_rng", "nightly"] } +rand = { version = "0.8", features = ["small_rng"] } bevy_dolly = "0.0.2" spew = "0.4" bevy_mod_sysfail = "5" seldom_fn_plugin = "0.5" +# https://github.com/TheGrimsey/oxidized_navigation/pull/21 bevy_rapier3d = { version = "0.23", features = [ "serde-serialize", "simd-stable", "parallel" ] } bevy_editor_pls = { version = "0.7", optional = true } bevy_hanabi = "0.9" @@ -59,30 +60,11 @@ image = { version = "0.24", default-features = false } [dependencies.bevy] version = "0.12" -default-features = false features = [ - "animation", - "bevy_asset", - "bevy_scene", - "bevy_winit", - "bevy_core_pipeline", - "bevy_pbr", - "bevy_gltf", - "bevy_render", - "bevy_sprite", - "bevy_text", - "bevy_ui", - "png", "jpeg", - "hdr", - "zstd", - "x11", - "ktx2", - "tonemapping_luts", "serialize", "dynamic_linking", "file_watcher", - "multi-threaded", ] [build-dependencies]