From de3019e92b6d14def7e8bd535fed9085d605ce19 Mon Sep 17 00:00:00 2001 From: Josiah Glosson Date: Fri, 2 May 2025 04:51:17 -0500 Subject: [PATCH] Theseus build updates (#3588) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add launcher_feature_version to Profile * Misc fixes - Add typing to theme and settings stuff - Push instance route on creation from installing a modpack - Fixed servers not reloading properly when first added * Make old instances scan the logs folder for joined servers on launcher startup * Create AttachedWorldData * Change AttachedWorldData interface * Rename WorldType::World to WorldType::Singleplayer * Implement world display status system * Fix Minecraft font * Fix set_world_display_status Tauri error * Add 'Play instance' option * Add option to disable worlds showing in Home * Fixes - Fix available server filter only showing if there are some available - Fixed server and singleplayer filters sometimes showing when there are only servers or singleplayer worlds - Fixed new worlds not being automatically added when detected - Rephrased Jump back into worlds option description * Fixed sometimes more than 6 items showing up in Jump back in * Fix servers.dat issue with instances you haven't played before * Update a bunch of app dependencies in non-breaking ways * Update dependencies in app-lib that had breaking updates * Update dependencies in app that had breaking updates * Fix too large of bulk requests being made, limit max to 800 #3430 * Also update tauri-plugin-opener * Update app-lib to Rust 2024 * Non-breaking updates in ariadne * Breaking updates in ariadne * Ariadne Rust 2024 * Add hiding from home page, add types to Mods.vue * Make recent worlds go into grid when display is huge * Fix lint * Remove redundant media query * Fix protocol version on home page, and home page being blocked by pinging servers * Clippy fix in app-lib * Clippy fix in app * Clippy fix * More Clippy fixes * Fix Prettier lints * Undo `from_string` changes * Update macos dependencies * Apply updates to app-playground as well * Update Wry + Tauri * Update sysinfo * Update theseus_gui to Rust 2024 * Downgrade rand in ariadne to fix labrinth Labrinth can't use rand 0.9 due to argon2 * Cargo format --------- Signed-off-by: Josiah Glosson Co-authored-by: Prospector Co-authored-by: Prospector <6166773+Prospector@users.noreply.github.com> Co-authored-by: Alejandro González --- Cargo.lock | 2062 ++++++++++------- Cargo.toml | 2 +- apps/app-playground/Cargo.toml | 4 +- apps/app/Cargo.toml | 16 +- apps/app/src/api/utils.rs | 4 +- apps/app/src/api/worlds.rs | 2 +- apps/app/src/macos/window_ext.rs | 8 +- apps/app/src/main.rs | 27 +- packages/app-lib/Cargo.toml | 22 +- packages/app-lib/src/api/handler.rs | 2 +- packages/app-lib/src/api/jre.rs | 2 +- packages/app-lib/src/api/logs.rs | 2 +- packages/app-lib/src/api/metadata.rs | 2 +- packages/app-lib/src/api/minecraft_auth.rs | 2 +- packages/app-lib/src/api/mod.rs | 6 +- .../app-lib/src/api/pack/import/atlauncher.rs | 2 +- .../app-lib/src/api/pack/import/curseforge.rs | 2 +- .../app-lib/src/api/pack/import/gdlauncher.rs | 2 +- packages/app-lib/src/api/pack/import/mmc.rs | 4 +- packages/app-lib/src/api/pack/import/mod.rs | 10 +- packages/app-lib/src/api/pack/install_from.rs | 2 +- .../app-lib/src/api/pack/install_mrpack.rs | 12 +- packages/app-lib/src/api/process.rs | 2 +- packages/app-lib/src/api/profile/create.rs | 6 +- packages/app-lib/src/api/profile/mod.rs | 8 +- packages/app-lib/src/api/profile/update.rs | 16 +- packages/app-lib/src/api/settings.rs | 2 +- packages/app-lib/src/api/tags.rs | 2 +- packages/app-lib/src/api/worlds.rs | 6 +- packages/app-lib/src/event/emit.rs | 2 +- packages/app-lib/src/launcher/download.rs | 2 +- packages/app-lib/src/launcher/mod.rs | 8 +- packages/app-lib/src/lib.rs | 4 +- packages/app-lib/src/state/cache.rs | 4 +- packages/app-lib/src/state/dirs.rs | 2 +- packages/app-lib/src/state/discord.rs | 6 +- packages/app-lib/src/state/friends.rs | 22 +- packages/app-lib/src/state/fs_watcher.rs | 6 +- .../app-lib/src/state/legacy_converter.rs | 10 +- packages/app-lib/src/state/minecraft_auth.rs | 10 +- packages/app-lib/src/state/mod.rs | 4 +- packages/app-lib/src/state/mr_auth.rs | 2 +- packages/app-lib/src/state/process.rs | 7 +- packages/app-lib/src/state/profiles.rs | 4 +- packages/app-lib/src/state/tunnel.rs | 2 +- packages/app-lib/src/util/fetch.rs | 2 +- packages/app-lib/src/util/jre.rs | 2 +- packages/app-lib/src/util/server_ping.rs | 2 +- packages/ariadne/Cargo.toml | 4 +- packages/ariadne/src/ids.rs | 2 +- 50 files changed, 1355 insertions(+), 991 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4ffbb15bd..5ba81ef48 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,7 +8,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f7b0a21988c1bf877cf4759ef5ddaac04c1c9fe808c9142ecb78ba97d97a28a" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "bytes", "futures-core", "futures-sink", @@ -44,7 +44,7 @@ dependencies = [ "actix-service", "actix-utils", "actix-web", - "bitflags 2.6.0", + "bitflags 2.9.0", "bytes", "derive_more", "futures-core", @@ -69,7 +69,7 @@ dependencies = [ "actix-utils", "ahash 0.8.11", "base64 0.22.1", - "bitflags 2.6.0", + "bitflags 2.9.0", "brotli 6.0.0", "bytes", "bytestring", @@ -182,7 +182,7 @@ dependencies = [ "actix-utils", "futures-core", "futures-util", - "mio 1.0.2", + "mio", "socket2", "tokio", "tracing", @@ -345,7 +345,7 @@ dependencies = [ "getrandom 0.2.15", "once_cell", "version_check", - "zerocopy 0.7.35", + "zerocopy", ] [[package]] @@ -450,9 +450,9 @@ checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "arbitrary" -version = "1.3.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223" dependencies = [ "derive_arbitrary", ] @@ -487,8 +487,8 @@ dependencies = [ "serde_bytes", "serde_cbor", "serde_json", - "thiserror 1.0.64", - "uuid 1.12.0", + "thiserror 2.0.12", + "uuid 1.16.0", ] [[package]] @@ -521,7 +521,7 @@ dependencies = [ "wayland-backend", "wayland-client", "wayland-protocols", - "zbus 5.1.1", + "zbus", ] [[package]] @@ -566,7 +566,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" dependencies = [ "brotli 6.0.0", - "bzip2", + "bzip2 0.4.4", "deflate64", "flate2", "futures-core", @@ -720,10 +720,10 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_qs 0.10.1", - "sha2 0.10.8", + "sha2 0.10.9", "smart-default", "smol_str", - "thiserror 1.0.64", + "thiserror 1.0.69", "tokio", "uuid 0.8.2", ] @@ -747,11 +747,14 @@ dependencies = [ [[package]] name = "async-tungstenite" -version = "0.27.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5359381fd414fbdb272c48f2111c16cb0bb3447bfacd59311ff3736da9f6664" +checksum = "ef0f7efedeac57d9b26170f72965ecfd31473ca52ca7a64e925b0b6f5f079886" dependencies = [ + "atomic-waker", + "futures-core", "futures-io", + "futures-task", "futures-util", "log", "pin-project-lite", @@ -770,7 +773,7 @@ checksum = "37672978ae0febce7516ae0a85b53e6185159a9a28787391eb63fc44ec36037d" dependencies = [ "async-fs", "futures-lite 2.3.0", - "thiserror 2.0.7", + "thiserror 2.0.12", ] [[package]] @@ -784,7 +787,7 @@ dependencies = [ "crc32fast", "futures-lite 2.3.0", "pin-project", - "thiserror 1.0.64", + "thiserror 1.0.69", "tokio", "tokio-util", ] @@ -862,7 +865,7 @@ dependencies = [ "quick-xml 0.26.0", "rust-ini 0.18.0", "serde", - "thiserror 1.0.64", + "thiserror 1.0.69", "time", "url", ] @@ -873,7 +876,7 @@ version = "0.25.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9aed3f9c7eac9be28662fdb3b0f4d1951e812f7c64fed4f0327ba702f459b3b" dependencies = [ - "thiserror 1.0.64", + "thiserror 1.0.69", ] [[package]] @@ -932,7 +935,7 @@ dependencies = [ "addr2line", "cfg-if", "libc", - "miniz_oxide 0.8.0", + "miniz_oxide 0.8.8", "object", "rustc-demangle", "windows-targets 0.52.6", @@ -1012,9 +1015,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" dependencies = [ "serde", ] @@ -1064,13 +1067,41 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" +dependencies = [ + "objc-sys", +] + +[[package]] +name = "block2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e58aa60e59d8dbfcc36138f5f18be5f24394d33b38b24f7fd0b1caa33095f22f" +dependencies = [ + "block-sys", + "objc2 0.5.2", +] + [[package]] name = "block2" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" dependencies = [ - "objc2", + "objc2 0.5.2", +] + +[[package]] +name = "block2" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "340d2f0bdb2a43c1d3cd40513185b2bd7def0aa1052f956455114bc98f82dcf2" +dependencies = [ + "objc2 0.6.1", ] [[package]] @@ -1155,9 +1186,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.16.0" +version = "3.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" [[package]] name = "bytecheck" @@ -1201,9 +1232,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.7.2" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" +checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" dependencies = [ "serde", ] @@ -1228,13 +1259,21 @@ dependencies = [ ] [[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" +name = "bzip2" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +checksum = "49ecfb22d906f800d4fe833b6282cf4dc1c298f5057ca0b5445e5c209735ca47" +dependencies = [ + "bzip2-sys", +] + +[[package]] +name = "bzip2-sys" +version = "0.1.13+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225bff33b2141874fe80d71e07d6eec4f85c5c216453dd96388240f96e1acc14" dependencies = [ "cc", - "libc", "pkg-config", ] @@ -1244,12 +1283,12 @@ version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "cairo-sys-rs", "glib", "libc", "once_cell", - "thiserror 1.0.64", + "thiserror 1.0.69", ] [[package]] @@ -1283,26 +1322,26 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.18.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" +checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba" dependencies = [ "camino", "cargo-platform", "semver", "serde", "serde_json", - "thiserror 1.0.64", + "thiserror 2.0.12", ] [[package]] name = "cargo_toml" -version = "0.17.2" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a969e13a7589e9e3e4207e153bae624ade2b5622fb4684a4923b23ec3d57719" +checksum = "02260d489095346e5cafd04dea8e8cb54d1d74fcd759022a9b72986ebe9a1257" dependencies = [ "serde", - "toml 0.8.19", + "toml", ] [[package]] @@ -1339,7 +1378,7 @@ checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" dependencies = [ "byteorder", "fnv", - "uuid 1.12.0", + "uuid 1.16.0", ] [[package]] @@ -1366,9 +1405,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" -version = "0.4.38" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" dependencies = [ "android-tzdata", "iana-time-zone", @@ -1376,7 +1415,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.6", + "windows-link", ] [[package]] @@ -1456,11 +1495,11 @@ dependencies = [ "sealed", "serde", "static_assertions", - "thiserror 1.0.64", + "thiserror 1.0.69", "time", "tokio", "url", - "uuid 1.12.0", + "uuid 1.16.0", ] [[package]] @@ -1506,7 +1545,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "block", "cocoa-foundation 0.2.0", "core-foundation 0.10.0", @@ -1536,7 +1575,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "block", "core-foundation 0.10.0", "core-graphics-types 0.2.0", @@ -1597,7 +1636,7 @@ dependencies = [ "encode_unicode 0.3.6", "lazy_static", "libc", - "unicode-width", + "unicode-width 0.1.14", "windows-sys 0.52.0", ] @@ -1678,6 +1717,12 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6" +[[package]] +name = "constant_time_eq" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" + [[package]] name = "convert_case" version = "0.4.0" @@ -1759,7 +1804,7 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "core-foundation 0.10.0", "core-graphics-types 0.2.0", "foreign-types 0.5.0", @@ -1783,7 +1828,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "core-foundation 0.10.0", "libc", ] @@ -1866,9 +1911,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crunchy" @@ -1973,7 +2018,7 @@ dependencies = [ "chrono", "serde", "serde_json", - "thiserror 1.0.64", + "thiserror 1.0.69", ] [[package]] @@ -1990,13 +2035,13 @@ dependencies = [ "indexmap 2.5.0", "itertools 0.13.0", "lazy_static", - "reqwest 0.12.7", + "reqwest 0.12.15", "rust-s3", "serde", "serde-xml-rs", "serde_json", "sha1_smol", - "thiserror 1.0.64", + "thiserror 1.0.69", "tokio", "tracing", "tracing-error", @@ -2155,7 +2200,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" dependencies = [ "serde", - "uuid 1.12.0", + "uuid 1.16.0", ] [[package]] @@ -2177,9 +2222,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.11" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" dependencies = [ "powerfmt", "serde", @@ -2198,9 +2243,9 @@ dependencies = [ [[package]] name = "derive_arbitrary" -version = "1.3.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" dependencies = [ "proc-macro2", "quote", @@ -2283,11 +2328,11 @@ dependencies = [ [[package]] name = "dirs" -version = "5.0.1" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" dependencies = [ - "dirs-sys 0.4.1", + "dirs-sys 0.5.0", ] [[package]] @@ -2307,20 +2352,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" dependencies = [ "libc", - "redox_users", + "redox_users 0.4.6", "winapi", ] [[package]] name = "dirs-sys" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" dependencies = [ "libc", "option-ext", - "redox_users", - "windows-sys 0.48.0", + "redox_users 0.5.0", + "windows-sys 0.59.0", ] [[package]] @@ -2330,7 +2375,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", - "redox_users", + "redox_users 0.4.6", "winapi", ] @@ -2353,6 +2398,18 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" +[[package]] +name = "dispatch2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec" +dependencies = [ + "bitflags 2.9.0", + "block2 0.6.1", + "libc", + "objc2 0.6.1", +] + [[package]] name = "displaydoc" version = "0.2.5" @@ -2526,14 +2583,14 @@ checksum = "e079f19b08ca6239f47f8ba8509c11cf3ea30095831f7fed61441475edd8c449" [[package]] name = "embed-resource" -version = "2.5.0" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4e24052d7be71f0efb50c201557f6fe7d237cfd5a64fd5bcd7fd8fe32dbbffa" +checksum = "7fbc6e0d8e0c03a655b53ca813f0463d2c956bc4db8138dbc89f120b066551e3" dependencies = [ "cc", "memchr", "rustc_version", - "toml 0.8.19", + "toml", "vswhom", "winreg 0.52.0", ] @@ -2635,6 +2692,12 @@ dependencies = [ "log", ] +[[package]] +name = "env_home" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7f84e12ccf0a7ddc17a6c41c93326024c42920d7ee630d04950e6926645c0fe" + [[package]] name = "env_logger" version = "0.11.6" @@ -2805,12 +2868,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.34" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" +checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece" dependencies = [ "crc32fast", - "miniz_oxide 0.8.0", + "miniz_oxide 0.8.8", ] [[package]] @@ -2830,6 +2893,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" + [[package]] name = "foreign-types" version = "0.3.2" @@ -2881,6 +2950,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "formatx" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa6f3b9014e23925937fbf4d05f27a6f4efe42545f98690b94f193bdb3f1959e" + [[package]] name = "fs4" version = "0.13.1" @@ -2919,9 +2994,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -2934,9 +3009,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -2944,15 +3019,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -2972,9 +3047,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" @@ -3006,9 +3081,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", @@ -3017,21 +3092,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -3126,20 +3201,6 @@ dependencies = [ "system-deps", ] -[[package]] -name = "gdkx11" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2ea8a4909d530f79921290389cbd7c34cb9d623bfe970eaae65ca5f9cd9cce" -dependencies = [ - "gdk", - "gdkx11-sys", - "gio", - "glib", - "libc", - "x11", -] - [[package]] name = "gdkx11-sys" version = "0.18.0" @@ -3179,11 +3240,11 @@ dependencies = [ [[package]] name = "gethostname" -version = "0.5.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc3655aa6818d65bc620d6911f05aa7b6aeb596291e1e9f79e52df85583d1e30" +checksum = "ed7131e57abbde63513e0e6636f76668a1ca9798dcae2df4e283cae9ee83859e" dependencies = [ - "rustix 0.38.37", + "rustix 1.0.5", "windows-targets 0.52.6", ] @@ -3218,9 +3279,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0" dependencies = [ "cfg-if", + "js-sys", "libc", "r-efi", "wasi 0.14.2+wasi-0.2.4", + "wasm-bindgen", ] [[package]] @@ -3255,7 +3318,7 @@ dependencies = [ "once_cell", "pin-project-lite", "smallvec", - "thiserror 1.0.64", + "thiserror 1.0.69", ] [[package]] @@ -3277,7 +3340,7 @@ version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "futures-channel", "futures-core", "futures-executor", @@ -3291,7 +3354,7 @@ dependencies = [ "memchr", "once_cell", "smallvec", - "thiserror 1.0.64", + "thiserror 1.0.69", ] [[package]] @@ -3472,12 +3535,23 @@ dependencies = [ ] [[package]] -name = "hashlink" -version = "0.9.1" +name = "hashbrown" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" dependencies = [ - "hashbrown 0.14.5", + "allocator-api2", + "equivalent", + "foldhash", +] + +[[package]] +name = "hashlink" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" +dependencies = [ + "hashbrown 0.15.2", ] [[package]] @@ -3489,7 +3563,7 @@ dependencies = [ "base64 0.21.7", "byteorder", "flate2", - "nom", + "nom 7.1.3", "num-traits", ] @@ -3550,9 +3624,9 @@ dependencies = [ "idna 1.0.3", "ipnet", "once_cell", - "rand 0.9.0", + "rand 0.9.1", "ring 0.17.8", - "thiserror 2.0.7", + "thiserror 2.0.12", "tinyvec", "tokio", "tracing", @@ -3572,10 +3646,10 @@ dependencies = [ "moka", "once_cell", "parking_lot", - "rand 0.9.0", + "rand 0.9.1", "resolv-conf", "smallvec", - "thiserror 2.0.7", + "thiserror 2.0.12", "tokio", "tracing", ] @@ -3814,7 +3888,7 @@ dependencies = [ "http 1.1.0", "hyper 1.4.1", "hyper-util", - "rustls 0.23.13", + "rustls 0.23.26", "rustls-native-certs 0.8.0", "rustls-pki-types", "tokio", @@ -3909,14 +3983,24 @@ dependencies = [ [[package]] name = "ico" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3804960be0bb5e4edb1e1ad67afd321a9ecfd875c3e65c099468fd2717d7cae" +checksum = "cc50b891e4acf8fe0e71ef88ec43ad82ee07b3810ad09de10f1d01f072ed4b98" dependencies = [ "byteorder", "png", ] +[[package]] +name = "icrate" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb69199826926eb864697bddd27f73d9fddcffc004f5733131e15b465e30642" +dependencies = [ + "block2 0.4.0", + "objc2 0.5.2", +] + [[package]] name = "icu_collections" version = "1.5.0" @@ -4137,15 +4221,15 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.17.8" +version = "0.17.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" +checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235" dependencies = [ "console", - "instant", "number_prefix", "portable-atomic", - "unicode-width", + "unicode-width 0.2.0", + "web-time", ] [[package]] @@ -4156,9 +4240,9 @@ checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" [[package]] name = "infer" -version = "0.16.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc150e5ce2330295b8616ce0e3f53250e53af31759a9dbedad1621ba29151847" +checksum = "a588916bfdfd92e71cacef98a63d9b1f0d74d6599980d11894290e7ddefffcf7" dependencies = [ "cfb", ] @@ -4180,18 +4264,18 @@ dependencies = [ "log", "num-format", "once_cell", - "quick-xml 0.37.4", + "quick-xml 0.37.5", "rgb", "str_stack", ] [[package]] name = "inotify" -version = "0.9.6" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.9.0", "inotify-sys", "libc", ] @@ -4292,7 +4376,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "924e5d73ea28f59011fec52a0d12185d496a9b075d360657aed2a5707f701153" dependencies = [ - "nom", + "nom 7.1.3", ] [[package]] @@ -4304,15 +4388,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.12.1" @@ -4331,6 +4406,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "0.4.8" @@ -4394,7 +4478,7 @@ dependencies = [ "combine", "jni-sys", "log", - "thiserror 1.0.64", + "thiserror 1.0.69", "walkdir", "windows-sys 0.45.0", ] @@ -4425,10 +4509,11 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -4441,7 +4526,7 @@ dependencies = [ "jsonptr", "serde", "serde_json", - "thiserror 1.0.64", + "thiserror 1.0.69", ] [[package]] @@ -4473,7 +4558,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "serde", "unicode-segmentation", ] @@ -4528,7 +4613,7 @@ dependencies = [ "async-stripe", "async-trait", "base64 0.21.7", - "bitflags 2.6.0", + "bitflags 2.9.0", "bytes", "censor", "chrono", @@ -4579,7 +4664,7 @@ dependencies = [ "spdx", "sqlx", "tar", - "thiserror 1.0.64", + "thiserror 1.0.69", "tikv-jemalloc-ctl", "tikv-jemallocator", "tokio", @@ -4589,7 +4674,7 @@ dependencies = [ "tracing-actix-web", "url", "urlencoding", - "uuid 1.12.0", + "uuid 1.16.0", "validator", "webp", "woothee", @@ -4637,7 +4722,7 @@ dependencies = [ "idna 1.0.3", "mime", "native-tls", - "nom", + "nom 7.1.3", "percent-encoding", "quoted_printable", "socket2", @@ -4707,7 +4792,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "libc", "redox_syscall", ] @@ -4786,9 +4871,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "loom" @@ -4831,6 +4916,16 @@ dependencies = [ "libc", ] +[[package]] +name = "lzma-rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" +dependencies = [ + "byteorder", + "crc", +] + [[package]] name = "lzma-sys" version = "0.1.20" @@ -4973,12 +5068,12 @@ dependencies = [ "log", "meilisearch-index-setting-macro", "pin-project-lite", - "reqwest 0.12.7", + "reqwest 0.12.15", "serde", "serde_json", - "thiserror 1.0.64", + "thiserror 1.0.69", "time", - "uuid 1.12.0", + "uuid 1.16.0", "wasm-bindgen-futures", "web-sys", "yaup", @@ -5047,26 +5142,14 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.8.0" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" dependencies = [ "adler2", "simd-adler32", ] -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", -] - [[package]] name = "mio" version = "1.0.2" @@ -5095,27 +5178,28 @@ dependencies = [ "rustc_version", "smallvec", "tagptr", - "thiserror 1.0.64", - "uuid 1.12.0", + "thiserror 1.0.69", + "uuid 1.16.0", ] [[package]] name = "muda" -version = "0.15.1" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8123dfd4996055ac9b15a60ad263b44b01e539007523ad7a4a533a3d93b0591" +checksum = "4de14a9b5d569ca68d7c891d613b390cf5ab4f851c77aaa2f9e435555d3d9492" dependencies = [ "crossbeam-channel", "dpi", "gtk", "keyboard-types", - "objc2", - "objc2-app-kit", - "objc2-foundation", + "objc2 0.6.1", + "objc2-app-kit 0.3.1", + "objc2-core-foundation", + "objc2-foundation 0.3.1", "once_cell", "png", "serde", - "thiserror 1.0.64", + "thiserror 2.0.12", "windows-sys 0.59.0", ] @@ -5133,21 +5217,22 @@ checksum = "e94e1e6445d314f972ff7395df2de295fe51b71821694f0b0e1e79c4f12c8577" [[package]] name = "native-dialog" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84e7038885d2aeab236bd60da9e159a5967b47cde3292da3b15ff1bec27c039f" +checksum = "8f006431cea71a83e6668378cb5abc2d52af299cbac6dca1780c6eeca90822df" dependencies = [ "ascii", - "block", - "cocoa 0.25.0", - "core-foundation 0.9.4", - "dirs-next", - "objc", - "objc-foundation", - "objc_id", - "once_cell", - "raw-window-handle 0.5.2", - "thiserror 1.0.64", + "block2 0.6.1", + "dirs 6.0.0", + "dispatch2", + "formatx", + "objc2 0.6.1", + "objc2-app-kit 0.3.1", + "objc2-core-foundation", + "objc2-core-graphics", + "objc2-foundation 0.3.1", + "raw-window-handle 0.6.2", + "thiserror 2.0.12", "versions", "wfd", "which", @@ -5177,13 +5262,13 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "jni-sys", "log", "ndk-sys", "num_enum", "raw-window-handle 0.6.2", - "thiserror 1.0.64", + "thiserror 1.0.69", ] [[package]] @@ -5213,7 +5298,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "cfg-if", "cfg_aliases", "libc", @@ -5236,6 +5321,15 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "nom" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405" +dependencies = [ + "memchr", +] + [[package]] name = "normpath" version = "1.3.0" @@ -5247,33 +5341,41 @@ dependencies = [ [[package]] name = "notify" -version = "6.1.1" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +checksum = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943" dependencies = [ - "bitflags 2.6.0", - "crossbeam-channel", + "bitflags 2.9.0", "filetime", "fsevent-sys", "inotify", "kqueue", "libc", "log", - "mio 0.8.11", + "mio", + "notify-types", "walkdir", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] name = "notify-debouncer-mini" -version = "0.4.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d40b221972a1fc5ef4d858a2f671fb34c75983eb385463dff3780eeff6a9d43" +checksum = "a689eb4262184d9a1727f9087cd03883ea716682ab03ed24efec57d7716dccb8" dependencies = [ "log", "notify", + "notify-types", + "tempfile", ] +[[package]] +name = "notify-types" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d" + [[package]] name = "ntapi" version = "0.4.1" @@ -5446,25 +5548,11 @@ dependencies = [ "malloc_buf", ] -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - [[package]] name = "objc-sys" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" -dependencies = [ - "cc", -] [[package]] name = "objc2" @@ -5476,44 +5564,60 @@ dependencies = [ "objc2-encode", ] +[[package]] +name = "objc2" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88c6597e14493ab2e44ce58f2fdecf095a51f12ca57bec060a11c57332520551" +dependencies = [ + "objc2-encode", + "objc2-exception-helper", +] + [[package]] name = "objc2-app-kit" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" dependencies = [ - "bitflags 2.6.0", - "block2", + "bitflags 2.9.0", + "block2 0.5.1", "libc", - "objc2", - "objc2-core-data", - "objc2-core-image", - "objc2-foundation", - "objc2-quartz-core", + "objc2 0.5.2", + "objc2-core-data 0.2.2", + "objc2-core-image 0.2.2", + "objc2-foundation 0.2.2", + "objc2-quartz-core 0.2.2", +] + +[[package]] +name = "objc2-app-kit" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6f29f568bec459b0ddff777cec4fe3fd8666d82d5a40ebd0ff7e66134f89bcc" +dependencies = [ + "bitflags 2.9.0", + "block2 0.6.1", + "libc", + "objc2 0.6.1", + "objc2-cloud-kit", + "objc2-core-data 0.3.1", + "objc2-core-foundation", + "objc2-core-graphics", + "objc2-core-image 0.3.1", + "objc2-foundation 0.3.1", + "objc2-quartz-core 0.3.1", ] [[package]] name = "objc2-cloud-kit" -version = "0.2.2" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" +checksum = "17614fdcd9b411e6ff1117dfb1d0150f908ba83a7df81b1f118005fe0a8ea15d" dependencies = [ - "bitflags 2.6.0", - "block2", - "objc2", - "objc2-core-location", - "objc2-foundation", -] - -[[package]] -name = "objc2-contacts" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889" -dependencies = [ - "block2", - "objc2", - "objc2-foundation", + "bitflags 2.9.0", + "objc2 0.6.1", + "objc2-foundation 0.3.1", ] [[package]] @@ -5522,10 +5626,50 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" dependencies = [ - "bitflags 2.6.0", - "block2", - "objc2", - "objc2-foundation", + "bitflags 2.9.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation 0.2.2", +] + +[[package]] +name = "objc2-core-data" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291fbbf7d29287518e8686417cf7239c74700fd4b607623140a7d4a3c834329d" +dependencies = [ + "bitflags 2.9.0", + "objc2 0.6.1", + "objc2-foundation 0.3.1", +] + +[[package]] +name = "objc2-core-foundation" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c10c2894a6fed806ade6027bcd50662746363a9589d3ec9d9bef30a4e4bc166" +dependencies = [ + "bitflags 2.9.0", + "block2 0.6.1", + "dispatch2", + "libc", + "objc2 0.6.1", +] + +[[package]] +name = "objc2-core-graphics" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "989c6c68c13021b5c2d6b71456ebb0f9dc78d752e86a98da7c716f4f9470f5a4" +dependencies = [ + "bitflags 2.9.0", + "block2 0.6.1", + "dispatch2", + "libc", + "objc2 0.6.1", + "objc2-core-foundation", + "objc2-io-surface", + "objc2-metal 0.3.1", ] [[package]] @@ -5534,29 +5678,36 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" dependencies = [ - "block2", - "objc2", - "objc2-foundation", - "objc2-metal", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation 0.2.2", + "objc2-metal 0.2.2", ] [[package]] -name = "objc2-core-location" -version = "0.2.2" +name = "objc2-core-image" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781" +checksum = "79b3dc0cc4386b6ccf21c157591b34a7f44c8e75b064f85502901ab2188c007e" dependencies = [ - "block2", - "objc2", - "objc2-contacts", - "objc2-foundation", + "objc2 0.6.1", + "objc2-foundation 0.3.1", ] [[package]] name = "objc2-encode" -version = "4.0.3" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" +checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33" + +[[package]] +name = "objc2-exception-helper" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7a1c5fbb72d7735b076bb47b578523aedc40f3c439bea6dfd595c089d79d98a" +dependencies = [ + "cc", +] [[package]] name = "objc2-foundation" @@ -5564,23 +5715,45 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ - "bitflags 2.6.0", - "block2", + "bitflags 2.9.0", + "block2 0.5.1", "dispatch", "libc", - "objc2", + "objc2 0.5.2", ] [[package]] -name = "objc2-link-presentation" -version = "0.2.2" +name = "objc2-foundation" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398" +checksum = "900831247d2fe1a09a683278e5384cfb8c80c79fe6b166f9d14bfdde0ea1b03c" dependencies = [ - "block2", - "objc2", - "objc2-app-kit", - "objc2-foundation", + "bitflags 2.9.0", + "block2 0.6.1", + "libc", + "objc2 0.6.1", + "objc2-core-foundation", +] + +[[package]] +name = "objc2-io-kit" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71c1c64d6120e51cd86033f67176b1cb66780c2efe34dec55176f77befd93c0a" +dependencies = [ + "libc", + "objc2-core-foundation", +] + +[[package]] +name = "objc2-io-surface" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7282e9ac92529fa3457ce90ebb15f4ecbc383e8338060960760fa2cf75420c3c" +dependencies = [ + "bitflags 2.9.0", + "objc2 0.6.1", + "objc2-core-foundation", ] [[package]] @@ -5589,10 +5762,33 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" dependencies = [ - "bitflags 2.6.0", - "block2", - "objc2", - "objc2-foundation", + "bitflags 2.9.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation 0.2.2", +] + +[[package]] +name = "objc2-metal" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f246c183239540aab1782457b35ab2040d4259175bd1d0c58e46ada7b47a874" +dependencies = [ + "bitflags 2.9.0", + "objc2 0.6.1", + "objc2-foundation 0.3.1", +] + +[[package]] +name = "objc2-osa-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6788b04a18ea31e3dc3ab256b8546639e5bbae07c1a0dc4ea8615252bc6aee9a" +dependencies = [ + "bitflags 2.9.0", + "objc2 0.5.2", + "objc2-app-kit 0.2.2", + "objc2-foundation 0.2.2", ] [[package]] @@ -5601,88 +5797,48 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" dependencies = [ - "bitflags 2.6.0", - "block2", - "objc2", - "objc2-foundation", - "objc2-metal", + "bitflags 2.9.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation 0.2.2", + "objc2-metal 0.2.2", ] [[package]] -name = "objc2-symbols" -version = "0.2.2" +name = "objc2-quartz-core" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc" +checksum = "90ffb6a0cd5f182dc964334388560b12a57f7b74b3e2dec5e2722aa2dfb2ccd5" dependencies = [ - "objc2", - "objc2-foundation", + "bitflags 2.9.0", + "objc2 0.6.1", + "objc2-foundation 0.3.1", ] [[package]] name = "objc2-ui-kit" -version = "0.2.2" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" +checksum = "25b1312ad7bc8a0e92adae17aa10f90aae1fb618832f9b993b022b591027daed" dependencies = [ - "bitflags 2.6.0", - "block2", - "objc2", - "objc2-cloud-kit", - "objc2-core-data", - "objc2-core-image", - "objc2-core-location", - "objc2-foundation", - "objc2-link-presentation", - "objc2-quartz-core", - "objc2-symbols", - "objc2-uniform-type-identifiers", - "objc2-user-notifications", -] - -[[package]] -name = "objc2-uniform-type-identifiers" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe" -dependencies = [ - "block2", - "objc2", - "objc2-foundation", -] - -[[package]] -name = "objc2-user-notifications" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" -dependencies = [ - "bitflags 2.6.0", - "block2", - "objc2", - "objc2-core-location", - "objc2-foundation", + "bitflags 2.9.0", + "objc2 0.6.1", + "objc2-core-foundation", + "objc2-foundation 0.3.1", ] [[package]] name = "objc2-web-kit" -version = "0.2.2" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68bc69301064cebefc6c4c90ce9cba69225239e4b8ff99d445a2b5563797da65" +checksum = "91672909de8b1ce1c2252e95bbee8c1649c9ad9d14b9248b3d7b4c47903c47ad" dependencies = [ - "bitflags 2.6.0", - "block2", - "objc2", - "objc2-app-kit", - "objc2-foundation", -] - -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", + "bitflags 2.9.0", + "block2 0.6.1", + "objc2 0.6.1", + "objc2-app-kit 0.3.1", + "objc2-core-foundation", + "objc2-foundation 0.3.1", ] [[package]] @@ -5746,7 +5902,7 @@ version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "cfg-if", "foreign-types 0.3.2", "libc", @@ -5832,15 +5988,29 @@ dependencies = [ [[package]] name = "os_info" -version = "3.8.2" +version = "3.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" +checksum = "2a604e53c24761286860eba4e2c8b23a0161526476b1de520139d69cdb85a6b5" dependencies = [ "log", "serde", "windows-sys 0.52.0", ] +[[package]] +name = "osakit" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35366a452fce3f8947eb2f33226a133aaf0cacedef2af67ade348d58be7f85d0" +dependencies = [ + "icrate", + "objc2-foundation 0.2.2", + "objc2-osa-kit", + "serde", + "serde_json", + "thiserror 1.0.69", +] + [[package]] name = "overload" version = "0.1.1" @@ -5856,7 +6026,7 @@ dependencies = [ "ecdsa", "elliptic-curve", "primeorder", - "sha2 0.10.8", + "sha2 0.10.9", ] [[package]] @@ -5962,7 +6132,17 @@ dependencies = [ "digest 0.10.7", "hmac 0.12.1", "password-hash 0.4.2", - "sha2 0.10.8", + "sha2 0.10.9", +] + +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest 0.10.7", + "hmac 0.12.1", ] [[package]] @@ -6125,14 +6305,14 @@ dependencies = [ "fnv", "itertools 0.12.1", "lazy_static", - "nom", + "nom 7.1.3", "quick-xml 0.31.0", "regex", "regex-cache", "serde", "serde_derive", "strum", - "thiserror 1.0.64", + "thiserror 1.0.69", ] [[package]] @@ -6228,7 +6408,7 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.8.0", + "miniz_oxide 0.8.8", ] [[package]] @@ -6279,7 +6459,7 @@ version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" dependencies = [ - "zerocopy 0.7.35", + "zerocopy", ] [[package]] @@ -6299,7 +6479,7 @@ dependencies = [ "is-terminal", "lazy_static", "term", - "unicode-width", + "unicode-width 0.1.14", ] [[package]] @@ -6384,7 +6564,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "hex", "lazy_static", "procfs-core", @@ -6397,7 +6577,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "hex", ] @@ -6415,7 +6595,7 @@ dependencies = [ "parking_lot", "procfs", "protobuf", - "thiserror 1.0.64", + "thiserror 1.0.69", ] [[package]] @@ -6435,7 +6615,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" dependencies = [ "anyhow", - "itertools 0.13.0", + "itertools 0.14.0", "proc-macro2", "quote", "syn 2.0.90", @@ -6564,9 +6744,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.37.4" +version = "0.37.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4ce8c88de324ff838700f36fb6ab86c96df0e3c4ab6ef3a9b2044465cce1369" +checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb" dependencies = [ "memchr", "tokio", @@ -6583,9 +6763,9 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash", - "rustls 0.23.13", + "rustls 0.23.26", "socket2", - "thiserror 1.0.64", + "thiserror 1.0.69", "tokio", "tracing", ] @@ -6600,9 +6780,9 @@ dependencies = [ "rand 0.8.5", "ring 0.17.8", "rustc-hash", - "rustls 0.23.13", + "rustls 0.23.26", "slab", - "thiserror 1.0.64", + "thiserror 1.0.69", "tinyvec", "tracing", ] @@ -6685,13 +6865,12 @@ dependencies = [ [[package]] name = "rand" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94" +checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97" dependencies = [ "rand_chacha 0.9.0", "rand_core 0.9.3", - "zerocopy 0.8.24", ] [[package]] @@ -6832,7 +7011,7 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "355ae415ccd3a04315d3f8246e86d67689ea74d88d915576e1589a351062a13b" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", ] [[package]] @@ -6843,14 +7022,25 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom 0.2.15", "libredox", - "thiserror 1.0.64", + "thiserror 1.0.69", +] + +[[package]] +name = "redox_users" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b" +dependencies = [ + "getrandom 0.2.15", + "libredox", + "thiserror 2.0.12", ] [[package]] name = "regex" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -6966,9 +7156,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.7" +version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" +checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb" dependencies = [ "async-compression", "base64 0.22.1", @@ -6994,8 +7184,8 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.13", - "rustls-native-certs 0.7.3", + "rustls 0.23.26", + "rustls-native-certs 0.8.0", "rustls-pemfile 2.1.3", "rustls-pki-types", "serde", @@ -7007,6 +7197,7 @@ dependencies = [ "tokio-native-tls", "tokio-rustls 0.26.0", "tokio-util", + "tower 0.5.2", "tower-service", "url", "wasm-bindgen", @@ -7014,7 +7205,7 @@ dependencies = [ "wasm-streams", "web-sys", "webpki-roots 0.26.6", - "windows-registry 0.2.0", + "windows-registry 0.4.0", ] [[package]] @@ -7049,15 +7240,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46f6f80a9b882647d9014673ca9925d30ffc9750f2eed2b4490e189eaebd01e8" dependencies = [ "ashpd", - "block2", + "block2 0.5.1", "glib-sys", "gobject-sys", "gtk-sys", "js-sys", "log", - "objc2", - "objc2-app-kit", - "objc2-foundation", + "objc2 0.5.2", + "objc2-app-kit 0.2.2", + "objc2-foundation 0.2.2", "raw-window-handle 0.6.2", "wasm-bindgen", "wasm-bindgen-futures", @@ -7119,7 +7310,7 @@ dependencies = [ "rkyv_derive", "seahash", "tinyvec", - "uuid 1.12.0", + "uuid 1.16.0", ] [[package]] @@ -7199,8 +7390,8 @@ dependencies = [ "reqwest 0.11.27", "serde", "serde_derive", - "sha2 0.10.8", - "thiserror 1.0.64", + "sha2 0.10.9", + "thiserror 1.0.69", "time", "tokio", "tokio-stream", @@ -7272,7 +7463,7 @@ version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "errno", "libc", "linux-raw-sys 0.4.14", @@ -7285,7 +7476,7 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "errno", "libc", "linux-raw-sys 0.9.4", @@ -7332,15 +7523,15 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.13" +version = "0.23.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" +checksum = "df51b5869f3a441595eac5e8ff14d486ff285f7b8c0df8770e49c3b56351f0f0" dependencies = [ "log", "once_cell", "ring 0.17.8", "rustls-pki-types", - "rustls-webpki 0.102.8", + "rustls-webpki 0.103.1", "subtle", "zeroize", ] @@ -7357,19 +7548,6 @@ dependencies = [ "security-framework", ] -[[package]] -name = "rustls-native-certs" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" -dependencies = [ - "openssl-probe", - "rustls-pemfile 2.1.3", - "rustls-pki-types", - "schannel", - "security-framework", -] - [[package]] name = "rustls-native-certs" version = "0.8.0" @@ -7404,9 +7582,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.9.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55" +checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c" [[package]] name = "rustls-webpki" @@ -7429,6 +7607,17 @@ dependencies = [ "untrusted 0.9.0", ] +[[package]] +name = "rustls-webpki" +version = "0.103.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03" +dependencies = [ + "ring 0.17.8", + "rustls-pki-types", + "untrusted 0.9.0", +] + [[package]] name = "rustversion" version = "1.0.18" @@ -7507,7 +7696,7 @@ dependencies = [ "serde", "serde_json", "url", - "uuid 1.12.0", + "uuid 1.16.0", ] [[package]] @@ -7582,7 +7771,7 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "core-foundation 0.9.4", "core-foundation-sys", "libc", @@ -7635,7 +7824,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5484316556650182f03b43d4c746ce0e3e48074a21e2f51244b648b6542e1066" dependencies = [ "httpdate", - "reqwest 0.12.7", + "reqwest 0.12.15", "rustls 0.22.4", "sentry-backtrace", "sentry-contexts", @@ -7742,17 +7931,17 @@ dependencies = [ "rand 0.8.5", "serde", "serde_json", - "thiserror 1.0.64", + "thiserror 1.0.69", "time", "url", - "uuid 1.12.0", + "uuid 1.16.0", ] [[package]] name = "serde" -version = "1.0.210" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" dependencies = [ "serde_derive", ] @@ -7776,15 +7965,15 @@ checksum = "fb3aa78ecda1ebc9ec9847d5d3aba7d618823446a049ba2491940506da6e2782" dependencies = [ "log", "serde", - "thiserror 1.0.64", + "thiserror 1.0.69", "xml-rs", ] [[package]] name = "serde_bytes" -version = "0.11.15" +version = "0.11.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" +checksum = "8437fd221bde2d4ca316d61b90e337e9e702b3820b87d63caa9ba6c02bd06d96" dependencies = [ "serde", ] @@ -7801,9 +7990,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", @@ -7845,9 +8034,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" dependencies = [ "itoa 1.0.11", "memchr", @@ -7882,7 +8071,7 @@ checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6" dependencies = [ "percent-encoding", "serde", - "thiserror 1.0.64", + "thiserror 1.0.69", ] [[package]] @@ -7893,7 +8082,7 @@ checksum = "8cac3f1e2ca2fe333923a1ae72caca910b98ed0630bb35ef6f8c8517d6e81afa" dependencies = [ "percent-encoding", "serde", - "thiserror 1.0.64", + "thiserror 1.0.69", ] [[package]] @@ -7942,9 +8131,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.9.0" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" +checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa" dependencies = [ "base64 0.22.1", "chrono", @@ -7960,9 +8149,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.9.0" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" +checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e" dependencies = [ "darling 0.20.10", "proc-macro2", @@ -8043,9 +8232,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.8" +version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", "cpufeatures", @@ -8175,9 +8364,9 @@ dependencies = [ "foreign-types 0.5.0", "js-sys", "log", - "objc2", - "objc2-foundation", - "objc2-quartz-core", + "objc2 0.5.2", + "objc2-foundation 0.2.2", + "objc2-quartz-core 0.2.2", "raw-window-handle 0.6.2", "redox_syscall", "wasm-bindgen", @@ -8245,21 +8434,11 @@ dependencies = [ "der", ] -[[package]] -name = "sqlformat" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bba3a93db0cc4f7bdece8bb09e77e2e785c20bfebf79eb8340ed80708048790" -dependencies = [ - "nom", - "unicode_categories", -] - [[package]] name = "sqlx" -version = "0.8.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93334716a037193fac19df402f8571269c84a00852f6a7066b5d2616dcd64d3e" +checksum = "f3c3a85280daca669cfd3bcb68a337882a8bc57ec882f72c5d13a430613a738e" dependencies = [ "sqlx-core", "sqlx-macros", @@ -8270,41 +8449,35 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.8.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d8060b456358185f7d50c55d9b5066ad956956fddec42ee2e8567134a8936e" +checksum = "f743f2a3cea30a58cd479013f75550e879009e3a02f616f18ca699335aa248c3" dependencies = [ - "atoi", - "byteorder", + "base64 0.22.1", "bytes", "chrono", "crc", "crossbeam-queue", "either", "event-listener 5.3.1", - "futures-channel", "futures-core", "futures-intrusive", "futures-io", "futures-util", - "hashbrown 0.14.5", + "hashbrown 0.15.2", "hashlink", - "hex", "indexmap 2.5.0", "log", "memchr", "once_cell", - "paste", "percent-encoding", "rust_decimal", - "rustls 0.23.13", - "rustls-pemfile 2.1.3", + "rustls 0.23.26", "serde", "serde_json", - "sha2 0.10.8", + "sha2 0.10.9", "smallvec", - "sqlformat", - "thiserror 1.0.64", + "thiserror 2.0.12", "tokio", "tokio-stream", "tracing", @@ -8314,9 +8487,9 @@ dependencies = [ [[package]] name = "sqlx-macros" -version = "0.8.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cac0692bcc9de3b073e8d747391827297e075c7710ff6276d9f7a1f3d58c6657" +checksum = "7f4200e0fde19834956d4252347c12a083bdcb237d7a1a1446bffd8768417dce" dependencies = [ "proc-macro2", "quote", @@ -8327,9 +8500,9 @@ dependencies = [ [[package]] name = "sqlx-macros-core" -version = "0.8.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1804e8a7c7865599c9c79be146dc8a9fd8cc86935fa641d3ea58e5f0688abaa5" +checksum = "882ceaa29cade31beca7129b6beeb05737f44f82dbe2a9806ecea5a7093d00b7" dependencies = [ "dotenvy", "either", @@ -8340,7 +8513,7 @@ dependencies = [ "quote", "serde", "serde_json", - "sha2 0.10.8", + "sha2 0.10.9", "sqlx-core", "sqlx-mysql", "sqlx-postgres", @@ -8353,13 +8526,13 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.8.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64bb4714269afa44aef2755150a0fc19d756fb580a67db8885608cf02f47d06a" +checksum = "0afdd3aa7a629683c2d750c2df343025545087081ab5942593a5288855b1b7a7" dependencies = [ "atoi", "base64 0.22.1", - "bitflags 2.6.0", + "bitflags 2.9.0", "byteorder", "bytes", "chrono", @@ -8386,24 +8559,24 @@ dependencies = [ "rust_decimal", "serde", "sha1 0.10.6", - "sha2 0.10.8", + "sha2 0.10.9", "smallvec", "sqlx-core", "stringprep", - "thiserror 1.0.64", + "thiserror 2.0.12", "tracing", "whoami", ] [[package]] name = "sqlx-postgres" -version = "0.8.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa91a732d854c5d7726349bb4bb879bb9478993ceb764247660aee25f67c2f8" +checksum = "a0bedbe1bbb5e2615ef347a5e9d8cd7680fb63e77d9dafc0f29be15e53f1ebe6" dependencies = [ "atoi", "base64 0.22.1", - "bitflags 2.6.0", + "bitflags 2.9.0", "byteorder", "chrono", "crc", @@ -8411,7 +8584,6 @@ dependencies = [ "etcetera", "futures-channel", "futures-core", - "futures-io", "futures-util", "hex", "hkdf", @@ -8426,20 +8598,20 @@ dependencies = [ "rust_decimal", "serde", "serde_json", - "sha2 0.10.8", + "sha2 0.10.9", "smallvec", "sqlx-core", "stringprep", - "thiserror 1.0.64", + "thiserror 2.0.12", "tracing", "whoami", ] [[package]] name = "sqlx-sqlite" -version = "0.8.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5b2cf34a45953bfd3daaf3db0f7a7878ab9b7a6b91b422d24a7a9e4c857b680" +checksum = "c26083e9a520e8eb87a06b12347679b142dc2ea29e6e409f805644a7a979a5bc" dependencies = [ "atoi", "chrono", @@ -8455,6 +8627,7 @@ dependencies = [ "serde", "serde_urlencoded", "sqlx-core", + "thiserror 2.0.12", "tracing", "url", ] @@ -8688,17 +8861,16 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.30.13" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3" +checksum = "b897c8ea620e181c7955369a31be5f48d9a9121cb59fd33ecef9ff2a34323422" dependencies = [ - "cfg-if", - "core-foundation-sys", "libc", + "memchr", "ntapi", - "once_cell", - "rayon", - "windows 0.52.0", + "objc2-core-foundation", + "objc2-io-kit", + "windows 0.61.1", ] [[package]] @@ -8718,7 +8890,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "core-foundation 0.9.4", "system-configuration-sys 0.6.0", ] @@ -8752,7 +8924,7 @@ dependencies = [ "cfg-expr", "heck 0.5.0", "pkg-config", - "toml 0.8.19", + "toml", "version-compare", ] @@ -8764,12 +8936,11 @@ checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" [[package]] name = "tao" -version = "0.30.8" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6682a07cf5bab0b8a2bd20d0a542917ab928b5edb75ebd4eda6b05cbaab872da" +checksum = "1e59c1f38e657351a2e822eadf40d6a2ad4627b9c25557bc1180ec1b3295ef82" dependencies = [ - "bitflags 2.6.0", - "cocoa 0.26.0", + "bitflags 2.9.0", "core-foundation 0.10.0", "core-graphics 0.24.0", "crossbeam-channel", @@ -8779,7 +8950,6 @@ dependencies = [ "gdkwayland-sys", "gdkx11-sys", "gtk", - "instant", "jni", "lazy_static", "libc", @@ -8787,7 +8957,9 @@ dependencies = [ "ndk", "ndk-context", "ndk-sys", - "objc", + "objc2 0.6.1", + "objc2-app-kit 0.3.1", + "objc2-foundation 0.3.1", "once_cell", "parking_lot", "raw-window-handle 0.6.2", @@ -8795,8 +8967,8 @@ dependencies = [ "tao-macros", "unicode-segmentation", "url", - "windows 0.58.0", - "windows-core 0.58.0", + "windows 0.61.1", + "windows-core 0.61.0", "windows-version", "x11-dl", ] @@ -8837,13 +9009,13 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tauri" -version = "2.1.1" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e545de0a2dfe296fa67db208266cd397c5a55ae782da77973ef4c4fac90e9f2c" +checksum = "e7b0bc1aec81bda6bc455ea98fcaed26b3c98c1648c627ad6ff1c704e8bf8cbc" dependencies = [ "anyhow", "bytes", - "dirs 5.0.1", + "dirs 6.0.0", "dunce", "embed_plist", "futures-util", @@ -8858,13 +9030,14 @@ dependencies = [ "log", "mime", "muda", - "objc2", - "objc2-app-kit", - "objc2-foundation", + "objc2 0.6.1", + "objc2-app-kit 0.3.1", + "objc2-foundation 0.3.1", + "objc2-ui-kit", "percent-encoding", "plist", "raw-window-handle 0.6.2", - "reqwest 0.12.7", + "reqwest 0.12.15", "serde", "serde_json", "serde_repr", @@ -8875,7 +9048,7 @@ dependencies = [ "tauri-runtime", "tauri-runtime-wry", "tauri-utils", - "thiserror 2.0.7", + "thiserror 2.0.12", "tokio", "tray-icon", "url", @@ -8883,18 +9056,18 @@ dependencies = [ "webkit2gtk", "webview2-com", "window-vibrancy", - "windows 0.58.0", + "windows 0.61.1", ] [[package]] name = "tauri-build" -version = "2.0.3" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd2a4bcfaf5fb9f4be72520eefcb61ae565038f8ccba2a497d8c28f463b8c01" +checksum = "d7a0350f0df1db385ca5c02888a83e0e66655c245b7443db8b78a70da7d7f8fc" dependencies = [ "anyhow", "cargo_toml", - "dirs 5.0.1", + "dirs 6.0.0", "glob", "heck 0.5.0", "json-patch", @@ -8906,15 +9079,15 @@ dependencies = [ "tauri-codegen", "tauri-utils", "tauri-winres", - "toml 0.8.19", + "toml", "walkdir", ] [[package]] name = "tauri-codegen" -version = "2.0.3" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf79faeecf301d3e969b1fae977039edb77a4c1f25cc0a961be298b54bff97cf" +checksum = "f93f035551bf7b11b3f51ad9bc231ebbe5e085565527991c16cf326aa38cdf47" dependencies = [ "base64 0.22.1", "brotli 7.0.0", @@ -8927,21 +9100,21 @@ dependencies = [ "semver", "serde", "serde_json", - "sha2 0.10.8", + "sha2 0.10.9", "syn 2.0.90", "tauri-utils", - "thiserror 2.0.7", + "thiserror 2.0.12", "time", "url", - "uuid 1.12.0", + "uuid 1.16.0", "walkdir", ] [[package]] name = "tauri-macros" -version = "2.0.3" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c52027c8c5afb83166dacddc092ee8fff50772f9646d461d8c33ee887e447a03" +checksum = "8db4df25e2d9d45de0c4c910da61cd5500190da14ae4830749fee3466dddd112" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -8953,9 +9126,9 @@ dependencies = [ [[package]] name = "tauri-plugin" -version = "2.0.3" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e753f2a30933a9bbf0a202fa47d7cc4a3401f06e8d6dcc53b79aa62954828c79" +checksum = "37a5ebe6a610d1b78a94650896e6f7c9796323f408800cef436e0fa0539de601" dependencies = [ "anyhow", "glob", @@ -8964,15 +9137,15 @@ dependencies = [ "serde", "serde_json", "tauri-utils", - "toml 0.8.19", + "toml", "walkdir", ] [[package]] name = "tauri-plugin-deep-link" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35d51ffd286073414d26353bcfc9e83e3cd63f96fa7f7a912f92f2118e5de5a6" +checksum = "dba4412f30eaff6f5d210e20383c2d6835593977402092e95b72497a4f8632fa" dependencies = [ "dunce", "rust-ini 0.21.1", @@ -8981,18 +9154,18 @@ dependencies = [ "tauri", "tauri-plugin", "tauri-utils", - "thiserror 2.0.7", + "thiserror 2.0.12", "tracing", "url", - "windows-registry 0.3.0", - "windows-result", + "windows-registry 0.5.1", + "windows-result 0.3.2", ] [[package]] name = "tauri-plugin-dialog" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b59fd750551b1066744ab956a1cd6b1ea3e1b3763b0b9153ac27a044d596426" +checksum = "bcaf6e5d6062423a0f711a23c2a573ccba222b6a16a9322d8499928f27e41376" dependencies = [ "log", "raw-window-handle 0.6.2", @@ -9002,15 +9175,15 @@ dependencies = [ "tauri", "tauri-plugin", "tauri-plugin-fs", - "thiserror 2.0.7", + "thiserror 2.0.12", "url", ] [[package]] name = "tauri-plugin-fs" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a1edf18000f02903a7c2e5997fb89aca455ecbc0acc15c6535afbb883be223" +checksum = "88371e340ad2f07409a3b68294abe73f20bc9c1bc1b631a31dc37a3d0161f682" dependencies = [ "anyhow", "dunce", @@ -9023,39 +9196,39 @@ dependencies = [ "tauri", "tauri-plugin", "tauri-utils", - "thiserror 2.0.7", - "toml 0.8.19", + "thiserror 2.0.12", + "toml", "url", - "uuid 1.12.0", + "uuid 1.16.0", ] [[package]] name = "tauri-plugin-opener" -version = "2.2.1" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c57f68e88f81a299463b4d1eaf214f7b1be012e6a415b3088eda46a38bb9cef" +checksum = "2fdc6cb608e04b7d2b6d1f21e9444ad49245f6d03465ba53323d692d1ceb1a30" dependencies = [ "dunce", "glob", - "objc2-app-kit", - "objc2-foundation", + "objc2-app-kit 0.3.1", + "objc2-foundation 0.3.1", "open", "schemars", "serde", "serde_json", "tauri", "tauri-plugin", - "thiserror 2.0.7", + "thiserror 2.0.12", "url", - "windows 0.58.0", - "zbus 4.4.0", + "windows 0.60.0", + "zbus", ] [[package]] name = "tauri-plugin-os" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda2d571a9baf0664c1f2088db227e3072f9028602fafa885deade7547c3b738" +checksum = "424f19432397850c2ddd42aa58078630c15287bbce3866eb1d90e7dbee680637" dependencies = [ "gethostname", "log", @@ -9066,39 +9239,41 @@ dependencies = [ "sys-locale", "tauri", "tauri-plugin", - "thiserror 2.0.7", + "thiserror 2.0.12", ] [[package]] name = "tauri-plugin-single-instance" -version = "2.2.0" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f36019ee9832dc99e4450bb55a21cfad8633b19c2c18bd17c7741939b070ede" +checksum = "1320af4d866a7fb5f5721d299d14d0dd9e4e6bc0359ff3e263124a2bf6814efa" dependencies = [ "serde", "serde_json", "tauri", - "thiserror 2.0.7", + "thiserror 2.0.12", "tracing", "windows-sys 0.59.0", - "zbus 4.4.0", + "zbus", ] [[package]] name = "tauri-plugin-updater" -version = "2.3.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7351014c140906bcfff59d96e04b1170c8f602557f40eb37f7de356d4e7067b" +checksum = "73f05c38afd77a4b8fd98e8fb6f1cdbb5fbb8a46ba181eb2758b05321e3c6209" dependencies = [ "base64 0.22.1", - "dirs 5.0.1", + "dirs 6.0.0", "flate2", "futures-util", "http 1.1.0", - "infer 0.16.0", + "infer 0.19.0", + "log", "minisign-verify", + "osakit", "percent-encoding", - "reqwest 0.12.7", + "reqwest 0.12.15", "semver", "serde", "serde_json", @@ -9106,61 +9281,65 @@ dependencies = [ "tauri", "tauri-plugin", "tempfile", - "thiserror 2.0.7", + "thiserror 2.0.12", "time", "tokio", "url", "windows-sys 0.59.0", - "zip 2.2.0", + "zip 2.6.1", ] [[package]] name = "tauri-plugin-window-state" -version = "2.2.0" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234dd891cc7960fa28f93ea911f3e0d9ce8375ebf9ff303831bdd7a3443d5714" +checksum = "a27a3fe49de72adbe0d84aee33c89a0b059722cd0b42aaeab29eaaee7f7535cd" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "log", "serde", "serde_json", "tauri", "tauri-plugin", - "thiserror 2.0.7", + "thiserror 2.0.12", ] [[package]] name = "tauri-runtime" -version = "2.2.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cce18d43f80d4aba3aa8a0c953bbe835f3d0f2370aca75e8dbb14bd4bab27958" +checksum = "00f004905d549854069e6774533d742b03cacfd6f03deb08940a8677586cbe39" dependencies = [ + "cookie 0.18.1", "dpi", "gtk", "http 1.1.0", "jni", + "objc2 0.6.1", + "objc2-ui-kit", "raw-window-handle 0.6.2", "serde", "serde_json", "tauri-utils", - "thiserror 2.0.7", + "thiserror 2.0.12", "url", - "windows 0.58.0", + "windows 0.61.1", ] [[package]] name = "tauri-runtime-wry" -version = "2.2.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f442a38863e10129ffe2cec7bd09c2dcf8a098a3a27801a476a304d5bb991d2" +checksum = "f85d056f4d4b014fe874814034f3416d57114b617a493a4fe552580851a3f3a2" dependencies = [ "gtk", "http 1.1.0", "jni", "log", - "objc2", - "objc2-app-kit", - "objc2-foundation", + "objc2 0.6.1", + "objc2-app-kit 0.3.1", + "objc2-foundation 0.3.1", + "once_cell", "percent-encoding", "raw-window-handle 0.6.2", "softbuffer", @@ -9170,16 +9349,17 @@ dependencies = [ "url", "webkit2gtk", "webview2-com", - "windows 0.58.0", + "windows 0.61.1", "wry", ] [[package]] name = "tauri-utils" -version = "2.1.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9271a88f99b4adea0dc71d0baca4505475a0bbd139fb135f62958721aaa8fe54" +checksum = "b2900399c239a471bcff7f15c4399eb1a8c4fe511ba2853e07c996d771a5e0a4" dependencies = [ + "anyhow", "brotli 7.0.0", "cargo_metadata", "ctor", @@ -9187,7 +9367,7 @@ dependencies = [ "glob", "html5ever", "http 1.1.0", - "infer 0.16.0", + "infer 0.19.0", "json-patch", "kuchikiki", "log", @@ -9203,34 +9383,35 @@ dependencies = [ "serde_json", "serde_with", "swift-rs", - "thiserror 2.0.7", - "toml 0.8.19", + "thiserror 2.0.12", + "toml", "url", "urlpattern", - "uuid 1.12.0", + "uuid 1.16.0", "walkdir", ] [[package]] name = "tauri-winres" -version = "0.1.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb" +checksum = "e8d321dbc6f998d825ab3f0d62673e810c861aac2d0de2cc2c395328f1d113b4" dependencies = [ "embed-resource", - "toml 0.7.8", + "indexmap 2.5.0", + "toml", ] [[package]] name = "tempfile" -version = "3.13.0" +version = "3.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf" dependencies = [ - "cfg-if", "fastrand 2.1.1", + "getrandom 0.3.2", "once_cell", - "rustix 0.38.37", + "rustix 1.0.5", "windows-sys 0.59.0", ] @@ -9272,7 +9453,7 @@ dependencies = [ "chrono", "daedalus", "dashmap 6.1.0", - "dirs 5.0.1", + "dirs 6.0.0", "discord-rich-presence", "dunce", "either", @@ -9288,31 +9469,31 @@ dependencies = [ "p256", "paste", "quartz_nbt", - "quick-xml 0.37.4", + "quick-xml 0.37.5", "rand 0.8.5", "regex", - "reqwest 0.12.7", + "reqwest 0.12.15", "serde", "serde_ini", "serde_json", "sha1_smol", - "sha2 0.10.8", + "sha2 0.10.9", "sqlx", "sys-info", "sysinfo", "tauri", "tempfile", - "thiserror 1.0.64", + "thiserror 2.0.12", "tokio", "tokio-util", "tracing", "tracing-error", "tracing-subscriber", "url", - "uuid 1.12.0", + "uuid 1.16.0", "whoami", - "winreg 0.52.0", - "zip 0.6.6", + "winreg 0.55.0", + "zip 2.6.1", ] [[package]] @@ -9320,7 +9501,7 @@ name = "theseus_gui" version = "0.9.5" dependencies = [ "chrono", - "cocoa 0.25.0", + "cocoa 0.26.0", "daedalus", "dashmap 6.1.0", "either", @@ -9330,7 +9511,7 @@ dependencies = [ "opener", "os_info", "paste", - "rand 0.8.5", + "rand 0.9.1", "serde", "serde_json", "serde_with", @@ -9344,13 +9525,13 @@ dependencies = [ "tauri-plugin-updater", "tauri-plugin-window-state", "theseus", - "thiserror 1.0.64", + "thiserror 2.0.12", "tokio", "tracing", "tracing-error", "url", "urlencoding", - "uuid 1.12.0", + "uuid 1.16.0", "window-shadows", ] @@ -9373,27 +9554,27 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.64" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl 1.0.64", + "thiserror-impl 1.0.69", ] [[package]] name = "thiserror" -version = "2.0.7" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93605438cbd668185516ab499d589afb7ee1859ea3d5fc8f6b0755e1c7443767" +checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" dependencies = [ - "thiserror-impl 2.0.7", + "thiserror-impl 2.0.12", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", @@ -9402,9 +9583,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.7" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d8749b4531af2117677a5fcd12b1348a3fe2b81e36e61ffeac5c4aa3273e36" +checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" dependencies = [ "proc-macro2", "quote", @@ -9465,9 +9646,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.36" +version = "0.3.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" dependencies = [ "deranged", "itoa 1.0.11", @@ -9480,15 +9661,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" +checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" [[package]] name = "time-macros" -version = "0.2.18" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49" dependencies = [ "num-conv", "time-core", @@ -9530,14 +9711,14 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.42.0" +version = "1.44.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" +checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48" dependencies = [ "backtrace", "bytes", "libc", - "mio 1.0.2", + "mio", "parking_lot", "pin-project-lite", "signal-hook-registry", @@ -9549,9 +9730,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", @@ -9584,7 +9765,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.13", + "rustls 0.23.26", "rustls-pki-types", "tokio", ] @@ -9602,9 +9783,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.14" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b9590b93e6fcc1739458317cccd391ad3955e2bde8913edf6f95f9e65a8f034" +checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df" dependencies = [ "bytes", "futures-core", @@ -9614,18 +9795,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.19.15", -] - [[package]] name = "toml" version = "0.8.19" @@ -9654,8 +9823,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap 2.5.0", - "serde", - "serde_spanned", "toml_datetime", "winnow 0.5.40", ] @@ -9725,7 +9892,7 @@ dependencies = [ "hmac 0.12.1", "rand 0.8.5", "sha1 0.10.6", - "sha2 0.10.8", + "sha2 0.10.9", ] [[package]] @@ -9758,6 +9925,7 @@ dependencies = [ "futures-util", "pin-project-lite", "sync_wrapper 1.0.1", + "tokio", "tower-layer", "tower-service", ] @@ -9796,7 +9964,7 @@ dependencies = [ "mutually_exclusive_features", "pin-project", "tracing", - "uuid 1.12.0", + "uuid 1.16.0", ] [[package]] @@ -9822,9 +9990,9 @@ dependencies = [ [[package]] name = "tracing-error" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" +checksum = "8b1581020d7a273442f5b45074a6a57d5757ad0a47dac0e9f0bd57b81936f3db" dependencies = [ "tracing", "tracing-subscriber", @@ -9862,22 +10030,23 @@ dependencies = [ [[package]] name = "tray-icon" -version = "0.19.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "533fc2d4105e0e3d96ce1c71f2d308c9fbbe2ef9c587cab63dd627ab5bde218f" +checksum = "9f7eee98ec5c90daf179d55c20a49d8c0d043054ce7c26336c09a24d31f14fa0" dependencies = [ - "core-graphics 0.24.0", "crossbeam-channel", - "dirs 5.0.1", + "dirs 6.0.0", "libappindicator", "muda", - "objc2", - "objc2-app-kit", - "objc2-foundation", + "objc2 0.6.1", + "objc2-app-kit 0.3.1", + "objc2-core-foundation", + "objc2-core-graphics", + "objc2-foundation 0.3.1", "once_cell", "png", "serde", - "thiserror 1.0.64", + "thiserror 2.0.12", "windows-sys 0.59.0", ] @@ -9895,21 +10064,20 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tungstenite" -version = "0.23.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" +checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13" dependencies = [ - "byteorder", "bytes", "data-encoding", "http 1.1.0", "httparse", "log", - "rand 0.8.5", - "rustls 0.23.13", + "rand 0.9.1", + "rustls 0.23.26", "rustls-pki-types", "sha1 0.10.6", - "thiserror 1.0.64", + "thiserror 2.0.12", "utf-8", ] @@ -10035,10 +10203,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] -name = "unicode_categories" -version = "0.1.1" +name = "unicode-width" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" [[package]] name = "untrusted" @@ -10061,7 +10229,7 @@ dependencies = [ "base64 0.22.1", "log", "once_cell", - "rustls 0.23.13", + "rustls 0.23.26", "rustls-pki-types", "url", "webpki-roots 0.26.6", @@ -10132,12 +10300,13 @@ dependencies = [ [[package]] name = "uuid" -version = "1.12.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "744018581f9a3454a9e15beb8a33b017183f1e7c0cd170232a2d1453b23a51c4" +checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" dependencies = [ - "getrandom 0.2.15", - "rand 0.8.5", + "getrandom 0.3.2", + "js-sys", + "rand 0.9.1", "serde", "wasm-bindgen", ] @@ -10217,12 +10386,12 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "versions" -version = "5.0.1" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c73a36bc44e3039f51fbee93e39f41225f6b17b380eb70cc2aab942df06b34dd" +checksum = "80a7e511ce1795821207a837b7b1c8d8aca0c648810966ad200446ae58f6667f" dependencies = [ - "itertools 0.11.0", - "nom", + "itertools 0.14.0", + "nom 8.0.0", ] [[package]] @@ -10305,24 +10474,24 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", "syn 2.0.90", @@ -10343,9 +10512,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -10353,9 +10522,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", @@ -10366,9 +10535,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "wasm-streams" @@ -10403,7 +10575,7 @@ version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b66249d3fc69f76fd74c82cc319300faa554e9d865dab1f7cd66cc20db10b280" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "rustix 0.38.37", "wayland-backend", "wayland-scanner", @@ -10415,7 +10587,7 @@ version = "0.32.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cd0ade57c4e6e9a8952741325c30bf82f4246885dca8bf561898b86d0c1f58e" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "wayland-backend", "wayland-client", "wayland-scanner", @@ -10454,18 +10626,28 @@ dependencies = [ ] [[package]] -name = "webbrowser" -version = "0.8.15" +name = "web-time" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db67ae75a9405634f5882791678772c94ff5f16a66535aae186e26aa0841fc8b" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ - "core-foundation 0.9.4", + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webbrowser" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5df295f8451142f1856b1bd86a606dfe9587d439bc036e319c827700dbd555e" +dependencies = [ + "core-foundation 0.10.0", "home", "jni", "log", "ndk-context", - "objc", - "raw-window-handle 0.5.2", + "objc2 0.6.1", + "objc2-foundation 0.3.1", "url", "web-sys", ] @@ -10560,16 +10742,16 @@ dependencies = [ [[package]] name = "webview2-com" -version = "0.33.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61ff3d9d0ee4efcb461b14eb3acfda2702d10dc329f339303fc3e57215ae2c" +checksum = "b542b5cfbd9618c46c2784e4d41ba218c336ac70d44c55e47b251033e7d85601" dependencies = [ "webview2-com-macros", "webview2-com-sys", - "windows 0.58.0", - "windows-core 0.58.0", - "windows-implement", - "windows-interface", + "windows 0.61.1", + "windows-core 0.61.0", + "windows-implement 0.60.0", + "windows-interface 0.59.1", ] [[package]] @@ -10585,13 +10767,13 @@ dependencies = [ [[package]] name = "webview2-com-sys" -version = "0.33.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3a3e2eeb58f82361c93f9777014668eb3d07e7d174ee4c819575a9208011886" +checksum = "8ae2d11c4a686e4409659d7891791254cf9286d3cfe0eef54df1523533d22295" dependencies = [ - "thiserror 1.0.64", - "windows 0.58.0", - "windows-core 0.58.0", + "thiserror 2.0.12", + "windows 0.61.1", + "windows-core 0.61.0", ] [[package]] @@ -10612,21 +10794,21 @@ dependencies = [ [[package]] name = "which" -version = "4.4.2" +version = "7.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +checksum = "24d643ce3fd3e5b54854602a080f34fb10ab75e0b813ee32d00ca2b44fa74762" dependencies = [ "either", - "home", - "once_cell", - "rustix 0.38.37", + "env_home", + "rustix 1.0.5", + "winsafe", ] [[package]] name = "whoami" -version = "1.5.2" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d" +checksum = "6994d13118ab492c3c80c1f81928718159254c53c472bf9ce36f8dae4add02a7" dependencies = [ "redox_syscall", "wasite", @@ -10684,13 +10866,14 @@ dependencies = [ [[package]] name = "window-vibrancy" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ea403deff7b51fff19e261330f71608ff2cdef5721d72b64180bb95be7c4150" +checksum = "d9bec5a31f3f9362f2258fd0e9c9dd61a9ca432e7306cc78c444258f0dce9a9c" dependencies = [ - "objc2", - "objc2-app-kit", - "objc2-foundation", + "objc2 0.6.1", + "objc2-app-kit 0.3.1", + "objc2-core-foundation", + "objc2-foundation 0.3.1", "raw-window-handle 0.6.2", "windows-sys 0.59.0", "windows-version", @@ -10716,6 +10899,50 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows" +version = "0.60.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddf874e74c7a99773e62b1c671427abf01a425e77c3d3fb9fb1e4883ea934529" +dependencies = [ + "windows-collections 0.1.1", + "windows-core 0.60.1", + "windows-future 0.1.1", + "windows-link", + "windows-numerics 0.1.1", +] + +[[package]] +name = "windows" +version = "0.61.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5ee8f3d025738cb02bad7868bbb5f8a6327501e870bf51f1b455b0a2454a419" +dependencies = [ + "windows-collections 0.2.0", + "windows-core 0.61.0", + "windows-future 0.2.0", + "windows-link", + "windows-numerics 0.2.0", +] + +[[package]] +name = "windows-collections" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5467f79cc1ba3f52ebb2ed41dbb459b8e7db636cc3429458d9a852e15bc24dec" +dependencies = [ + "windows-core 0.60.1", +] + +[[package]] +name = "windows-collections" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8" +dependencies = [ + "windows-core 0.61.0", +] + [[package]] name = "windows-core" version = "0.52.0" @@ -10731,13 +10958,59 @@ version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" dependencies = [ - "windows-implement", - "windows-interface", - "windows-result", + "windows-implement 0.58.0", + "windows-interface 0.58.0", + "windows-result 0.2.0", "windows-strings 0.1.0", "windows-targets 0.52.6", ] +[[package]] +name = "windows-core" +version = "0.60.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca21a92a9cae9bf4ccae5cf8368dce0837100ddf6e6d57936749e85f152f6247" +dependencies = [ + "windows-implement 0.59.0", + "windows-interface 0.59.1", + "windows-link", + "windows-result 0.3.2", + "windows-strings 0.3.1", +] + +[[package]] +name = "windows-core" +version = "0.61.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980" +dependencies = [ + "windows-implement 0.60.0", + "windows-interface 0.59.1", + "windows-link", + "windows-result 0.3.2", + "windows-strings 0.4.0", +] + +[[package]] +name = "windows-future" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a787db4595e7eb80239b74ce8babfb1363d8e343ab072f2ffe901400c03349f0" +dependencies = [ + "windows-core 0.60.1", + "windows-link", +] + +[[package]] +name = "windows-future" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a1d6bbefcb7b60acd19828e1bc965da6fcf18a7e39490c5f8be71e54a19ba32" +dependencies = [ + "windows-core 0.61.0", + "windows-link", +] + [[package]] name = "windows-implement" version = "0.58.0" @@ -10749,6 +11022,28 @@ dependencies = [ "syn 2.0.90", ] +[[package]] +name = "windows-implement" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83577b051e2f49a058c308f17f273b570a6a758386fc291b5f6a934dd84e48c1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + +[[package]] +name = "windows-implement" +version = "0.60.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "windows-interface" version = "0.58.0" @@ -10761,25 +11056,62 @@ dependencies = [ ] [[package]] -name = "windows-registry" +name = "windows-interface" +version = "0.59.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + +[[package]] +name = "windows-link" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" + +[[package]] +name = "windows-numerics" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "005dea54e2f6499f2cee279b8f703b3cf3b5734a2d8d21867c8f44003182eeed" +dependencies = [ + "windows-core 0.60.1", + "windows-link", +] + +[[package]] +name = "windows-numerics" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1" dependencies = [ - "windows-result", - "windows-strings 0.1.0", - "windows-targets 0.52.6", + "windows-core 0.61.0", + "windows-link", ] [[package]] name = "windows-registry" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bafa604f2104cf5ae2cc2db1dee84b7e6a5d11b05f737b60def0ffdc398cbc0a" +checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3" dependencies = [ - "windows-result", - "windows-strings 0.2.0", - "windows-targets 0.52.6", + "windows-result 0.3.2", + "windows-strings 0.3.1", + "windows-targets 0.53.0", +] + +[[package]] +name = "windows-registry" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1da3e436dc7653dfdf3da67332e22bff09bb0e28b0239e1624499c7830842e" +dependencies = [ + "windows-link", + "windows-result 0.3.2", + "windows-strings 0.4.0", ] [[package]] @@ -10791,23 +11123,41 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-result" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252" +dependencies = [ + "windows-link", +] + [[package]] name = "windows-strings" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" dependencies = [ - "windows-result", + "windows-result 0.2.0", "windows-targets 0.52.6", ] [[package]] name = "windows-strings" -version = "0.2.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978d65aedf914c664c510d9de43c8fd85ca745eaff1ed53edf409b479e441663" +checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319" dependencies = [ - "windows-targets 0.52.6", + "windows-link", +] + +[[package]] +name = "windows-strings" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97" +dependencies = [ + "windows-link", ] [[package]] @@ -10885,13 +11235,29 @@ dependencies = [ "windows_aarch64_gnullvm 0.52.6", "windows_aarch64_msvc 0.52.6", "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", + "windows_i686_gnullvm 0.52.6", "windows_i686_msvc 0.52.6", "windows_x86_64_gnu 0.52.6", "windows_x86_64_gnullvm 0.52.6", "windows_x86_64_msvc 0.52.6", ] +[[package]] +name = "windows-targets" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b" +dependencies = [ + "windows_aarch64_gnullvm 0.53.0", + "windows_aarch64_msvc 0.53.0", + "windows_i686_gnu 0.53.0", + "windows_i686_gnullvm 0.53.0", + "windows_i686_msvc 0.53.0", + "windows_x86_64_gnu 0.53.0", + "windows_x86_64_gnullvm 0.53.0", + "windows_x86_64_msvc 0.53.0", +] + [[package]] name = "windows-version" version = "0.1.1" @@ -10919,6 +11285,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" + [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -10937,6 +11309,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" + [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -10955,12 +11333,24 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +[[package]] +name = "windows_i686_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" + [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" + [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -10979,6 +11369,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_i686_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" + [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -10997,6 +11393,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" @@ -11015,6 +11417,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" + [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -11033,6 +11441,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" + [[package]] name = "winnow" version = "0.5.40" @@ -11071,13 +11485,29 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "winreg" +version = "0.55.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb5a765337c50e9ec252c2069be9bf91c7df47afb103b642ba3a53bf8101be97" +dependencies = [ + "cfg-if", + "windows-sys 0.59.0", +] + +[[package]] +name = "winsafe" +version = "0.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" + [[package]] name = "wit-bindgen-rt" version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", ] [[package]] @@ -11104,16 +11534,15 @@ checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" [[package]] name = "wry" -version = "0.47.2" -source = "git+https://github.com/modrinth/wry?rev=51907c6#51907c61541f2e389856f07773a32bac04f9a843" +version = "0.51.2" +source = "git+https://github.com/modrinth/wry?rev=cafdaa9#cafdaa95068221787dd43d14dbd95a6a50bd88b5" dependencies = [ "base64 0.22.1", - "block2", + "block2 0.6.1", "cookie 0.18.1", "crossbeam-channel", "dpi", "dunce", - "gdkx11", "gtk", "html5ever", "http 1.1.0", @@ -11122,26 +11551,26 @@ dependencies = [ "kuchikiki", "libc", "ndk", - "objc2", - "objc2-app-kit", - "objc2-foundation", + "objc2 0.6.1", + "objc2-app-kit 0.3.1", + "objc2-core-foundation", + "objc2-foundation 0.3.1", "objc2-ui-kit", "objc2-web-kit", "once_cell", "percent-encoding", "raw-window-handle 0.6.2", - "sha2 0.10.8", + "sha2 0.10.9", "soup3", "tao-macros", - "thiserror 1.0.64", + "thiserror 2.0.12", "url", "webkit2gtk", "webkit2gtk-sys", "webview2-com", - "windows 0.58.0", - "windows-core 0.58.0", + "windows 0.61.1", + "windows-core 0.61.0", "windows-version", - "x11-dl", ] [[package]] @@ -11244,7 +11673,7 @@ checksum = "b0144f1a16a199846cb21024da74edd930b43443463292f536b7110b4855b5c6" dependencies = [ "form_urlencoded", "serde", - "thiserror 1.0.64", + "thiserror 1.0.69", ] [[package]] @@ -11273,9 +11702,9 @@ dependencies = [ [[package]] name = "zbus" -version = "4.4.0" +version = "5.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" +checksum = "1162094dc63b1629fcc44150bcceeaa80798cd28bcbe7fa987b65a034c258608" dependencies = [ "async-broadcast", "async-executor", @@ -11290,37 +11719,6 @@ dependencies = [ "enumflags2", "event-listener 5.3.1", "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix", - "ordered-stream", - "rand 0.8.5", - "serde", - "serde_repr", - "sha1 0.10.6", - "static_assertions", - "tracing", - "uds_windows", - "windows-sys 0.52.0", - "xdg-home", - "zbus_macros 4.4.0", - "zbus_names 3.0.0", - "zvariant 4.2.0", -] - -[[package]] -name = "zbus" -version = "5.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1162094dc63b1629fcc44150bcceeaa80798cd28bcbe7fa987b65a034c258608" -dependencies = [ - "async-broadcast", - "async-recursion", - "async-trait", - "enumflags2", - "event-listener 5.3.1", - "futures-core", "futures-util", "hex", "nix", @@ -11334,22 +11732,9 @@ dependencies = [ "windows-sys 0.59.0", "winnow 0.6.20", "xdg-home", - "zbus_macros 5.1.1", - "zbus_names 4.1.0", - "zvariant 5.1.0", -] - -[[package]] -name = "zbus_macros" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" -dependencies = [ - "proc-macro-crate 3.2.0", - "proc-macro2", - "quote", - "syn 2.0.90", - "zvariant_utils 2.1.0", + "zbus_macros", + "zbus_names", + "zvariant", ] [[package]] @@ -11362,20 +11747,9 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.90", - "zbus_names 4.1.0", - "zvariant 5.1.0", - "zvariant_utils 3.0.2", -] - -[[package]] -name = "zbus_names" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" -dependencies = [ - "serde", - "static_assertions", - "zvariant 4.2.0", + "zbus_names", + "zvariant", + "zvariant_utils", ] [[package]] @@ -11387,7 +11761,7 @@ dependencies = [ "serde", "static_assertions", "winnow 0.6.20", - "zvariant 5.1.0", + "zvariant", ] [[package]] @@ -11397,16 +11771,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "byteorder", - "zerocopy-derive 0.7.35", -] - -[[package]] -name = "zerocopy" -version = "0.8.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879" -dependencies = [ - "zerocopy-derive 0.8.24", + "zerocopy-derive", ] [[package]] @@ -11420,17 +11785,6 @@ dependencies = [ "syn 2.0.90", ] -[[package]] -name = "zerocopy-derive" -version = "0.8.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", -] - [[package]] name = "zerofrom" version = "0.1.4" @@ -11457,6 +11811,20 @@ name = "zeroize" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] [[package]] name = "zerovec" @@ -11488,13 +11856,13 @@ checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ "aes", "byteorder", - "bzip2", + "bzip2 0.4.4", "constant_time_eq 0.1.5", "crc32fast", "crossbeam-utils", "flate2", "hmac 0.12.1", - "pbkdf2", + "pbkdf2 0.11.0", "sha1 0.10.6", "time", "zstd 0.11.2+zstd.1.5.2", @@ -11502,17 +11870,42 @@ dependencies = [ [[package]] name = "zip" -version = "2.2.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494" +checksum = "1dcb24d0152526ae49b9b96c1dcf71850ca1e0b882e4e28ed898a93c41334744" dependencies = [ + "aes", "arbitrary", + "bzip2 0.5.2", + "constant_time_eq 0.3.1", "crc32fast", "crossbeam-utils", - "displaydoc", + "deflate64", + "flate2", + "getrandom 0.3.2", + "hmac 0.12.1", "indexmap 2.5.0", + "lzma-rs", "memchr", - "thiserror 1.0.64", + "pbkdf2 0.12.2", + "sha1 0.10.6", + "time", + "xz2", + "zeroize", + "zopfli", + "zstd 0.13.2", +] + +[[package]] +name = "zopfli" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edfc5ee405f504cd4984ecc6f14d02d55cfda60fa4b689434ef4102aae150cd7" +dependencies = [ + "bumpalo", + "crc32fast", + "log", + "simd-adler32", ] [[package]] @@ -11571,19 +11964,6 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "zvariant" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" -dependencies = [ - "endi", - "enumflags2", - "serde", - "static_assertions", - "zvariant_derive 4.2.0", -] - [[package]] name = "zvariant" version = "5.1.0" @@ -11596,21 +11976,8 @@ dependencies = [ "static_assertions", "url", "winnow 0.6.20", - "zvariant_derive 5.1.0", - "zvariant_utils 3.0.2", -] - -[[package]] -name = "zvariant_derive" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" -dependencies = [ - "proc-macro-crate 3.2.0", - "proc-macro2", - "quote", - "syn 2.0.90", - "zvariant_utils 2.1.0", + "zvariant_derive", + "zvariant_utils", ] [[package]] @@ -11623,18 +11990,7 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.90", - "zvariant_utils 3.0.2", -] - -[[package]] -name = "zvariant_utils" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", + "zvariant_utils", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 97d69a241..07e7935d4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,4 +22,4 @@ strip = true # Remove debug symbols opt-level = 3 [patch.crates-io] -wry = { git = "https://github.com/modrinth/wry", rev = "51907c6" } +wry = { git = "https://github.com/modrinth/wry", rev = "cafdaa9" } diff --git a/apps/app-playground/Cargo.toml b/apps/app-playground/Cargo.toml index 6737c2671..911278606 100644 --- a/apps/app-playground/Cargo.toml +++ b/apps/app-playground/Cargo.toml @@ -1,14 +1,14 @@ [package] name = "theseus_playground" version = "0.0.0" -edition = "2021" +edition = "2024" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] theseus = { path = "../../packages/app-lib", features = ["cli"] } tokio = { version = "1", features = ["full"] } -webbrowser = "0.8.13" +webbrowser = "1.0.4" enumset = "1.1" tracing = "0.1.37" diff --git a/apps/app/Cargo.toml b/apps/app/Cargo.toml index 19a489c9c..5786182bd 100644 --- a/apps/app/Cargo.toml +++ b/apps/app/Cargo.toml @@ -4,11 +4,11 @@ version = "0.9.5" description = "The Modrinth App is a desktop application for managing your Minecraft mods" license = "GPL-3.0-only" repository = "https://github.com/modrinth/code/apps/app/" -edition = "2021" +edition = "2024" build = "build.rs" [build-dependencies] -tauri-build = { version = "2.0.3", features = ["codegen"] } +tauri-build = { version = "2.2.0", features = ["codegen"] } [dependencies] theseus = { path = "../../packages/app-lib", features = ["tauri"] } @@ -17,17 +17,17 @@ serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } serde_with = "3.0.0" -tauri = { version = "2.1.1", features = ["devtools", "macos-private-api", "protocol-asset", "unstable"] } +tauri = { version = "2.5.1", features = ["devtools", "macos-private-api", "protocol-asset", "unstable"] } tauri-plugin-window-state = "2.2.0" tauri-plugin-deep-link = "2.2.0" tauri-plugin-os = "2.2.0" -tauri-plugin-opener = "2.2.1" +tauri-plugin-opener = "2.2.6" tauri-plugin-dialog = "2.2.0" tauri-plugin-updater = { version = "2.3.0" } tauri-plugin-single-instance = { version = "2.2.0" } tokio = { version = "1", features = ["full"] } -thiserror = "1.0" +thiserror = "2.0.12" daedalus = { path = "../../packages/daedalus" } chrono = "0.4.26" either = "1.15" @@ -46,15 +46,15 @@ enumset = { version = "1.1", features = ["serde"] } opener = { version = "0.7.2", features = ["reveal", "dbus-vendored"] } -native-dialog = "0.7.0" +native-dialog = "0.9.0" [target.'cfg(not(target_os = "linux"))'.dependencies] window-shadows = "0.2.1" [target.'cfg(target_os = "macos")'.dependencies] -cocoa = "0.25.0" +cocoa = "0.26.0" objc = "0.2.7" -rand = "0.8.5" +rand = "0.9.1" [target.'cfg(target_os = "linux")'.dependencies] tauri-plugin-updater = { version = "2.3.0", optional = true, features = ["native-tls-vendored", "zip"], default-features = false } diff --git a/apps/app/src/api/utils.rs b/apps/app/src/api/utils.rs index 2c906d124..cb20d87c8 100644 --- a/apps/app/src/api/utils.rs +++ b/apps/app/src/api/utils.rs @@ -47,8 +47,8 @@ pub enum OS { // Create a new HashMap with the same keys // Values provided should not be used directly, as they are not guaranteed to be up-to-date #[tauri::command] -pub async fn progress_bars_list( -) -> Result> { +pub async fn progress_bars_list() +-> Result> { let res = theseus::EventState::list_progress_bars().await?; Ok(res) } diff --git a/apps/app/src/api/worlds.rs b/apps/app/src/api/worlds.rs index 30af5537f..f72f738b8 100644 --- a/apps/app/src/api/worlds.rs +++ b/apps/app/src/api/worlds.rs @@ -3,7 +3,7 @@ use either::Either; use enumset::EnumSet; use tauri::{AppHandle, Manager, Runtime}; use theseus::prelude::ProcessMetadata; -use theseus::profile::{get_full_path, QuickPlayType}; +use theseus::profile::{QuickPlayType, get_full_path}; use theseus::worlds::{ DisplayStatus, ServerPackStatus, ServerStatus, World, WorldType, WorldWithProfile, diff --git a/apps/app/src/macos/window_ext.rs b/apps/app/src/macos/window_ext.rs index 8a2d9e15a..0e3975509 100644 --- a/apps/app/src/macos/window_ext.rs +++ b/apps/app/src/macos/window_ext.rs @@ -1,9 +1,9 @@ // Stolen from https://gist.github.com/charrondev/43150e940bd2771b1ea88256d491c7a9 use objc::{msg_send, sel, sel_impl}; -use rand::{distributions::Alphanumeric, Rng}; +use rand::{Rng, distributions::Alphanumeric}; use tauri::{ - plugin::{Builder, TauriPlugin}, Emitter, Runtime, Window, + plugin::{Builder, TauriPlugin}, }; // 0.8 const WINDOW_CONTROL_PAD_X: f64 = 9.0; @@ -73,7 +73,7 @@ struct WindowState { #[cfg(target_os = "macos")] pub fn setup_traffic_light_positioner(window: Window) { use cocoa::appkit::NSWindow; - use cocoa::base::{id, BOOL}; + use cocoa::base::{BOOL, id}; use cocoa::foundation::NSUInteger; use objc::runtime::{Object, Sel}; use std::ffi::c_void; @@ -371,7 +371,7 @@ pub fn setup_traffic_light_positioner(window: Window) { let app_state = WindowState { window }; let app_box = Box::into_raw(Box::new(app_state)) as *mut c_void; - let random_str: String = rand::thread_rng() + let random_str: String = rand::rng() .sample_iter(&Alphanumeric) .take(20) .map(char::from) diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs index b248fac97..134d34bfe 100644 --- a/apps/app/src/main.rs +++ b/apps/app/src/main.rs @@ -3,7 +3,7 @@ windows_subsystem = "windows" )] -use native_dialog::{MessageDialog, MessageType}; +use native_dialog::{DialogBuilder, MessageLevel}; use std::env; use tauri::{Listener, Manager}; use theseus::prelude::*; @@ -113,13 +113,14 @@ async fn initialize_state(app: tauri::AppHandle) -> api::Result<()> { fn show_window(app: tauri::AppHandle) { let win = app.get_window("main").unwrap(); if let Err(e) = win.show() { - MessageDialog::new() - .set_type(MessageType::Error) + DialogBuilder::message() + .set_level(MessageLevel::Error) .set_title("Initialization error") - .set_text(&format!( + .set_text(format!( "Cannot display application window due to an error:\n{e}" )) - .show_alert() + .alert() + .show() .unwrap(); panic!("cannot display application window") } else { @@ -321,24 +322,26 @@ fn main() { if format!("{e:?}").contains( "Runtime(CreateWebview(WebView2Error(WindowsError", ) { - MessageDialog::new() - .set_type(MessageType::Error) + DialogBuilder::message() + .set_level(MessageLevel::Error) .set_title("Initialization error") .set_text("Your Microsoft Edge WebView2 installation is corrupt.\n\nMicrosoft Edge WebView2 is required to run Modrinth App.\n\nLearn how to repair it at https://support.modrinth.com/en/articles/8797765-corrupted-microsoft-edge-webview2-installation") - .show_alert() + .alert() + .show() .unwrap(); panic!("webview2 initialization failed") } } - MessageDialog::new() - .set_type(MessageType::Error) + DialogBuilder::message() + .set_level(MessageLevel::Error) .set_title("Initialization error") - .set_text(&format!( + .set_text(format!( "Cannot initialize application due to an error:\n{e:?}" )) - .show_alert() + .alert() + .show() .unwrap(); tracing::error!("Error while running tauri application: {:?}", e); diff --git a/packages/app-lib/Cargo.toml b/packages/app-lib/Cargo.toml index e66007416..3edf70181 100644 --- a/packages/app-lib/Cargo.toml +++ b/packages/app-lib/Cargo.toml @@ -2,7 +2,7 @@ name = "theseus" version = "0.9.5" authors = ["Jai A "] -edition = "2021" +edition = "2024" [dependencies] bytes = "1" @@ -13,9 +13,9 @@ sha1_smol = { version = "1.0.0", features = ["std"] } sha2 = "0.10.8" url = { version = "2.2", features = ["serde"] } uuid = { version = "1.1", features = ["serde", "v4"] } -zip = "0.6.5" +zip = "2.6.1" async_zip = { version = "0.0.17", features = ["chrono", "tokio-fs", "deflate", "bzip2", "zstd", "deflate64"] } -flate2 = "1.0.28" +flate2 = "1.1.1" tempfile = "3.5.0" dashmap = { version = "6.0.1", features = ["serde"] } quick-xml = { version = "0.37", features = ["async-tokio"] } @@ -23,12 +23,12 @@ enumset = "1.1" chrono = { version = "0.4.19", features = ["serde"] } daedalus = { path = "../../packages/daedalus" } -dirs = "5.0.1" +dirs = "6.0.0" regex = "1.5" sys-info = "0.9.0" -sysinfo = "0.30.8" -thiserror = "1.0" +sysinfo = "0.35.0" +thiserror = "2.0.12" either = "1.13" tracing = "0.1.37" @@ -37,10 +37,10 @@ tracing-error = "0.2.0" paste = { version = "1.0" } -tauri = { version = "2.0.0-rc", optional = true } +tauri = { version = "2.5.1", optional = true } indicatif = { version = "0.17.3", optional = true } -async-tungstenite = { version = "0.27.0", features = ["tokio-runtime", "tokio-rustls-webpki-roots"] } +async-tungstenite = { version = "0.29.1", features = ["tokio-runtime", "tokio-rustls-webpki-roots"] } futures = "0.3" reqwest = { version = "0.12.3", features = ["json", "stream", "deflate", "gzip", "brotli", "rustls-tls", "charset", "http2", "macos-system-configuration"], default-features = false } tokio = { version = "1", features = ["full"] } @@ -50,8 +50,8 @@ fs4 = { version = "0.13", features = ["tokio"] } async-walkdir = "2.1" async-compression = { version = "0.4", default-features = false, features = ["tokio", "gzip"] } -notify = { version = "6.1.1", default-features = false } -notify-debouncer-mini = { version = "0.4.1", default-features = false } +notify = { version = "8.0.0", default-features = false } +notify-debouncer-mini = { version = "0.6.0", default-features = false } lazy_static = "1.4.0" dunce = "1.0.3" @@ -73,7 +73,7 @@ hickory-resolver = "0.25" ariadne = { path = "../ariadne" } [target.'cfg(windows)'.dependencies] -winreg = "0.52.0" +winreg = "0.55.0" [features] tauri = ["dep:tauri"] diff --git a/packages/app-lib/src/api/handler.rs b/packages/app-lib/src/api/handler.rs index fd6b766ec..67e36b2f1 100644 --- a/packages/app-lib/src/api/handler.rs +++ b/packages/app-lib/src/api/handler.rs @@ -2,8 +2,8 @@ use std::path::PathBuf; use crate::{ event::{ - emit::{emit_command, emit_warning}, CommandPayload, + emit::{emit_command, emit_warning}, }, util::io, }; diff --git a/packages/app-lib/src/api/jre.rs b/packages/app-lib/src/api/jre.rs index df511169d..16ebf79f3 100644 --- a/packages/app-lib/src/api/jre.rs +++ b/packages/app-lib/src/api/jre.rs @@ -10,8 +10,8 @@ use std::path::PathBuf; use crate::util::io; use crate::util::jre::extract_java_majorminor_version; use crate::{ - util::jre::{self}, LoadingBarType, State, + util::jre::{self}, }; pub async fn get_java_versions() -> crate::Result> { diff --git a/packages/app-lib/src/api/logs.rs b/packages/app-lib/src/api/logs.rs index 8e173fd7c..7d24418b5 100644 --- a/packages/app-lib/src/api/logs.rs +++ b/packages/app-lib/src/api/logs.rs @@ -9,9 +9,9 @@ use tokio::{ }; use crate::{ + State, prelude::Credentials, util::io::{self, IOError}, - State, }; #[derive(Serialize, Debug)] diff --git a/packages/app-lib/src/api/metadata.rs b/packages/app-lib/src/api/metadata.rs index 3cd914b48..59b3b89c5 100644 --- a/packages/app-lib/src/api/metadata.rs +++ b/packages/app-lib/src/api/metadata.rs @@ -1,5 +1,5 @@ -use crate::state::CachedEntry; use crate::State; +use crate::state::CachedEntry; pub use daedalus::minecraft::VersionManifest; pub use daedalus::modded::Manifest; diff --git a/packages/app-lib/src/api/minecraft_auth.rs b/packages/app-lib/src/api/minecraft_auth.rs index 9f4a87ad8..4fa75a4c8 100644 --- a/packages/app-lib/src/api/minecraft_auth.rs +++ b/packages/app-lib/src/api/minecraft_auth.rs @@ -1,7 +1,7 @@ //! Authentication flow interface -use crate::state::{Credentials, MinecraftLoginFlow}; use crate::State; +use crate::state::{Credentials, MinecraftLoginFlow}; #[tracing::instrument] pub async fn begin_login() -> crate::Result { diff --git a/packages/app-lib/src/api/mod.rs b/packages/app-lib/src/api/mod.rs index 3c142edc1..421d805c1 100644 --- a/packages/app-lib/src/api/mod.rs +++ b/packages/app-lib/src/api/mod.rs @@ -27,12 +27,12 @@ pub mod data { pub mod prelude { pub use crate::{ + State, data::*, event::CommandPayload, jre, metadata, minecraft_auth, mr_auth, pack, process, - profile::{self, create, Profile}, + profile::{self, Profile, create}, settings, - util::io::{canonicalize, IOError}, - State, + util::io::{IOError, canonicalize}, }; } diff --git a/packages/app-lib/src/api/pack/import/atlauncher.rs b/packages/app-lib/src/api/pack/import/atlauncher.rs index e37d71f5e..f6dabca4c 100644 --- a/packages/app-lib/src/api/pack/import/atlauncher.rs +++ b/packages/app-lib/src/api/pack/import/atlauncher.rs @@ -3,6 +3,7 @@ use std::{collections::HashMap, path::PathBuf}; use serde::{Deserialize, Serialize}; use crate::{ + State, pack::{ self, import::{self, copy_dotminecraft}, @@ -11,7 +12,6 @@ use crate::{ prelude::ModLoader, state::{LinkedData, ProfileInstallStage}, util::io, - State, }; #[derive(Serialize, Deserialize)] diff --git a/packages/app-lib/src/api/pack/import/curseforge.rs b/packages/app-lib/src/api/pack/import/curseforge.rs index 9aac5992f..1c0819e4b 100644 --- a/packages/app-lib/src/api/pack/import/curseforge.rs +++ b/packages/app-lib/src/api/pack/import/curseforge.rs @@ -3,13 +3,13 @@ use std::path::PathBuf; use serde::{Deserialize, Serialize}; use crate::{ + State, prelude::ModLoader, state::ProfileInstallStage, util::{ fetch::{fetch, write_cached_icon}, io, }, - State, }; use super::{copy_dotminecraft, recache_icon}; diff --git a/packages/app-lib/src/api/pack/import/gdlauncher.rs b/packages/app-lib/src/api/pack/import/gdlauncher.rs index b6481e596..307301014 100644 --- a/packages/app-lib/src/api/pack/import/gdlauncher.rs +++ b/packages/app-lib/src/api/pack/import/gdlauncher.rs @@ -2,7 +2,7 @@ use std::path::PathBuf; use serde::{Deserialize, Serialize}; -use crate::{prelude::ModLoader, state::ProfileInstallStage, util::io, State}; +use crate::{State, prelude::ModLoader, state::ProfileInstallStage, util::io}; use super::{copy_dotminecraft, recache_icon}; diff --git a/packages/app-lib/src/api/pack/import/mmc.rs b/packages/app-lib/src/api/pack/import/mmc.rs index dcc15d304..94083be88 100644 --- a/packages/app-lib/src/api/pack/import/mmc.rs +++ b/packages/app-lib/src/api/pack/import/mmc.rs @@ -1,14 +1,14 @@ use std::path::{Path, PathBuf}; -use serde::{de, Deserialize, Serialize}; +use serde::{Deserialize, Serialize, de}; use crate::{ + State, pack::{ import::{self, copy_dotminecraft}, install_from::{self, CreatePackDescription, PackDependency}, }, util::io, - State, }; // instance.cfg diff --git a/packages/app-lib/src/api/pack/import/mod.rs b/packages/app-lib/src/api/pack/import/mod.rs index be25b1b95..1f79d5e5b 100644 --- a/packages/app-lib/src/api/pack/import/mod.rs +++ b/packages/app-lib/src/api/pack/import/mod.rs @@ -8,8 +8,8 @@ use serde::{Deserialize, Serialize}; use crate::{ event::{ - emit::{emit_loading, init_or_edit_loading}, LoadingBarId, + emit::{emit_loading, init_or_edit_loading}, }, util::{ fetch::{self, IoSemaphore}, @@ -71,7 +71,7 @@ pub async fn get_importable_instances( return Err(crate::ErrorKind::InputError( "Launcher type Unknown".to_string(), ) - .into()) + .into()); } }; @@ -187,11 +187,7 @@ pub fn get_default_launcher_path( ImportLauncherType::Unknown => None, }; let path = path?; - if path.exists() { - Some(path) - } else { - None - } + if path.exists() { Some(path) } else { None } } /// Checks if this PathBuf is a valid instance for the given launcher type diff --git a/packages/app-lib/src/api/pack/install_from.rs b/packages/app-lib/src/api/pack/install_from.rs index 6b78919c2..b1f35e013 100644 --- a/packages/app-lib/src/api/pack/install_from.rs +++ b/packages/app-lib/src/api/pack/install_from.rs @@ -1,10 +1,10 @@ +use crate::State; use crate::data::ModLoader; use crate::event::emit::{emit_loading, init_loading}; use crate::event::{LoadingBarId, LoadingBarType}; use crate::state::{CachedEntry, LinkedData, ProfileInstallStage, SideType}; use crate::util::fetch::{fetch, fetch_advanced, write_cached_icon}; use crate::util::io; -use crate::State; use reqwest::Method; use serde::{Deserialize, Serialize}; diff --git a/packages/app-lib/src/api/pack/install_mrpack.rs b/packages/app-lib/src/api/pack/install_mrpack.rs index ae06e40b5..fd2b6bc5a 100644 --- a/packages/app-lib/src/api/pack/install_mrpack.rs +++ b/packages/app-lib/src/api/pack/install_mrpack.rs @@ -1,21 +1,21 @@ +use crate::event::LoadingBarType; use crate::event::emit::{ emit_loading, init_or_edit_loading, loading_try_for_each_concurrent, }; -use crate::event::LoadingBarType; use crate::pack::install_from::{ - set_profile_information, EnvType, PackFile, PackFileHash, + EnvType, PackFile, PackFileHash, set_profile_information, }; use crate::state::{ - cache_file_hash, CacheBehaviour, CachedEntry, ProfileInstallStage, SideType, + CacheBehaviour, CachedEntry, ProfileInstallStage, SideType, cache_file_hash, }; use crate::util::fetch::{fetch_mirrors, write}; use crate::util::io; -use crate::{profile, State}; +use crate::{State, profile}; use async_zip::base::read::seek::ZipFileReader; use super::install_from::{ - generate_pack_from_file, generate_pack_from_version_id, CreatePack, - CreatePackLocation, PackFormat, + CreatePack, CreatePackLocation, PackFormat, generate_pack_from_file, + generate_pack_from_version_id, }; use crate::data::ProjectType; use std::io::Cursor; diff --git a/packages/app-lib/src/api/process.rs b/packages/app-lib/src/api/process.rs index af33fbf9a..2871c0709 100644 --- a/packages/app-lib/src/api/process.rs +++ b/packages/app-lib/src/api/process.rs @@ -2,8 +2,8 @@ use crate::state::ProcessMetadata; pub use crate::{ - state::{Hooks, MemorySettings, Profile, Settings, WindowSize}, State, + state::{Hooks, MemorySettings, Profile, Settings, WindowSize}, }; use uuid::Uuid; diff --git a/packages/app-lib/src/api/profile/create.rs b/packages/app-lib/src/api/profile/create.rs index 0bdbbc814..20ec874a0 100644 --- a/packages/app-lib/src/api/profile/create.rs +++ b/packages/app-lib/src/api/profile/create.rs @@ -3,12 +3,12 @@ use crate::launcher::get_loader_version_from_profile; use crate::settings::Hooks; use crate::state::{LauncherFeatureVersion, LinkedData, ProfileInstallStage}; use crate::util::io::{self, canonicalize}; +use crate::{ErrorKind, pack, profile}; +pub use crate::{State, state::Profile}; use crate::{ - event::{emit::emit_profile, ProfilePayloadType}, + event::{ProfilePayloadType, emit::emit_profile}, prelude::ModLoader, }; -use crate::{pack, profile, ErrorKind}; -pub use crate::{state::Profile, State}; use chrono::Utc; use std::path::PathBuf; use tracing::{info, trace}; diff --git a/packages/app-lib/src/api/profile/mod.rs b/packages/app-lib/src/api/profile/mod.rs index e7cd2d00c..b1c21207d 100644 --- a/packages/app-lib/src/api/profile/mod.rs +++ b/packages/app-lib/src/api/profile/mod.rs @@ -1,9 +1,9 @@ //! Theseus profile management interface +use crate::event::LoadingBarType; use crate::event::emit::{ emit_loading, init_loading, loading_try_for_each_concurrent, }; -use crate::event::LoadingBarType; use crate::pack::install_from::{ EnvType, PackDependency, PackFile, PackFileHash, PackFormat, }; @@ -12,10 +12,10 @@ use crate::state::{ ProfileFile, ProfileInstallStage, ProjectType, SideType, }; -use crate::event::{emit::emit_profile, ProfilePayloadType}; +use crate::event::{ProfilePayloadType, emit::emit_profile}; use crate::util::fetch; use crate::util::io::{self, IOError}; -pub use crate::{state::Profile, State}; +pub use crate::{State, state::Profile}; use async_zip::tokio::write::ZipFileWriter; use async_zip::{Compression, ZipEntryBuilder}; use serde_json::json; @@ -831,7 +831,7 @@ pub async fn create_mrpack_json( return Err(crate::ErrorKind::OtherError( "Loader version mismatch".to_string(), ) - .into()) + .into()); } }; dependencies diff --git a/packages/app-lib/src/api/profile/update.rs b/packages/app-lib/src/api/profile/update.rs index ed6c1d613..5174e9f2a 100644 --- a/packages/app-lib/src/api/profile/update.rs +++ b/packages/app-lib/src/api/profile/update.rs @@ -1,13 +1,13 @@ use crate::state::CacheBehaviour; use crate::{ + LoadingBarType, event::{ - emit::{emit_profile, init_loading}, ProfilePayloadType, + emit::{emit_profile, init_loading}, }, pack::{self, install_from::generate_pack_from_version_id}, profile::get, state::ProfileInstallStage, - LoadingBarType, }; use futures::try_join; @@ -24,9 +24,9 @@ pub async fn update_managed_modrinth_version( })?; let unmanaged_err = || { - crate::ErrorKind::InputError( - format!("Profile at {profile_path} is not a managed modrinth pack, or has been disconnected."), - ) + crate::ErrorKind::InputError(format!( + "Profile at {profile_path} is not a managed modrinth pack, or has been disconnected." + )) }; // Extract modrinth pack information, if appropriate @@ -58,9 +58,9 @@ pub async fn repair_managed_modrinth(profile_path: &str) -> crate::Result<()> { })?; let unmanaged_err = || { - crate::ErrorKind::InputError( - format!("Profile at {profile_path} is not a managed modrinth pack, or has been disconnected."), - ) + crate::ErrorKind::InputError(format!( + "Profile at {profile_path} is not a managed modrinth pack, or has been disconnected." + )) }; // For repairing specifically, first we remove all installed projects (to ensure we do remove ones that aren't in the pack) diff --git a/packages/app-lib/src/api/settings.rs b/packages/app-lib/src/api/settings.rs index dba91a5de..75e34d33c 100644 --- a/packages/app-lib/src/api/settings.rs +++ b/packages/app-lib/src/api/settings.rs @@ -1,8 +1,8 @@ //! Theseus profile management interface pub use crate::{ - state::{Hooks, MemorySettings, Profile, Settings, WindowSize}, State, + state::{Hooks, MemorySettings, Profile, Settings, WindowSize}, }; /// Gets entire settings diff --git a/packages/app-lib/src/api/tags.rs b/packages/app-lib/src/api/tags.rs index ed22c1ebd..f43ad0a0b 100644 --- a/packages/app-lib/src/api/tags.rs +++ b/packages/app-lib/src/api/tags.rs @@ -1,8 +1,8 @@ //! Theseus tag management interface use crate::state::CachedEntry; pub use crate::{ - state::{Category, DonationPlatform, GameVersion, Loader}, State, + state::{Category, DonationPlatform, GameVersion, Loader}, }; /// Get category tags diff --git a/packages/app-lib/src/api/worlds.rs b/packages/app-lib/src/api/worlds.rs index 2bbef7125..246935c8a 100644 --- a/packages/app-lib/src/api/worlds.rs +++ b/packages/app-lib/src/api/worlds.rs @@ -3,13 +3,13 @@ use crate::launcher::get_loader_version_from_profile; use crate::profile::get_full_path; use crate::state::attached_world_data::AttachedWorldData; use crate::state::{ - attached_world_data, server_join_log, Profile, ProfileInstallStage, + Profile, ProfileInstallStage, attached_world_data, server_join_log, }; pub use crate::util::server_ping::{ ServerGameProfile, ServerPlayers, ServerStatus, ServerVersion, }; use crate::util::{io, server_ping}; -use crate::{launcher, Error, ErrorKind, Result, State}; +use crate::{Error, ErrorKind, Result, State, launcher}; use async_walkdir::WalkDir; use async_zip::{Compression, ZipEntryBuilder}; use chrono::{DateTime, Local, TimeZone, Utc}; @@ -743,8 +743,8 @@ pub async fn remove_server_from_profile( } mod servers_data { - use crate::util::io; use crate::Result; + use crate::util::io; use serde::{Deserialize, Serialize}; use std::path::Path; diff --git a/packages/app-lib/src/event/emit.rs b/packages/app-lib/src/event/emit.rs index 174a06c7f..e2e438618 100644 --- a/packages/app-lib/src/event/emit.rs +++ b/packages/app-lib/src/event/emit.rs @@ -161,7 +161,7 @@ pub fn emit_loading( let display_frac = loading_bar.current / loading_bar.total; let opt_display_frac = if display_frac >= 1.0 { None // by convention, when its done, we submit None - // any further updates will be ignored (also sending None) + // any further updates will be ignored (also sending None) } else { Some(display_frac) }; diff --git a/packages/app-lib/src/launcher/download.rs b/packages/app-lib/src/launcher/download.rs index 047b3a2eb..c7c73887a 100644 --- a/packages/app-lib/src/launcher/download.rs +++ b/packages/app-lib/src/launcher/download.rs @@ -4,8 +4,8 @@ use crate::launcher::parse_rules; use crate::profile::QuickPlayType; use crate::{ event::{ - emit::{emit_loading, loading_try_for_each_concurrent}, LoadingBarId, + emit::{emit_loading, loading_try_for_each_concurrent}, }, state::State, util::{fetch::*, io, platform::OsExt}, diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs index 61674a675..d3e9d90b9 100644 --- a/packages/app-lib/src/launcher/mod.rs +++ b/packages/app-lib/src/launcher/mod.rs @@ -9,7 +9,7 @@ use crate::state::{ Credentials, JavaVersion, ProcessMetadata, ProfileInstallStage, }; use crate::util::io; -use crate::{process, state as st, State}; +use crate::{State, process, state as st}; use chrono::Utc; use daedalus as d; use daedalus::minecraft::{LoggingSide, RuleAction, VersionInfo}; @@ -65,13 +65,11 @@ pub fn parse_rule( use d::minecraft::{Rule, RuleAction}; let res = match rule { - Rule { - os: Some(ref os), .. - } => { + Rule { os: Some(os), .. } => { crate::util::platform::os_rule(os, java_version, minecraft_updated) } Rule { - features: Some(ref features), + features: Some(features), .. } => { !features.is_demo_user.unwrap_or(true) diff --git a/packages/app-lib/src/lib.rs b/packages/app-lib/src/lib.rs index 523ad495d..55f4459ac 100644 --- a/packages/app-lib/src/lib.rs +++ b/packages/app-lib/src/lib.rs @@ -21,8 +21,8 @@ mod state; pub use api::*; pub use error::*; pub use event::{ - emit::emit_loading, emit::init_loading, EventState, LoadingBar, - LoadingBarType, + EventState, LoadingBar, LoadingBarType, emit::emit_loading, + emit::init_loading, }; pub use logger::start_logger; pub use state::State; diff --git a/packages/app-lib/src/state/cache.rs b/packages/app-lib/src/state/cache.rs index ca36dfce3..de42549c3 100644 --- a/packages/app-lib/src/state/cache.rs +++ b/packages/app-lib/src/state/cache.rs @@ -1,6 +1,6 @@ use crate::config::{META_URL, MODRINTH_API_URL, MODRINTH_API_URL_V3}; use crate::state::ProjectType; -use crate::util::fetch::{fetch_json, sha1_async, FetchSemaphore}; +use crate::util::fetch::{FetchSemaphore, fetch_json, sha1_async}; use chrono::{DateTime, Utc}; use dashmap::DashSet; use reqwest::Method; @@ -1285,7 +1285,7 @@ impl CachedEntry { if let Some(values) = filtered_keys.iter_mut().find(|x| { - x.0 .0 == loaders_key && x.0 .1 == game_version + x.0.0 == loaders_key && x.0.1 == game_version }) { values.1.push(hash.to_string()); diff --git a/packages/app-lib/src/state/dirs.rs b/packages/app-lib/src/state/dirs.rs index 41b032ea4..83a822f6e 100644 --- a/packages/app-lib/src/state/dirs.rs +++ b/packages/app-lib/src/state/dirs.rs @@ -1,8 +1,8 @@ //! Theseus directory information +use crate::LoadingBarType; use crate::event::emit::{emit_loading, init_loading}; use crate::state::{JavaVersion, Profile, Settings}; use crate::util::fetch::IoSemaphore; -use crate::LoadingBarType; use dashmap::DashSet; use std::path::{Path, PathBuf}; use std::sync::Arc; diff --git a/packages/app-lib/src/state/discord.rs b/packages/app-lib/src/state/discord.rs index 0b89baf3c..d54ad0cbc 100644 --- a/packages/app-lib/src/state/discord.rs +++ b/packages/app-lib/src/state/discord.rs @@ -1,13 +1,13 @@ -use std::sync::{atomic::AtomicBool, Arc}; +use std::sync::{Arc, atomic::AtomicBool}; use discord_rich_presence::{ - activity::{Activity, Assets}, DiscordIpc, DiscordIpcClient, + activity::{Activity, Assets}, }; use tokio::sync::RwLock; -use crate::state::Profile; use crate::State; +use crate::state::Profile; pub struct DiscordGuard { client: Arc>, diff --git a/packages/app-lib/src/state/friends.rs b/packages/app-lib/src/state/friends.rs index 0775b04dc..a18deb605 100644 --- a/packages/app-lib/src/state/friends.rs +++ b/packages/app-lib/src/state/friends.rs @@ -1,32 +1,33 @@ use crate::config::{MODRINTH_API_URL_V3, MODRINTH_SOCKET_URL}; use crate::data::ModrinthCredentials; -use crate::event::emit::emit_friend; use crate::event::FriendPayload; +use crate::event::emit::emit_friend; use crate::state::tunnel::InternalTunnelSocket; use crate::state::{ProcessManager, Profile, TunnelSocket}; -use crate::util::fetch::{fetch_advanced, fetch_json, FetchSemaphore}; +use crate::util::fetch::{FetchSemaphore, fetch_advanced, fetch_json}; use ariadne::networking::message::{ ClientToServerMessage, ServerToClientMessage, }; use ariadne::users::{UserId, UserStatus}; -use async_tungstenite::tokio::{connect_async, ConnectStream}; -use async_tungstenite::tungstenite::client::IntoClientRequest; -use async_tungstenite::tungstenite::Message; use async_tungstenite::WebSocketStream; +use async_tungstenite::tokio::{ConnectStream, connect_async}; +use async_tungstenite::tungstenite::Message; +use async_tungstenite::tungstenite::client::IntoClientRequest; +use bytes::Bytes; use chrono::{DateTime, Utc}; use dashmap::DashMap; use either::Either; use futures::stream::SplitSink; use futures::{SinkExt, StreamExt}; -use reqwest::header::HeaderValue; use reqwest::Method; +use reqwest::header::HeaderValue; use serde::{Deserialize, Serialize}; use std::net::SocketAddr; use std::ops::Deref; use std::sync::Arc; use tokio::io::{AsyncReadExt, AsyncWriteExt}; -use tokio::net::tcp::OwnedReadHalf; use tokio::net::TcpStream; +use tokio::net::tcp::OwnedReadHalf; use tokio::sync::{Mutex, RwLock}; use uuid::Uuid; @@ -204,7 +205,10 @@ impl FriendsSocket { } } Err(e) => { - tracing::error!("Error handling message from websocket server: {:?}", e); + tracing::error!( + "Error handling message from websocket server: {:?}", + e + ); } } } @@ -258,7 +262,7 @@ impl FriendsSocket { last_ping = Utc::now(); let mut write = state.friends_socket.write.write().await; if let Some(write) = write.as_mut() { - let _ = write.send(Message::Ping(Vec::new())).await; + let _ = write.send(Message::Ping(Bytes::new())).await; } } diff --git a/packages/app-lib/src/state/fs_watcher.rs b/packages/app-lib/src/state/fs_watcher.rs index 2e8a6ac36..d2a2ed2d8 100644 --- a/packages/app-lib/src/state/fs_watcher.rs +++ b/packages/app-lib/src/state/fs_watcher.rs @@ -1,9 +1,9 @@ -use crate::event::emit::{emit_profile, emit_warning}; use crate::event::ProfilePayloadType; +use crate::event::emit::{emit_profile, emit_warning}; use crate::state::{DirectoryInfo, ProfileInstallStage, ProjectType}; -use futures::{channel::mpsc::channel, SinkExt, StreamExt}; +use futures::{SinkExt, StreamExt, channel::mpsc::channel}; use notify::{RecommendedWatcher, RecursiveMode}; -use notify_debouncer_mini::{new_debouncer, DebounceEventResult, Debouncer}; +use notify_debouncer_mini::{DebounceEventResult, Debouncer, new_debouncer}; use std::time::Duration; use tokio::sync::RwLock; diff --git a/packages/app-lib/src/state/legacy_converter.rs b/packages/app-lib/src/state/legacy_converter.rs index cfaa54884..0fcc01ddc 100644 --- a/packages/app-lib/src/state/legacy_converter.rs +++ b/packages/app-lib/src/state/legacy_converter.rs @@ -9,7 +9,7 @@ use crate::state::{ MemorySettings, ModrinthCredentials, Profile, ProfileInstallStage, TeamMember, Theme, VersionFile, WindowSize, }; -use crate::util::fetch::{read_json, IoSemaphore}; +use crate::util::fetch::{IoSemaphore, read_json}; use chrono::{DateTime, Utc}; use p256::ecdsa::SigningKey; use p256::pkcs8::DecodePrivateKey; @@ -250,9 +250,11 @@ where .metadata .game_version .clone(), - loaders: vec![mod_loader - .as_str() - .to_string()], + loaders: vec![ + mod_loader + .as_str() + .to_string(), + ], update_version_id: update_version.id.clone(), }, diff --git a/packages/app-lib/src/state/minecraft_auth.rs b/packages/app-lib/src/state/minecraft_auth.rs index 7616feeac..45bd7ef48 100644 --- a/packages/app-lib/src/state/minecraft_auth.rs +++ b/packages/app-lib/src/state/minecraft_auth.rs @@ -1,7 +1,7 @@ -use crate::util::fetch::REQWEST_CLIENT; use crate::ErrorKind; -use base64::prelude::{BASE64_STANDARD, BASE64_URL_SAFE_NO_PAD}; +use crate::util::fetch::REQWEST_CLIENT; use base64::Engine; +use base64::prelude::{BASE64_STANDARD, BASE64_URL_SAFE_NO_PAD}; use byteorder::BigEndian; use chrono::{DateTime, Duration, TimeZone, Utc}; use dashmap::DashMap; @@ -9,10 +9,10 @@ use futures::TryStreamExt; use p256::ecdsa::signature::Signer; use p256::ecdsa::{Signature, SigningKey, VerifyingKey}; use p256::pkcs8::{DecodePrivateKey, EncodePrivateKey, LineEnding}; -use rand::rngs::OsRng; use rand::Rng; -use reqwest::header::HeaderMap; +use rand::rngs::OsRng; use reqwest::Response; +use reqwest::header::HeaderMap; use serde::de::DeserializeOwned; use serde::{Deserialize, Serialize}; use serde_json::json; @@ -1201,6 +1201,6 @@ fn get_date_header(headers: &HeaderMap) -> DateTime { fn generate_oauth_challenge() -> String { let mut rng = rand::thread_rng(); - let bytes: Vec = (0..64).map(|_| rng.gen::()).collect(); + let bytes: Vec = (0..64).map(|_| rng.r#gen::()).collect(); bytes.iter().map(|byte| format!("{byte:02x}")).collect() } diff --git a/packages/app-lib/src/state/mod.rs b/packages/app-lib/src/state/mod.rs index b3b50a856..ec6d5426e 100644 --- a/packages/app-lib/src/state/mod.rs +++ b/packages/app-lib/src/state/mod.rs @@ -111,7 +111,9 @@ impl State { /// Get the current launcher state, waiting for initialization pub async fn get() -> crate::Result> { if !LAUNCHER_STATE.initialized() { - tracing::error!("Attempted to get state before it is initialized - this should never happen!"); + tracing::error!( + "Attempted to get state before it is initialized - this should never happen!" + ); while !LAUNCHER_STATE.initialized() { tokio::time::sleep(std::time::Duration::from_millis(100)).await; } diff --git a/packages/app-lib/src/state/mr_auth.rs b/packages/app-lib/src/state/mr_auth.rs index b15de7e5d..8aab2a37d 100644 --- a/packages/app-lib/src/state/mr_auth.rs +++ b/packages/app-lib/src/state/mr_auth.rs @@ -1,6 +1,6 @@ use crate::config::{MODRINTH_API_URL, MODRINTH_URL}; use crate::state::{CacheBehaviour, CachedEntry}; -use crate::util::fetch::{fetch_advanced, FetchSemaphore}; +use crate::util::fetch::{FetchSemaphore, fetch_advanced}; use chrono::{DateTime, Duration, TimeZone, Utc}; use dashmap::DashMap; use futures::TryStreamExt; diff --git a/packages/app-lib/src/state/process.rs b/packages/app-lib/src/state/process.rs index b347408b8..324fcda4d 100644 --- a/packages/app-lib/src/state/process.rs +++ b/packages/app-lib/src/state/process.rs @@ -4,8 +4,8 @@ use crate::profile; use crate::util::io::IOError; use chrono::{DateTime, TimeZone, Utc}; use dashmap::DashMap; -use quick_xml::events::Event; use quick_xml::Reader; +use quick_xml::events::Event; use serde::Deserialize; use serde::Serialize; use std::fs::OpenOptions; @@ -345,7 +345,10 @@ impl Process { ¤t_content, ) { - tracing::error!("Failed to write throwable to log file: {}", e); + tracing::error!( + "Failed to write throwable to log file: {}", + e + ); } } } diff --git a/packages/app-lib/src/state/profiles.rs b/packages/app-lib/src/state/profiles.rs index 902eff99e..641af8356 100644 --- a/packages/app-lib/src/state/profiles.rs +++ b/packages/app-lib/src/state/profiles.rs @@ -2,10 +2,10 @@ use super::settings::{Hooks, MemorySettings, WindowSize}; use crate::profile::get_full_path; use crate::state::server_join_log::JoinLogEntry; use crate::state::{ - cache_file_hash, CacheBehaviour, CachedEntry, CachedFileHash, + CacheBehaviour, CachedEntry, CachedFileHash, cache_file_hash, }; use crate::util; -use crate::util::fetch::{write_cached_icon, FetchSemaphore, IoSemaphore}; +use crate::util::fetch::{FetchSemaphore, IoSemaphore, write_cached_icon}; use crate::util::io::{self}; use chrono::{DateTime, TimeDelta, TimeZone, Utc}; use dashmap::DashMap; diff --git a/packages/app-lib/src/state/tunnel.rs b/packages/app-lib/src/state/tunnel.rs index a6ff41ea4..86c5d59c4 100644 --- a/packages/app-lib/src/state/tunnel.rs +++ b/packages/app-lib/src/state/tunnel.rs @@ -1,5 +1,5 @@ -use crate::state::friends::{TunnelSockets, WriteSocket}; use crate::state::FriendsSocket; +use crate::state::friends::{TunnelSockets, WriteSocket}; use ariadne::networking::message::ClientToServerMessage; use std::net::SocketAddr; use std::sync::Arc; diff --git a/packages/app-lib/src/util/fetch.rs b/packages/app-lib/src/util/fetch.rs index 83dd02757..3f8391c4d 100644 --- a/packages/app-lib/src/util/fetch.rs +++ b/packages/app-lib/src/util/fetch.rs @@ -1,8 +1,8 @@ //! Functions for fetching infromation from the Internet use super::io::{self, IOError}; use crate::config::{MODRINTH_API_URL, MODRINTH_API_URL_V3}; -use crate::event::emit::emit_loading; use crate::event::LoadingBarId; +use crate::event::emit::emit_loading; use bytes::Bytes; use lazy_static::lazy_static; use reqwest::Method; diff --git a/packages/app-lib/src/util/jre.rs b/packages/app-lib/src/util/jre.rs index 11e9c316f..6369a7635 100644 --- a/packages/app-lib/src/util/jre.rs +++ b/packages/app-lib/src/util/jre.rs @@ -10,8 +10,8 @@ use tokio::task::JoinError; use crate::State; #[cfg(target_os = "windows")] use winreg::{ - enums::{HKEY_LOCAL_MACHINE, KEY_READ, KEY_WOW64_32KEY, KEY_WOW64_64KEY}, RegKey, + enums::{HKEY_LOCAL_MACHINE, KEY_READ, KEY_WOW64_32KEY, KEY_WOW64_64KEY}, }; // Entrypoint function (Windows) diff --git a/packages/app-lib/src/util/server_ping.rs b/packages/app-lib/src/util/server_ping.rs index 7a22c1a7a..852bed50b 100644 --- a/packages/app-lib/src/util/server_ping.rs +++ b/packages/app-lib/src/util/server_ping.rs @@ -1,5 +1,5 @@ -use crate::error::Result; use crate::ErrorKind; +use crate::error::Result; use serde::{Deserialize, Serialize}; use serde_json::value::RawValue; use std::time::Duration; diff --git a/packages/ariadne/Cargo.toml b/packages/ariadne/Cargo.toml index 68fac36dc..ce155d6d5 100644 --- a/packages/ariadne/Cargo.toml +++ b/packages/ariadne/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "ariadne" version = "0.1.0" -edition = "2021" +edition = "2024" [dependencies] serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -thiserror = "1.0" +thiserror = "2.0.12" uuid = { version = "1.2.2", features = ["v4", "fast-rng", "serde"] } serde_bytes = "0.11" rand = "0.8.5" diff --git a/packages/ariadne/src/ids.rs b/packages/ariadne/src/ids.rs index c7baaa7ef..be2fef96c 100644 --- a/packages/ariadne/src/ids.rs +++ b/packages/ariadne/src/ids.rs @@ -33,7 +33,7 @@ pub fn random_base62_rng_range( ) -> u64 { use rand::Rng; assert!(n_min > 0 && n_max <= 11 && n_min <= n_max); - // gen_range is [low, high): max value is `MULTIPLES[n] - 1`, + // random_range is [low, high): max value is `MULTIPLES[n] - 1`, // which is n characters long when encoded rng.gen_range(MULTIPLES[n_min - 1]..MULTIPLES[n_max]) }