From 89df28fb6aab963017041f27198a3f2a690e2012 Mon Sep 17 00:00:00 2001 From: Nikita Date: Tue, 27 Aug 2024 17:34:59 +0300 Subject: [PATCH] . --- {src-tauri => app}/.gitignore | 0 {src-tauri => app}/Cargo.lock | 2535 ++++++----------- {src-tauri => app}/Cargo.toml | 5 +- {src-tauri => app}/build.rs | 0 app/capabilities/migrated.json | 81 + {src-tauri => app}/icons/128x128.png | Bin {src-tauri => app}/icons/128x128@2x.png | Bin {src-tauri => app}/icons/32x32.png | Bin .../icons/Square107x107Logo.png | Bin .../icons/Square142x142Logo.png | Bin .../icons/Square150x150Logo.png | Bin .../icons/Square284x284Logo.png | Bin {src-tauri => app}/icons/Square30x30Logo.png | Bin .../icons/Square310x310Logo.png | Bin {src-tauri => app}/icons/Square44x44Logo.png | Bin {src-tauri => app}/icons/Square71x71Logo.png | Bin {src-tauri => app}/icons/Square89x89Logo.png | Bin {src-tauri => app}/icons/StoreLogo.png | Bin {src-tauri => app}/icons/icon.icns | Bin {src-tauri => app}/icons/icon.ico | Bin {src-tauri => app}/icons/icon.png | Bin {src-tauri => app}/src/main.rs | 0 app/tauri.conf.json | 63 + bun.lockb | Bin 387424 -> 387488 bytes package.json | 4 +- src-tauri/tauri.conf.json | 62 - 26 files changed, 970 insertions(+), 1780 deletions(-) rename {src-tauri => app}/.gitignore (100%) rename {src-tauri => app}/Cargo.lock (70%) rename {src-tauri => app}/Cargo.toml (84%) rename {src-tauri => app}/build.rs (100%) create mode 100644 app/capabilities/migrated.json rename {src-tauri => app}/icons/128x128.png (100%) rename {src-tauri => app}/icons/128x128@2x.png (100%) rename {src-tauri => app}/icons/32x32.png (100%) rename {src-tauri => app}/icons/Square107x107Logo.png (100%) rename {src-tauri => app}/icons/Square142x142Logo.png (100%) rename {src-tauri => app}/icons/Square150x150Logo.png (100%) rename {src-tauri => app}/icons/Square284x284Logo.png (100%) rename {src-tauri => app}/icons/Square30x30Logo.png (100%) rename {src-tauri => app}/icons/Square310x310Logo.png (100%) rename {src-tauri => app}/icons/Square44x44Logo.png (100%) rename {src-tauri => app}/icons/Square71x71Logo.png (100%) rename {src-tauri => app}/icons/Square89x89Logo.png (100%) rename {src-tauri => app}/icons/StoreLogo.png (100%) rename {src-tauri => app}/icons/icon.icns (100%) rename {src-tauri => app}/icons/icon.ico (100%) rename {src-tauri => app}/icons/icon.png (100%) rename {src-tauri => app}/src/main.rs (100%) create mode 100644 app/tauri.conf.json delete mode 100644 src-tauri/tauri.conf.json diff --git a/src-tauri/.gitignore b/app/.gitignore similarity index 100% rename from src-tauri/.gitignore rename to app/.gitignore diff --git a/src-tauri/Cargo.lock b/app/Cargo.lock similarity index 70% rename from src-tauri/Cargo.lock rename to app/Cargo.lock index d6aa6006..b649930c 100644 --- a/src-tauri/Cargo.lock +++ b/app/Cargo.lock @@ -62,199 +62,29 @@ version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" -[[package]] -name = "arboard" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89" -dependencies = [ - "clipboard-win", - "core-graphics 0.23.2", - "image 0.25.1", - "log", - "objc2", - "objc2-app-kit", - "objc2-foundation", - "parking_lot", - "windows-sys 0.48.0", - "wl-clipboard-rs", - "x11rb", -] - -[[package]] -name = "async-broadcast" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" -dependencies = [ - "event-listener 5.3.0", - "event-listener-strategy 0.5.2", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-channel" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" -dependencies = [ - "concurrent-queue", - "event-listener-strategy 0.5.2", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-executor" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" -dependencies = [ - "async-task", - "concurrent-queue", - "fastrand", - "futures-lite", - "slab", -] - -[[package]] -name = "async-fs" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" -dependencies = [ - "async-lock", - "blocking", - "futures-lite", -] - -[[package]] -name = "async-io" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" -dependencies = [ - "async-lock", - "cfg-if", - "concurrent-queue", - "futures-io", - "futures-lite", - "parking", - "polling", - "rustix", - "slab", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-lock" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" -dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", - "pin-project-lite", -] - -[[package]] -name = "async-process" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53fc6301894e04a92cb2584fedde80cb25ba8e02d9dc39d4a87d036e22f397d" -dependencies = [ - "async-channel", - "async-io", - "async-lock", - "async-signal", - "async-task", - "blocking", - "cfg-if", - "event-listener 5.3.0", - "futures-lite", - "rustix", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-recursion" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "async-signal" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" -dependencies = [ - "async-io", - "async-lock", - "atomic-waker", - "cfg-if", - "futures-core", - "futures-io", - "rustix", - "signal-hook-registry", - "slab", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-task" -version = "4.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" - -[[package]] -name = "async-trait" -version = "0.1.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "atk" -version = "0.15.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" +checksum = "b4af014b17dd80e8af9fa689b2d4a211ddba6eb583c1622f35d0cb543f6b17e4" dependencies = [ "atk-sys", - "bitflags 1.3.2", "glib", "libc", ] [[package]] name = "atk-sys" -version = "0.15.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" +checksum = "251e0b7d90e33e0ba930891a505a9a35ece37b2dd37a14f3ffc306c13b980009" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.2.2", + "system-deps", ] -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - [[package]] name = "autocfg" version = "1.3.0" @@ -276,12 +106,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - [[package]] name = "base64" version = "0.21.7" @@ -305,6 +129,9 @@ name = "bitflags" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +dependencies = [ + "serde", +] [[package]] name = "block" @@ -330,19 +157,6 @@ dependencies = [ "objc2", ] -[[package]] -name = "blocking" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" -dependencies = [ - "async-channel", - "async-task", - "futures-io", - "futures-lite", - "piper", -] - [[package]] name = "brotli" version = "6.0.0" @@ -364,16 +178,6 @@ dependencies = [ "alloc-stdlib", ] -[[package]] -name = "bstr" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" -dependencies = [ - "memchr", - "serde", -] - [[package]] name = "bumpalo" version = "3.16.0" @@ -403,36 +207,69 @@ dependencies = [ [[package]] name = "cairo-rs" -version = "0.15.12" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" +checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "cairo-sys-rs", "glib", "libc", + "once_cell", "thiserror", ] [[package]] name = "cairo-sys-rs" -version = "0.15.1" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" +checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" dependencies = [ "glib-sys", "libc", - "system-deps 6.2.2", + "system-deps", +] + +[[package]] +name = "camino" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo-platform" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" +dependencies = [ + "camino", + "cargo-platform", + "semver", + "serde", + "serde_json", + "thiserror", ] [[package]] name = "cargo_toml" -version = "0.15.3" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" +checksum = "8a969e13a7589e9e3e4207e153bae624ade2b5622fb4684a4923b23ec3d57719" dependencies = [ "serde", - "toml 0.7.8", + "toml 0.8.2", ] [[package]] @@ -458,15 +295,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "cfg-expr" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7" -dependencies = [ - "smallvec", -] - [[package]] name = "cfg-expr" version = "0.15.8" @@ -485,9 +313,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cfg_aliases" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" @@ -499,54 +327,39 @@ dependencies = [ "iana-time-zone", "num-traits", "serde", - "windows-targets 0.52.5", -] - -[[package]] -name = "clipboard-win" -version = "5.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" -dependencies = [ - "error-code", + "windows-targets 0.52.6", ] [[package]] name = "cocoa" -version = "0.24.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" +checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "block", "cocoa-foundation", - "core-foundation", - "core-graphics 0.22.3", - "foreign-types 0.3.2", + "core-foundation 0.10.0", + "core-graphics 0.24.0", + "foreign-types", "libc", "objc", ] [[package]] name = "cocoa-foundation" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "block", - "core-foundation", - "core-graphics-types", + "core-foundation 0.10.0", + "core-graphics-types 0.2.0", "libc", "objc", ] -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - [[package]] name = "combine" version = "4.6.7" @@ -557,15 +370,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "concurrent-queue" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "convert_case" version = "0.4.0" @@ -583,24 +387,21 @@ dependencies = [ ] [[package]] -name = "core-foundation-sys" -version = "0.8.6" +name = "core-foundation" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" - -[[package]] -name = "core-graphics" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", - "foreign-types 0.3.2", + "core-foundation-sys", "libc", ] +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + [[package]] name = "core-graphics" version = "0.23.2" @@ -608,9 +409,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" dependencies = [ "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", - "foreign-types 0.5.0", + "core-foundation 0.9.4", + "core-graphics-types 0.1.3", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" +dependencies = [ + "bitflags 2.5.0", + "core-foundation 0.10.0", + "core-graphics-types 0.2.0", + "foreign-types", "libc", ] @@ -621,7 +435,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" dependencies = [ "bitflags 1.3.2", - "core-foundation", + "core-foundation 0.9.4", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" +dependencies = [ + "bitflags 2.5.0", + "core-foundation 0.10.0", "libc", ] @@ -652,25 +477,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "crossbeam-deque" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-utils" version = "0.8.20" @@ -769,17 +575,6 @@ dependencies = [ "serde", ] -[[package]] -name = "derive-new" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "derive_more" version = "0.99.17" @@ -804,24 +599,24 @@ dependencies = [ ] [[package]] -name = "dirs-next" -version = "2.0.0" +name = "dirs" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ - "cfg-if", - "dirs-sys-next", + "dirs-sys", ] [[package]] -name = "dirs-sys-next" -version = "0.1.2" +name = "dirs-sys" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" dependencies = [ "libc", + "option-ext", "redox_users", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -831,19 +626,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" [[package]] -name = "dlib" -version = "0.5.2" +name = "dlopen2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +checksum = "9e1297103d2bbaea85724fcee6294c2d50b1081f9ad47d0f6f6f61eda65315a6" dependencies = [ - "libloading", + "dlopen2_derive", + "libc", + "once_cell", + "winapi", ] [[package]] -name = "downcast-rs" -version = "1.2.1" +name = "dlopen2_derive" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" +checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "dpi" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" +dependencies = [ + "serde", +] [[package]] name = "dtoa" @@ -866,6 +678,12 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +[[package]] +name = "dyn-clone" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" + [[package]] name = "embed-resource" version = "2.4.2" @@ -875,9 +693,9 @@ dependencies = [ "cc", "memchr", "rustc_version", - "toml 0.8.13", + "toml 0.8.2", "vswhom", - "winreg 0.52.0", + "winreg", ] [[package]] @@ -895,33 +713,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "endi" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" - -[[package]] -name = "enumflags2" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" -dependencies = [ - "enumflags2_derive", - "serde", -] - -[[package]] -name = "enumflags2_derive" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "equivalent" version = "1.0.1" @@ -929,69 +720,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] -name = "errno" -version = "0.3.9" +name = "erased-serde" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d" dependencies = [ - "libc", - "windows-sys 0.52.0", + "serde", + "typeid", ] -[[package]] -name = "error-code" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" - -[[package]] -name = "event-listener" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" -dependencies = [ - "event-listener 4.0.3", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" -dependencies = [ - "event-listener 5.3.0", - "pin-project-lite", -] - -[[package]] -name = "fastrand" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" - [[package]] name = "fdeflate" version = "0.3.4" @@ -1007,28 +744,10 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.9.1", + "memoffset", "rustc_version", ] -[[package]] -name = "filetime" -version = "0.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", -] - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - [[package]] name = "flate2" version = "1.0.30" @@ -1054,15 +773,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared 0.1.1", -] - [[package]] name = "foreign-types" version = "0.5.0" @@ -1070,7 +780,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" dependencies = [ "foreign-types-macros", - "foreign-types-shared 0.3.1", + "foreign-types-shared", ] [[package]] @@ -1084,12 +794,6 @@ dependencies = [ "syn 2.0.66", ] -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "foreign-types-shared" version = "0.3.1" @@ -1147,19 +851,6 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" -[[package]] -name = "futures-lite" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" -dependencies = [ - "fastrand", - "futures-core", - "futures-io", - "parking", - "pin-project-lite", -] - [[package]] name = "futures-macro" version = "0.3.30" @@ -1211,11 +902,10 @@ dependencies = [ [[package]] name = "gdk" -version = "0.15.4" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" +checksum = "f5ba081bdef3b75ebcdbfc953699ed2d7417d6bd853347a42a37d76406a33646" dependencies = [ - "bitflags 1.3.2", "cairo-rs", "gdk-pixbuf", "gdk-sys", @@ -1227,35 +917,35 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.15.11" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" +checksum = "50e1f5f1b0bfb830d6ccc8066d18db35c487b1b2b1e8589b5dfe9f07e8defaec" dependencies = [ - "bitflags 1.3.2", "gdk-pixbuf-sys", "gio", "glib", "libc", + "once_cell", ] [[package]] name = "gdk-pixbuf-sys" -version = "0.15.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" +checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" dependencies = [ "gio-sys", "glib-sys", "gobject-sys", "libc", - "system-deps 6.2.2", + "system-deps", ] [[package]] name = "gdk-sys" -version = "0.15.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" +checksum = "31ff856cb3386dae1703a920f803abafcc580e9b5f711ca62ed1620c25b51ff2" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1265,33 +955,47 @@ dependencies = [ "libc", "pango-sys", "pkg-config", - "system-deps 6.2.2", + "system-deps", ] [[package]] name = "gdkwayland-sys" -version = "0.15.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cca49a59ad8cfdf36ef7330fe7bdfbe1d34323220cc16a0de2679ee773aee2c2" +checksum = "a90fbf5c033c65d93792192a49a8efb5bb1e640c419682a58bb96f5ae77f3d4a" dependencies = [ "gdk-sys", "glib-sys", "gobject-sys", "libc", "pkg-config", - "system-deps 6.2.2", + "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.15.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178" +checksum = "fee8f00f4ee46cad2939b8990f5c70c94ff882c3028f3cc5abf950fa4ab53043" dependencies = [ "gdk-sys", "glib-sys", "libc", - "system-deps 6.2.2", + "system-deps", "x11", ] @@ -1318,16 +1022,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "gethostname" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" -dependencies = [ - "libc", - "windows-targets 0.48.5", -] - [[package]] name = "getrandom" version = "0.1.16" @@ -1358,49 +1052,54 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "gio" -version = "0.15.12" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" +checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73" dependencies = [ - "bitflags 1.3.2", "futures-channel", "futures-core", "futures-io", + "futures-util", "gio-sys", "glib", "libc", "once_cell", + "pin-project-lite", + "smallvec", "thiserror", ] [[package]] name = "gio-sys" -version = "0.15.10" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" +checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.2.2", + "system-deps", "winapi", ] [[package]] name = "glib" -version = "0.15.12" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" +checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "futures-channel", "futures-core", "futures-executor", "futures-task", + "futures-util", + "gio-sys", "glib-macros", "glib-sys", "gobject-sys", "libc", + "memchr", "once_cell", "smallvec", "thiserror", @@ -1408,27 +1107,26 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.15.13" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a" +checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc" dependencies = [ - "anyhow", "heck 0.4.1", - "proc-macro-crate 1.3.1", + "proc-macro-crate 2.0.2", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] name = "glib-sys" -version = "0.15.10" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" +checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" dependencies = [ "libc", - "system-deps 6.2.2", + "system-deps", ] [[package]] @@ -1437,38 +1135,24 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" -[[package]] -name = "globset" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" -dependencies = [ - "aho-corasick", - "bstr", - "log", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", -] - [[package]] name = "gobject-sys" -version = "0.15.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" dependencies = [ "glib-sys", "libc", - "system-deps 6.2.2", + "system-deps", ] [[package]] name = "gtk" -version = "0.15.5" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" +checksum = "93c4f5e0e20b60e10631a5f06da7fe3dda744b05ad0ea71fee2f47adf865890c" dependencies = [ "atk", - "bitflags 1.3.2", "cairo-rs", "field-offset", "futures-channel", @@ -1479,16 +1163,15 @@ dependencies = [ "gtk-sys", "gtk3-macros", "libc", - "once_cell", "pango", "pkg-config", ] [[package]] name = "gtk-sys" -version = "0.15.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84" +checksum = "771437bf1de2c1c0b496c11505bdf748e26066bbe942dfc8f614c9460f6d7722" dependencies = [ "atk-sys", "cairo-sys-rs", @@ -1499,40 +1182,20 @@ dependencies = [ "gobject-sys", "libc", "pango-sys", - "system-deps 6.2.2", + "system-deps", ] [[package]] name = "gtk3-macros" -version = "0.15.6" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "684c0456c086e8e7e9af73ec5b84e35938df394712054550e81558d21c44ab0d" +checksum = "c6063efb63db582968fb7df72e1ae68aa6360dcfb0a75143f34fc7d616bad75e" dependencies = [ - "anyhow", "proc-macro-crate 1.3.1", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", -] - -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap 2.2.6", - "slab", - "tokio", - "tokio-util", - "tracing", + "syn 2.0.66", ] [[package]] @@ -1547,15 +1210,6 @@ version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "heck" version = "0.4.1" @@ -1580,15 +1234,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - [[package]] name = "html5ever" version = "0.26.0" @@ -1605,9 +1250,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -1616,20 +1261,26 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.6" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http", - "pin-project-lite", ] [[package]] -name = "http-range" -version = "0.1.5" +name = "http-body-util" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", + "pin-project-lite", +] [[package]] name = "httparse" @@ -1637,47 +1288,43 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - [[package]] name = "hyper" -version = "0.14.28" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", - "h2", "http", "http-body", "httparse", - "httpdate", "itoa 1.0.11", "pin-project-lite", - "socket2", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] [[package]] -name = "hyper-tls" -version = "0.5.0" +name = "hyper-util" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" dependencies = [ "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", "hyper", - "native-tls", + "pin-project-lite", + "socket2", "tokio", - "tokio-native-tls", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -1729,47 +1376,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "ignore" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" -dependencies = [ - "crossbeam-deque", - "globset", - "log", - "memchr", - "regex-automata 0.4.6", - "same-file", - "walkdir", - "winapi-util", -] - -[[package]] -name = "image" -version = "0.24.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "num-traits", -] - -[[package]] -name = "image" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" -dependencies = [ - "bytemuck", - "byteorder", - "num-traits", - "png", - "tiff", -] - [[package]] name = "indexmap" version = "1.9.3" @@ -1794,9 +1400,9 @@ dependencies = [ [[package]] name = "infer" -version = "0.13.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f551f8c3a39f68f986517db0d1759de85881894fdc7db798bd2a9df9cb04b7fc" +checksum = "cb33622da908807a06f9513c19b3c1ad50fab3e4137d82a78107d502075aa199" dependencies = [ "cfb", ] @@ -1816,6 +1422,25 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +[[package]] +name = "is-docker" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" +dependencies = [ + "once_cell", +] + +[[package]] +name = "is-wsl" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" +dependencies = [ + "is-docker", + "once_cell", +] + [[package]] name = "itoa" version = "0.4.8" @@ -1830,9 +1455,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "javascriptcore-rs" -version = "0.16.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c" +checksum = "ca5671e9ffce8ffba57afc24070e906da7fc4b1ba66f2cabebf61bf2ea257fcc" dependencies = [ "bitflags 1.3.2", "glib", @@ -1841,28 +1466,30 @@ dependencies = [ [[package]] name = "javascriptcore-rs-sys" -version = "0.4.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c" +checksum = "af1be78d14ffa4b75b66df31840478fef72b51f8c2465d4ca7c194da9f7a5124" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 5.0.0", + "system-deps", ] [[package]] name = "jni" -version = "0.20.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" dependencies = [ "cesu8", + "cfg-if", "combine", "jni-sys", "log", "thiserror", "walkdir", + "windows-sys 0.45.0", ] [[package]] @@ -1871,12 +1498,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" -[[package]] -name = "jpeg-decoder" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" - [[package]] name = "js-sys" version = "0.3.69" @@ -1909,6 +1530,17 @@ dependencies = [ "serde_json", ] +[[package]] +name = "keyboard-types" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" +dependencies = [ + "bitflags 2.5.0", + "serde", + "unicode-segmentation", +] + [[package]] name = "kuchikiki" version = "0.8.2" @@ -1936,6 +1568,31 @@ dependencies = [ "serde_json", "tauri", "tauri-build", + "tauri-plugin-shell", +] + +[[package]] +name = "libappindicator" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03589b9607c868cc7ae54c0b2a22c8dc03dd41692d48f2d7df73615c6a95dc0a" +dependencies = [ + "glib", + "gtk", + "gtk-sys", + "libappindicator-sys", + "log", +] + +[[package]] +name = "libappindicator-sys" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf" +dependencies = [ + "gtk-sys", + "libloading", + "once_cell", ] [[package]] @@ -1946,12 +1603,12 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" -version = "0.8.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "winapi", ] [[package]] @@ -1970,12 +1627,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" -[[package]] -name = "linux-raw-sys" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - [[package]] name = "lock_api" version = "0.4.12" @@ -2013,19 +1664,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" -[[package]] -name = "mac-notification-sys" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51fca4d74ff9dbaac16a01b924bc3693fa2bba0862c2c633abc73f9a8ea21f64" -dependencies = [ - "cc", - "dirs-next", - "objc-foundation", - "objc_id", - "time", -] - [[package]] name = "malloc_buf" version = "0.0.6" @@ -2070,15 +1708,6 @@ version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.9.1" @@ -2094,12 +1723,6 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - [[package]] name = "miniz_oxide" version = "0.7.3" @@ -2122,32 +1745,36 @@ dependencies = [ ] [[package]] -name = "native-tls" -version = "0.2.12" +name = "muda" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +checksum = "ba8ac4080fb1e097c2c22acae467e46e4da72d941f02e82b67a87a2a89fa38b1" dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", + "cocoa", + "crossbeam-channel", + "dpi", + "gtk", + "keyboard-types", + "objc", + "once_cell", + "png", + "serde", + "thiserror", + "windows-sys 0.59.0", ] [[package]] name = "ndk" -version = "0.6.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" +checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "jni-sys", + "log", "ndk-sys", "num_enum", + "raw-window-handle", "thiserror", ] @@ -2159,9 +1786,9 @@ checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" [[package]] name = "ndk-sys" -version = "0.3.0" +version = "0.6.0+11769913" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" +checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" dependencies = [ "jni-sys", ] @@ -2172,60 +1799,12 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.7.1", -] - -[[package]] -name = "nix" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" -dependencies = [ - "bitflags 2.5.0", - "cfg-if", - "cfg_aliases", - "libc", - "memoffset 0.9.1", -] - [[package]] name = "nodrop" version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "notify-rust" -version = "4.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5312f837191c317644f313f7b2b39f9cb1496570c74f7c17152dd3961219551f" -dependencies = [ - "log", - "mac-notification-sys", - "serde", - "tauri-winrt-notification", - "zbus", -] - [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -2263,23 +1842,23 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.11" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.11" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] @@ -2292,17 +1871,6 @@ dependencies = [ "objc_exception", ] -[[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" @@ -2373,6 +1941,7 @@ checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ "bitflags 2.5.0", "block2", + "dispatch", "libc", "objc2", ] @@ -2437,78 +2006,20 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "open" -version = "3.2.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" +checksum = "61a877bf6abd716642a53ef1b89fb498923a4afca5c754f9050b4d081c05c4b3" dependencies = [ + "is-wsl", + "libc", "pathdiff", - "windows-sys 0.42.0", ] [[package]] -name = "openssl" -version = "0.10.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" -dependencies = [ - "bitflags 2.5.0", - "cfg-if", - "foreign-types 0.3.2", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.103" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "ordered-stream" +name = "option-ext" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" -dependencies = [ - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "os_info" -version = "3.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" -dependencies = [ - "log", - "serde", - "windows-sys 0.52.0", -] +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "os_pipe" @@ -2528,11 +2039,11 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pango" -version = "0.15.10" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" +checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" dependencies = [ - "bitflags 1.3.2", + "gio", "glib", "libc", "once_cell", @@ -2541,22 +2052,16 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.15.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" +checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.2.2", + "system-deps", ] -[[package]] -name = "parking" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" - [[package]] name = "parking_lot" version = "0.12.3" @@ -2575,9 +2080,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.1", + "redox_syscall", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -2592,16 +2097,6 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" -[[package]] -name = "petgraph" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" -dependencies = [ - "fixedbitset", - "indexmap 2.2.6", -] - [[package]] name = "phf" version = "0.8.0" @@ -2736,6 +2231,26 @@ dependencies = [ "siphasher", ] +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "pin-project-lite" version = "0.2.14" @@ -2748,17 +2263,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "piper" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" -dependencies = [ - "atomic-waker", - "fastrand", - "futures-io", -] - [[package]] name = "pkg-config" version = "0.3.30" @@ -2792,21 +2296,6 @@ dependencies = [ "miniz_oxide", ] -[[package]] -name = "polling" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" -dependencies = [ - "cfg-if", - "concurrent-queue", - "hermit-abi", - "pin-project-lite", - "rustix", - "tracing", - "windows-sys 0.52.0", -] - [[package]] name = "powerfmt" version = "0.2.0" @@ -2837,11 +2326,12 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24" dependencies = [ - "toml_edit 0.21.1", + "toml_datetime", + "toml_edit 0.20.2", ] [[package]] @@ -2984,18 +2474,9 @@ dependencies = [ [[package]] name = "raw-window-handle" -version = "0.5.2" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" [[package]] name = "redox_syscall" @@ -3063,36 +2544,31 @@ checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "reqwest" -version = "0.11.27" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "bytes", - "encoding_rs", "futures-core", "futures-util", - "h2", "http", "http-body", + "http-body-util", "hyper", - "hyper-tls", + "hyper-util", "ipnet", "js-sys", "log", "mime", - "native-tls", "once_cell", "percent-encoding", "pin-project-lite", - "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "sync_wrapper", - "system-configuration", "tokio", - "tokio-native-tls", "tokio-util", "tower-service", "url", @@ -3100,31 +2576,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "winreg 0.50.0", -] - -[[package]] -name = "rfd" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea" -dependencies = [ - "block", - "dispatch", - "glib-sys", - "gobject-sys", - "gtk-sys", - "js-sys", - "lazy_static", - "log", - "objc", - "objc-foundation", - "objc_id", - "raw-window-handle", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "windows 0.37.0", + "windows-registry", ] [[package]] @@ -3142,28 +2594,6 @@ dependencies = [ "semver", ] -[[package]] -name = "rustix" -version = "0.38.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" -dependencies = [ - "bitflags 2.5.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64 0.21.7", -] - [[package]] name = "rustversion" version = "1.0.17" @@ -3186,12 +2616,29 @@ dependencies = [ ] [[package]] -name = "schannel" -version = "0.1.23" +name = "schemars" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" dependencies = [ - "windows-sys 0.52.0", + "dyn-clone", + "indexmap 1.9.3", + "schemars_derive", + "serde", + "serde_json", + "url", +] + +[[package]] +name = "schemars_derive" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 2.0.66", ] [[package]] @@ -3206,29 +2653,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "security-framework" -version = "2.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" -dependencies = [ - "bitflags 2.5.0", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "selectors" version = "0.22.0" @@ -3267,6 +2691,17 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "serde-untagged" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2676ba99bd82f75cae5cbd2c8eda6fa0b8760f18978ea840e980dd5567b5c5b6" +dependencies = [ + "erased-serde", + "serde", + "typeid", +] + [[package]] name = "serde_derive" version = "1.0.209" @@ -3278,13 +2713,23 @@ dependencies = [ "syn 2.0.66", ] +[[package]] +name = "serde_derive_internals" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "serde_json" version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" dependencies = [ - "indexmap 2.2.6", "itoa 1.0.11", "memchr", "ryu", @@ -3355,9 +2800,9 @@ dependencies = [ [[package]] name = "serialize-to-javascript" -version = "0.1.2" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04f3666a07a197cdb77cdf306c32be9b7f598d7060d50cfd4d5aa04bfd92f6c5" +checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb" dependencies = [ "serde", "serde_json", @@ -3366,13 +2811,13 @@ dependencies = [ [[package]] name = "serialize-to-javascript-impl" -version = "0.1.2" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "772ee033c0916d670af7860b6e1ef7d658a4629a6d0b4c8c3e67f09b3765b75d" +checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 1.0.109", ] [[package]] @@ -3385,17 +2830,6 @@ dependencies = [ "stable_deref_trait", ] -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - [[package]] name = "sha2" version = "0.10.8" @@ -3426,15 +2860,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "signal-hook-registry" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" -dependencies = [ - "libc", -] - [[package]] name = "simd-adler32" version = "0.3.7" @@ -3473,31 +2898,52 @@ dependencies = [ ] [[package]] -name = "soup2" -version = "0.2.1" +name = "softbuffer" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0" +checksum = "d623bff5d06f60d738990980d782c8c866997d9194cfe79ecad00aa2f76826dd" dependencies = [ - "bitflags 1.3.2", - "gio", - "glib", - "libc", - "once_cell", - "soup2-sys", + "bytemuck", + "cfg_aliases", + "core-graphics 0.23.2", + "foreign-types", + "js-sys", + "log", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "objc2-quartz-core", + "raw-window-handle", + "redox_syscall", + "wasm-bindgen", + "web-sys", + "windows-sys 0.52.0", ] [[package]] -name = "soup2-sys" -version = "0.2.0" +name = "soup3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf" +checksum = "471f924a40f31251afc77450e781cb26d55c0b650842efafc9c6cbd2f7cc4f9f" +dependencies = [ + "futures-channel", + "gio", + "glib", + "libc", + "soup3-sys", +] + +[[package]] +name = "soup3-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ebe8950a680a12f24f15ebe1bf70db7af98ad242d9db43596ad3108aab86c27" dependencies = [ - "bitflags 1.3.2", "gio-sys", "glib-sys", "gobject-sys", "libc", - "system-deps 5.0.0", + "system-deps", ] [[package]] @@ -3508,19 +2954,13 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "state" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" +checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8" dependencies = [ "loom", ] -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "string_cache" version = "0.8.7" @@ -3553,6 +2993,17 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +[[package]] +name = "swift-rs" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4057c98e2e852d51fdcfca832aac7b571f6b351ad159f9eda5db1655f8d0c4d7" +dependencies = [ + "base64 0.21.7", + "serde", + "serde_json", +] + [[package]] name = "syn" version = "1.0.109" @@ -3577,51 +3028,11 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "sys-locale" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" dependencies = [ - "libc", -] - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "system-deps" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e" -dependencies = [ - "cfg-expr 0.9.1", - "heck 0.3.3", - "pkg-config", - "toml 0.5.11", - "version-compare 0.0.11", + "futures-core", ] [[package]] @@ -3630,37 +3041,30 @@ version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ - "cfg-expr 0.15.8", + "cfg-expr", "heck 0.5.0", "pkg-config", - "toml 0.8.13", - "version-compare 0.2.0", + "toml 0.8.2", + "version-compare", ] [[package]] name = "tao" -version = "0.16.9" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "575c856fc21e551074869dcfaad8f706412bd5b803dfa0fbf6881c4ff4bfafab" +checksum = "d3a97abbc7d6cfd0720da3e06fcb1cf2ac87cbfdb5bbbce103a1279a211c4d81" dependencies = [ - "bitflags 1.3.2", - "cairo-rs", - "cc", + "bitflags 2.5.0", "cocoa", - "core-foundation", - "core-graphics 0.22.3", + "core-foundation 0.10.0", + "core-graphics 0.24.0", "crossbeam-channel", "dispatch", - "gdk", - "gdk-pixbuf", - "gdk-sys", + "dlopen2", + "dpi", "gdkwayland-sys", "gdkx11-sys", - "gio", - "glib", - "glib-sys", "gtk", - "image 0.24.9", "instant", "jni", "lazy_static", @@ -3672,15 +3076,14 @@ dependencies = [ "objc", "once_cell", "parking_lot", - "png", "raw-window-handle", "scopeguard", - "serde", "tao-macros", "unicode-segmentation", - "uuid", - "windows 0.39.0", - "windows-implement 0.39.0", + "url", + "windows 0.58.0", + "windows-core 0.58.0", + "windows-version", "x11-dl", ] @@ -3695,17 +3098,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "tar" -version = "0.4.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" -dependencies = [ - "filetime", - "libc", - "xattr", -] - [[package]] name = "target-lexicon" version = "0.12.14" @@ -3714,89 +3106,82 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tauri" -version = "1.7.2" +version = "2.0.0-rc.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e33e3ba00a3b05eb6c57ef135781717d33728b48acf914bb05629e74d897d29" +checksum = "997e79de4c7a13b494a02c8104aa146a5d871ce83e5943e522bc5f8f35c8dab8" dependencies = [ "anyhow", "bytes", "cocoa", - "dirs-next", + "dirs", "dunce", "embed_plist", - "encoding_rs", - "flate2", "futures-util", "getrandom 0.2.15", - "glib", "glob", "gtk", "heck 0.5.0", "http", - "ignore", - "indexmap 1.9.3", - "nix 0.26.4", - "notify-rust", + "jni", + "libc", + "log", + "mime", + "muda", "objc", - "once_cell", - "open", - "os_info", - "os_pipe", "percent-encoding", - "rand 0.8.5", "raw-window-handle", - "regex", "reqwest", - "rfd", - "semver", "serde", "serde_json", "serde_repr", "serialize-to-javascript", - "shared_child", "state", - "sys-locale", - "tar", + "swift-rs", + "tauri-build", "tauri-macros", "tauri-runtime", "tauri-runtime-wry", "tauri-utils", - "tempfile", "thiserror", "tokio", + "tray-icon", "url", - "uuid", + "urlpattern", "webkit2gtk", "webview2-com", - "windows 0.39.0", + "window-vibrancy", + "windows 0.58.0", ] [[package]] name = "tauri-build" -version = "1.5.4" +version = "2.0.0-rc.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5fb5a90a64241ddb7217d3210d844149070a911e87e8a107a707a1d4973f164" +checksum = "032b966611a9324c2185fb9039ccfb938dbe00ec96fa1fe1596c9a1a98a6c87b" dependencies = [ "anyhow", "cargo_toml", - "dirs-next", + "dirs", + "glob", "heck 0.5.0", "json-patch", + "schemars", "semver", "serde", "serde_json", "tauri-utils", "tauri-winres", + "toml 0.8.2", "walkdir", ] [[package]] name = "tauri-codegen" -version = "1.4.5" +version = "2.0.0-rc.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93a9e3f5cebf779a63bf24903e714ec91196c307d8249a0008b882424328bcda" +checksum = "0f4138f3ee5fafa703c4504da58b6b94693655d0ddff8daf1e831b6dc04f4125" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "brotli", "ico", "json-patch", @@ -3804,85 +3189,125 @@ dependencies = [ "png", "proc-macro2", "quote", - "regex", "semver", "serde", "serde_json", "sha2", + "syn 2.0.66", "tauri-utils", "thiserror", "time", + "url", "uuid", "walkdir", ] [[package]] name = "tauri-macros" -version = "1.4.6" +version = "2.0.0-rc.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1d0e989f54fe06c5ef0875c5e19cf96453d099a0a774d5192ab47e80471cdab" +checksum = "a5995206394cd30411fc5c8ae195e498357f63e11ed960ea32b53512dcb2a5a5" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", "tauri-codegen", "tauri-utils", ] [[package]] -name = "tauri-runtime" -version = "0.14.5" +name = "tauri-plugin" +version = "2.0.0-rc.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f33fda7d213e239077fad52e96c6b734cecedb30c2382118b64f94cb5103ff3a" +checksum = "4658d4bfb0e9c8abc8fa9d3e45b4e5fcbfe1be850316d96cefa6a1d4ffc215be" dependencies = [ + "anyhow", + "glob", + "plist", + "schemars", + "serde", + "serde_json", + "tauri-utils", + "toml 0.8.2", + "walkdir", +] + +[[package]] +name = "tauri-plugin-shell" +version = "2.0.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46315cccdbc7686bfb9f17e4aab757e5bb50118bc42e52784cae3917c59ac4d7" +dependencies = [ + "encoding_rs", + "log", + "open", + "os_pipe", + "regex", + "schemars", + "serde", + "serde_json", + "shared_child", + "tauri", + "tauri-plugin", + "thiserror", + "tokio", +] + +[[package]] +name = "tauri-runtime" +version = "2.0.0-rc.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c0830152f7e56a6c43080ced8f1c30a785a237ca3cfaa559ddf52d4be633275" +dependencies = [ + "dpi", "gtk", "http", - "http-range", - "rand 0.8.5", + "jni", "raw-window-handle", "serde", "serde_json", "tauri-utils", "thiserror", "url", - "uuid", - "webview2-com", - "windows 0.39.0", + "windows 0.58.0", ] [[package]] name = "tauri-runtime-wry" -version = "0.14.10" +version = "2.0.0-rc.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18c447dcd9b0f09c7dc4b752cc33e72788805bfd761fbda5692d30c48289efec" +checksum = "6f185bd051f52bece7ef2b197e1f285dab57e3891faa8eacc991459792b077c1" dependencies = [ - "arboard", "cocoa", "gtk", + "http", + "jni", + "log", "percent-encoding", - "rand 0.8.5", "raw-window-handle", + "softbuffer", + "tao", "tauri-runtime", "tauri-utils", - "uuid", + "url", "webkit2gtk", "webview2-com", - "windows 0.39.0", + "windows 0.58.0", "wry", ] [[package]] name = "tauri-utils" -version = "1.6.1" +version = "2.0.0-rc.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0c939e88d82903a0a7dfb28388b12a3c03504d6bd6086550edaa3b6d8beaa" +checksum = "f04e02a821a99d544d93b44870799aaf75c8c0dda1853baf064261da3070b892" dependencies = [ "brotli", + "cargo_metadata", "ctor", "dunce", "glob", - "heck 0.5.0", "html5ever", "infer", "json-patch", @@ -3892,14 +3317,19 @@ dependencies = [ "phf 0.11.2", "proc-macro2", "quote", + "regex", + "schemars", "semver", "serde", + "serde-untagged", "serde_json", "serde_with", + "swift-rs", "thiserror", + "toml 0.8.2", "url", + "urlpattern", "walkdir", - "windows-version", ] [[package]] @@ -3912,29 +3342,6 @@ dependencies = [ "toml 0.7.8", ] -[[package]] -name = "tauri-winrt-notification" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f89f5fb70d6f62381f5d9b2ba9008196150b40b75f3068eb24faeddf1c686871" -dependencies = [ - "quick-xml", - "windows 0.56.0", - "windows-version", -] - -[[package]] -name = "tempfile" -version = "3.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" -dependencies = [ - "cfg-if", - "fastrand", - "rustix", - "windows-sys 0.52.0", -] - [[package]] name = "tendril" version = "0.4.3" @@ -3982,17 +3389,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "tiff" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" -dependencies = [ - "flate2", - "jpeg-decoder", - "weezl", -] - [[package]] name = "time" version = "0.3.36" @@ -4055,16 +3451,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - [[package]] name = "tokio-util" version = "0.7.11" @@ -4078,15 +3464,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - [[package]] name = "toml" version = "0.7.8" @@ -4101,21 +3478,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.13" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.13", + "toml_edit 0.20.2", ] [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ "serde", ] @@ -4130,33 +3507,43 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow 0.5.40", + "winnow", ] [[package]] name = "toml_edit" -version = "0.21.1" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap 2.2.6", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.8", + "winnow", ] +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + [[package]] name = "tower-service" version = "0.3.2" @@ -4225,17 +3612,24 @@ dependencies = [ ] [[package]] -name = "tree_magic_mini" -version = "3.1.4" +name = "tray-icon" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ee137597cdb361b55a4746983e4ac1b35ab6024396a419944ad473bb915265" +checksum = "e0aeee1ab20514132ef14bf3f4725f39246e82fd4866f7bbd209c36907be44e3" dependencies = [ - "fnv", - "home", - "memchr", - "nom", + "core-graphics 0.24.0", + "crossbeam-channel", + "dirs", + "libappindicator", + "muda", + "objc2", + "objc2-app-kit", + "objc2-foundation", "once_cell", - "petgraph", + "png", + "serde", + "thiserror", + "windows-sys 0.59.0", ] [[package]] @@ -4244,6 +3638,12 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" +[[package]] +name = "typeid" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e" + [[package]] name = "typenum" version = "1.17.0" @@ -4251,14 +3651,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] -name = "uds_windows" -version = "1.1.0" +name = "unic-char-property" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" dependencies = [ - "memoffset 0.9.1", - "tempfile", - "winapi", + "unic-char-range", +] + +[[package]] +name = "unic-char-range" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" + +[[package]] +name = "unic-common" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" + +[[package]] +name = "unic-ucd-ident" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987" +dependencies = [ + "unic-char-property", + "unic-char-range", + "unic-ucd-version", +] + +[[package]] +name = "unic-ucd-version" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" +dependencies = [ + "unic-common", ] [[package]] @@ -4300,6 +3730,19 @@ dependencies = [ "serde", ] +[[package]] +name = "urlpattern" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9bd5ff03aea02fa45b13a7980151fe45009af1980ba69f651ec367121a31609" +dependencies = [ + "derive_more", + "regex", + "serde", + "unic-ucd-ident", + "url", +] + [[package]] name = "utf-8" version = "0.7.6" @@ -4321,18 +3764,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version-compare" -version = "0.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" - [[package]] name = "version-compare" version = "0.2.0" @@ -4475,79 +3906,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "wayland-backend" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" -dependencies = [ - "cc", - "downcast-rs", - "rustix", - "scoped-tls", - "smallvec", - "wayland-sys", -] - -[[package]] -name = "wayland-client" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" -dependencies = [ - "bitflags 2.5.0", - "rustix", - "wayland-backend", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" -dependencies = [ - "bitflags 2.5.0", - "wayland-backend", - "wayland-client", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-wlr" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" -dependencies = [ - "bitflags 2.5.0", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-scanner", -] - -[[package]] -name = "wayland-scanner" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" -dependencies = [ - "proc-macro2", - "quick-xml", - "quote", -] - -[[package]] -name = "wayland-sys" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" -dependencies = [ - "dlib", - "log", - "pkg-config", -] - [[package]] name = "web-sys" version = "0.3.69" @@ -4560,9 +3918,9 @@ dependencies = [ [[package]] name = "webkit2gtk" -version = "0.18.2" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370" +checksum = "76b1bc1e54c581da1e9f179d0b38512ba358fb1af2d634a1affe42e37172361a" dependencies = [ "bitflags 1.3.2", "cairo-rs", @@ -4578,20 +3936,18 @@ dependencies = [ "javascriptcore-rs", "libc", "once_cell", - "soup2", + "soup3", "webkit2gtk-sys", ] [[package]] name = "webkit2gtk-sys" -version = "0.18.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3" +checksum = "62daa38afc514d1f8f12b8693d30d5993ff77ced33ce30cd04deebc267a6d57c" dependencies = [ - "atk-sys", "bitflags 1.3.2", "cairo-sys-rs", - "gdk-pixbuf-sys", "gdk-sys", "gio-sys", "glib-sys", @@ -4599,56 +3955,47 @@ dependencies = [ "gtk-sys", "javascriptcore-rs-sys", "libc", - "pango-sys", "pkg-config", - "soup2-sys", - "system-deps 6.2.2", + "soup3-sys", + "system-deps", ] [[package]] name = "webview2-com" -version = "0.19.1" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178" +checksum = "6f61ff3d9d0ee4efcb461b14eb3acfda2702d10dc329f339303fc3e57215ae2c" dependencies = [ "webview2-com-macros", "webview2-com-sys", - "windows 0.39.0", - "windows-implement 0.39.0", + "windows 0.58.0", + "windows-core 0.58.0", + "windows-implement", + "windows-interface", ] [[package]] name = "webview2-com-macros" -version = "0.6.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" +checksum = "1d228f15bba3b9d56dde8bddbee66fa24545bd17b48d5128ccf4a8742b18e431" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] name = "webview2-com-sys" -version = "0.19.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac48ef20ddf657755fdcda8dfed2a7b4fc7e4581acce6fe9b88c3d64f29dee7" +checksum = "a3a3e2eeb58f82361c93f9777014668eb3d07e7d174ee4c819575a9208011886" dependencies = [ - "regex", - "serde", - "serde_json", "thiserror", - "windows 0.39.0", - "windows-bindgen", - "windows-metadata", + "windows 0.58.0", + "windows-core 0.58.0", ] -[[package]] -name = "weezl" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" - [[package]] name = "winapi" version = "0.3.9" @@ -4681,30 +4028,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.37.0" +name = "window-vibrancy" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647" +checksum = "d8cdd6999298d969289d8078dae02ce798ad23452075985cccba8b6326711ecf" dependencies = [ - "windows_aarch64_msvc 0.37.0", - "windows_i686_gnu 0.37.0", - "windows_i686_msvc 0.37.0", - "windows_x86_64_gnu 0.37.0", - "windows_x86_64_msvc 0.37.0", -] - -[[package]] -name = "windows" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" -dependencies = [ - "windows-implement 0.39.0", - "windows_aarch64_msvc 0.39.0", - "windows_i686_gnu 0.39.0", - "windows_i686_msvc 0.39.0", - "windows_x86_64_gnu 0.39.0", - "windows_x86_64_msvc 0.39.0", + "cocoa", + "objc", + "raw-window-handle", + "windows-sys 0.59.0", + "windows-version", ] [[package]] @@ -4718,22 +4051,12 @@ dependencies = [ [[package]] name = "windows" -version = "0.56.0" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" dependencies = [ - "windows-core 0.56.0", - "windows-targets 0.52.5", -] - -[[package]] -name = "windows-bindgen" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68003dbd0e38abc0fb85b939240f4bce37c43a5981d3df37ccbaaa981b47cb41" -dependencies = [ - "windows-metadata", - "windows-tokens", + "windows-core 0.58.0", + "windows-targets 0.52.6", ] [[package]] @@ -4742,36 +4065,27 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] name = "windows-core" -version = "0.56.0" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" dependencies = [ - "windows-implement 0.56.0", + "windows-implement", "windows-interface", "windows-result", - "windows-targets 0.52.5", + "windows-strings", + "windows-targets 0.52.6", ] [[package]] name = "windows-implement" -version = "0.39.0" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7" -dependencies = [ - "syn 1.0.109", - "windows-tokens", -] - -[[package]] -name = "windows-implement" -version = "0.56.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", @@ -4780,9 +4094,9 @@ dependencies = [ [[package]] name = "windows-interface" -version = "0.56.0" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", @@ -4790,33 +4104,42 @@ dependencies = [ ] [[package]] -name = "windows-metadata" -version = "0.39.0" +name = "windows-registry" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] [[package]] name = "windows-result" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", ] [[package]] name = "windows-sys" -version = "0.42.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets 0.42.2", ] [[package]] @@ -4834,7 +4157,31 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", ] [[package]] @@ -4854,33 +4201,27 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "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-tokens" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597" - [[package]] name = "windows-version" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -4897,21 +4238,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -4927,21 +4256,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" - -[[package]] -name = "windows_i686_gnu" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1" - -[[package]] -name = "windows_i686_gnu" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -4957,27 +4274,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" - -[[package]] -name = "windows_i686_msvc" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c" - -[[package]] -name = "windows_i686_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -4993,21 +4298,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -5023,9 +4316,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -5041,21 +4334,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -5071,9 +4352,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -5084,25 +4365,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "winnow" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - [[package]] name = "winreg" version = "0.52.0" @@ -5113,62 +4375,44 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "wl-clipboard-rs" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b41773911497b18ca8553c3daaf8ec9fe9819caf93d451d3055f69de028adb" -dependencies = [ - "derive-new", - "libc", - "log", - "nix 0.28.0", - "os_pipe", - "tempfile", - "thiserror", - "tree_magic_mini", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-protocols-wlr", -] - [[package]] name = "wry" -version = "0.24.10" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00711278ed357350d44c749c286786ecac644e044e4da410d466212152383b45" +checksum = "49b8049c8f239cdbfaaea4bacb9646f6b208938ceec0acd5b3e99cd05f70903f" dependencies = [ - "base64 0.13.1", + "base64 0.22.1", "block", "cocoa", - "core-graphics 0.22.3", + "core-graphics 0.24.0", "crossbeam-channel", + "dpi", "dunce", - "gdk", - "gio", - "glib", + "gdkx11", "gtk", "html5ever", "http", + "javascriptcore-rs", + "jni", "kuchikiki", "libc", - "log", + "ndk", "objc", "objc_id", "once_cell", - "serde", - "serde_json", + "percent-encoding", + "raw-window-handle", "sha2", - "soup2", - "tao", + "soup3", + "tao-macros", "thiserror", - "url", "webkit2gtk", "webkit2gtk-sys", "webview2-com", - "windows 0.39.0", - "windows-implement 0.39.0", + "windows 0.58.0", + "windows-core 0.58.0", + "windows-version", + "x11-dl", ] [[package]] @@ -5191,140 +4435,3 @@ dependencies = [ "once_cell", "pkg-config", ] - -[[package]] -name = "x11rb" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" -dependencies = [ - "gethostname", - "rustix", - "x11rb-protocol", -] - -[[package]] -name = "x11rb-protocol" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" - -[[package]] -name = "xattr" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" -dependencies = [ - "libc", - "linux-raw-sys", - "rustix", -] - -[[package]] -name = "xdg-home" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "zbus" -version = "4.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "989c3977a7aafa97b12b9a35d21cdcff9b0d2289762b14683f45d66b1ba6c48f" -dependencies = [ - "async-broadcast", - "async-executor", - "async-fs", - "async-io", - "async-lock", - "async-process", - "async-recursion", - "async-task", - "async-trait", - "blocking", - "enumflags2", - "event-listener 5.3.0", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix 0.28.0", - "ordered-stream", - "rand 0.8.5", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tracing", - "uds_windows", - "windows-sys 0.52.0", - "xdg-home", - "zbus_macros", - "zbus_names", - "zvariant", -] - -[[package]] -name = "zbus_macros" -version = "4.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fe9de53245dcf426b7be226a4217dd5e339080e5d46e64a02d6e5dcbf90fca1" -dependencies = [ - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 2.0.66", - "zvariant_utils", -] - -[[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", -] - -[[package]] -name = "zvariant" -version = "4.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" -dependencies = [ - "endi", - "enumflags2", - "serde", - "static_assertions", - "zvariant_derive", -] - -[[package]] -name = "zvariant_derive" -version = "4.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" -dependencies = [ - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 2.0.66", - "zvariant_utils", -] - -[[package]] -name = "zvariant_utils" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] diff --git a/src-tauri/Cargo.toml b/app/Cargo.toml similarity index 84% rename from src-tauri/Cargo.toml rename to app/Cargo.toml index 4a30d33c..cace08a9 100644 --- a/src-tauri/Cargo.toml +++ b/app/Cargo.toml @@ -11,12 +11,13 @@ rust-version = "1.57" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [build-dependencies] -tauri-build = { version = "1.5", features = [] } +tauri-build = { version = "2.0.0-rc", features = [] } [dependencies] serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } -tauri = { version = "1.7", features = ["api-all"] } +tauri = { version = "2.0.0-rc", features = [] } +tauri-plugin-shell = "2.0.0-rc" [features] # by default Tauri runs in production mode diff --git a/src-tauri/build.rs b/app/build.rs similarity index 100% rename from src-tauri/build.rs rename to app/build.rs diff --git a/app/capabilities/migrated.json b/app/capabilities/migrated.json new file mode 100644 index 00000000..27d2202c --- /dev/null +++ b/app/capabilities/migrated.json @@ -0,0 +1,81 @@ +{ + "identifier": "migrated", + "description": "permissions that were migrated from v1", + "local": true, + "windows": [ + "main" + ], + "permissions": [ + "core:default", + "fs:allow-read-file", + "fs:allow-write-file", + "fs:allow-read-dir", + "fs:allow-copy-file", + "fs:allow-mkdir", + "fs:allow-remove", + "fs:allow-remove", + "fs:allow-rename", + "fs:allow-exists", + "core:window:allow-create", + "core:window:allow-center", + "core:window:allow-request-user-attention", + "core:window:allow-set-resizable", + "core:window:allow-set-maximizable", + "core:window:allow-set-minimizable", + "core:window:allow-set-closable", + "core:window:allow-set-title", + "core:window:allow-maximize", + "core:window:allow-unmaximize", + "core:window:allow-minimize", + "core:window:allow-unminimize", + "core:window:allow-show", + "core:window:allow-hide", + "core:window:allow-close", + "core:window:allow-set-decorations", + "core:window:allow-set-always-on-top", + "core:window:allow-set-content-protected", + "core:window:allow-set-size", + "core:window:allow-set-min-size", + "core:window:allow-set-max-size", + "core:window:allow-set-position", + "core:window:allow-set-fullscreen", + "core:window:allow-set-focus", + "core:window:allow-set-icon", + "core:window:allow-set-skip-taskbar", + "core:window:allow-set-cursor-grab", + "core:window:allow-set-cursor-visible", + "core:window:allow-set-cursor-icon", + "core:window:allow-set-cursor-position", + "core:window:allow-set-ignore-cursor-events", + "core:window:allow-start-dragging", + "core:webview:allow-print", + "shell:allow-execute", + "shell:allow-open", + "dialog:allow-open", + "dialog:allow-save", + "dialog:allow-message", + "dialog:allow-ask", + "dialog:allow-confirm", + "http:default", + "notification:default", + "global-shortcut:allow-is-registered", + "global-shortcut:allow-register", + "global-shortcut:allow-register-all", + "global-shortcut:allow-unregister", + "global-shortcut:allow-unregister-all", + "os:allow-platform", + "os:allow-version", + "os:allow-os-type", + "os:allow-family", + "os:allow-arch", + "os:allow-exe-extension", + "os:allow-locale", + "os:allow-hostname", + "process:allow-restart", + "process:allow-exit", + "clipboard-manager:allow-read-text", + "clipboard-manager:allow-write-text", + "core:app:allow-app-show", + "core:app:allow-app-hide" + ] +} \ No newline at end of file diff --git a/src-tauri/icons/128x128.png b/app/icons/128x128.png similarity index 100% rename from src-tauri/icons/128x128.png rename to app/icons/128x128.png diff --git a/src-tauri/icons/128x128@2x.png b/app/icons/128x128@2x.png similarity index 100% rename from src-tauri/icons/128x128@2x.png rename to app/icons/128x128@2x.png diff --git a/src-tauri/icons/32x32.png b/app/icons/32x32.png similarity index 100% rename from src-tauri/icons/32x32.png rename to app/icons/32x32.png diff --git a/src-tauri/icons/Square107x107Logo.png b/app/icons/Square107x107Logo.png similarity index 100% rename from src-tauri/icons/Square107x107Logo.png rename to app/icons/Square107x107Logo.png diff --git a/src-tauri/icons/Square142x142Logo.png b/app/icons/Square142x142Logo.png similarity index 100% rename from src-tauri/icons/Square142x142Logo.png rename to app/icons/Square142x142Logo.png diff --git a/src-tauri/icons/Square150x150Logo.png b/app/icons/Square150x150Logo.png similarity index 100% rename from src-tauri/icons/Square150x150Logo.png rename to app/icons/Square150x150Logo.png diff --git a/src-tauri/icons/Square284x284Logo.png b/app/icons/Square284x284Logo.png similarity index 100% rename from src-tauri/icons/Square284x284Logo.png rename to app/icons/Square284x284Logo.png diff --git a/src-tauri/icons/Square30x30Logo.png b/app/icons/Square30x30Logo.png similarity index 100% rename from src-tauri/icons/Square30x30Logo.png rename to app/icons/Square30x30Logo.png diff --git a/src-tauri/icons/Square310x310Logo.png b/app/icons/Square310x310Logo.png similarity index 100% rename from src-tauri/icons/Square310x310Logo.png rename to app/icons/Square310x310Logo.png diff --git a/src-tauri/icons/Square44x44Logo.png b/app/icons/Square44x44Logo.png similarity index 100% rename from src-tauri/icons/Square44x44Logo.png rename to app/icons/Square44x44Logo.png diff --git a/src-tauri/icons/Square71x71Logo.png b/app/icons/Square71x71Logo.png similarity index 100% rename from src-tauri/icons/Square71x71Logo.png rename to app/icons/Square71x71Logo.png diff --git a/src-tauri/icons/Square89x89Logo.png b/app/icons/Square89x89Logo.png similarity index 100% rename from src-tauri/icons/Square89x89Logo.png rename to app/icons/Square89x89Logo.png diff --git a/src-tauri/icons/StoreLogo.png b/app/icons/StoreLogo.png similarity index 100% rename from src-tauri/icons/StoreLogo.png rename to app/icons/StoreLogo.png diff --git a/src-tauri/icons/icon.icns b/app/icons/icon.icns similarity index 100% rename from src-tauri/icons/icon.icns rename to app/icons/icon.icns diff --git a/src-tauri/icons/icon.ico b/app/icons/icon.ico similarity index 100% rename from src-tauri/icons/icon.ico rename to app/icons/icon.ico diff --git a/src-tauri/icons/icon.png b/app/icons/icon.png similarity index 100% rename from src-tauri/icons/icon.png rename to app/icons/icon.png diff --git a/src-tauri/src/main.rs b/app/src/main.rs similarity index 100% rename from src-tauri/src/main.rs rename to app/src/main.rs diff --git a/app/tauri.conf.json b/app/tauri.conf.json new file mode 100644 index 00000000..a5c8cc34 --- /dev/null +++ b/app/tauri.conf.json @@ -0,0 +1,63 @@ +{ + "$schema": "..\\node_modules/@tauri-apps/cli\\schema.json", + "build": { + "beforeBuildCommand": "cd web && bun run next-build", + "beforeDevCommand": "cd web && bun run next dev", + "frontendDist": "../dist", + "devUrl": "http://localhost:3000" + }, + "bundle": { + "active": true, + "category": "DeveloperTool", + "copyright": "", + "targets": "all", + "externalBin": [], + "icon": [ + "icons/32x32.png", + "icons/128x128.png", + "icons/128x128@2x.png", + "icons/icon.icns", + "icons/icon.ico" + ], + "windows": { + "certificateThumbprint": null, + "digestAlgorithm": "sha256", + "timestampUrl": "" + }, + "longDescription": "", + "macOS": { + "entitlements": null, + "exceptionDomain": "", + "frameworks": [], + "providerShortName": null, + "signingIdentity": null + }, + "resources": [], + "shortDescription": "", + "linux": { + "deb": { + "depends": [] + } + } + }, + "productName": "learn-anything-app", + "version": "0.1.0", + "identifier": "com.das.dev", + "plugins": {}, + "app": { + "windows": [ + { + "transparent": false, + "decorations": true, + "fullscreen": false, + "height": 600, + "resizable": true, + "title": "Learn Anything", + "width": 800 + } + ], + "security": { + "csp": null + } + } +} \ No newline at end of file diff --git a/bun.lockb b/bun.lockb index c99a879b877feb8dd712320a3bd839505e0a9af1..f30c244e305f4ff9172c1237d830a6523a22fbd2 100755 GIT binary patch delta 42475 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 delta 42056 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