From 0e752565208f46a83aa0763915b30e4179514e33 Mon Sep 17 00:00:00 2001 From: 4yn <4yn@users.noreply.github.com> Date: Sun, 24 Jul 2022 13:15:35 +0800 Subject: [PATCH] bump tauri version --- package.json | 4 +- src-tauri/Cargo.lock | 1766 +++++++++++++------------ src-tauri/Cargo.toml | 4 +- src-tauri/icons/128x128.png | Bin 1533 -> 2005 bytes src-tauri/icons/128x128@2x.png | Bin 2935 -> 3844 bytes src-tauri/icons/32x32.png | Bin 582 -> 560 bytes src-tauri/icons/Square107x107Logo.png | Bin 1222 -> 1380 bytes src-tauri/icons/Square142x142Logo.png | Bin 1691 -> 2140 bytes src-tauri/icons/Square150x150Logo.png | Bin 1653 -> 2176 bytes src-tauri/icons/Square30x30Logo.png | Bin 640 -> 620 bytes src-tauri/icons/Square44x44Logo.png | Bin 1063 -> 918 bytes src-tauri/icons/Square71x71Logo.png | Bin 1325 -> 1227 bytes src-tauri/icons/Square89x89Logo.png | Bin 1115 -> 1172 bytes src-tauri/icons/StoreLogo.png | Bin 1165 -> 1023 bytes src-tauri/icons/icon.icns | Bin 42599 -> 22121 bytes src-tauri/icons/icon.ico | Bin 5856 -> 4286 bytes src-tauri/icons/icon.png | Bin 2575 -> 3863 bytes src-tauri/src/main.rs | 4 +- src-tauri/tauri.conf.json | 10 +- yarn.lock | 113 +- 20 files changed, 948 insertions(+), 953 deletions(-) diff --git a/package.json b/package.json index a478976..be524c6 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "@rollup/plugin-commonjs": "^17.0.0", "@rollup/plugin-node-resolve": "^11.0.0", "@rollup/plugin-typescript": "^8.0.0", - "@tauri-apps/cli": "^1.0.0-beta.10", + "@tauri-apps/cli": "^1.0.4", "@tsconfig/svelte": "^2.0.0", "rollup": "^2.3.4", "rollup-plugin-css-only": "^3.1.0", @@ -27,7 +27,7 @@ "typescript": "^4.0.0" }, "dependencies": { - "@tauri-apps/api": "^1.0.0-beta.8", + "@tauri-apps/api": "^1.0.2", "sharp": "^0.30.0", "sirv-cli": "^2.0.0" } diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index c5f8a17..3ca17e8 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -44,6 +44,21 @@ dependencies = [ "memchr", ] +[[package]] +name = "alloc-no-stdlib" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ef4730490ad1c4eae5c4325b2a95f521d023e5c885853ff7aca0a6a1631db3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "697ed7edc0f1711de49ce108c541623a0af97c6c60b2f6e2b65229847ac843c2" +dependencies = [ + "alloc-no-stdlib", +] + [[package]] name = "ansi_term" version = "0.12.1" @@ -55,9 +70,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.53" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0" +checksum = "bb07d2053ccdbe10e2af2995a2f116c1330396493dc1269f6a91d0ae82e19704" [[package]] name = "approx" @@ -68,23 +83,11 @@ dependencies = [ "num-traits", ] -[[package]] -name = "arrayref" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" - -[[package]] -name = "arrayvec" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" - [[package]] name = "async-trait" -version = "0.1.52" +version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3" +checksum = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716" dependencies = [ "proc-macro2", "quote", @@ -109,8 +112,8 @@ version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" dependencies = [ - "glib-sys 0.15.7", - "gobject-sys 0.15.9", + "glib-sys", + "gobject-sys", "libc", "system-deps 6.0.2", ] @@ -134,9 +137,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base64" @@ -144,36 +147,12 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - [[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -[[package]] -name = "blake3" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" -dependencies = [ - "arrayref", - "arrayvec", - "cc", - "cfg-if 1.0.0", - "constant_time_eq", - "digest 0.10.3", - "rayon", -] - [[package]] name = "block" version = "0.1.6" @@ -191,13 +170,34 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1d36a02058e76b040de25a4464ba1c80935655595b661505c8b39b664828b95" +checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" dependencies = [ "generic-array", ] +[[package]] +name = "brotli" +version = "3.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + [[package]] name = "bstr" version = "0.2.17" @@ -209,9 +209,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.7.3" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439989e6b8c38d1b6570a384ef1e49c8848128f5a97f3914baef02920842712f" +checksum = "c53dfa917ec274df8ed3c572698f381a24eef2efba9492d797301b72b6db408a" [[package]] name = "byteorder" @@ -221,15 +221,15 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" +checksum = "f0b3de4a0c5e67e16066a0715723abd91edc2f9001d09c46e1dca929351e130e" [[package]] name = "cairo-rs" -version = "0.15.6" +version = "0.15.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8b14c80d8d1a02fa6d914b9d1afeeca9bc34257f8300d9696e1e331ae114223" +checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" dependencies = [ "bitflags", "cairo-sys-rs", @@ -244,16 +244,16 @@ version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" dependencies = [ - "glib-sys 0.15.7", + "glib-sys", "libc", "system-deps 6.0.2", ] [[package]] name = "cargo_toml" -version = "0.11.4" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e270ef0cd868745878982f7ce470aa898d0d4bb248af67f0cf66f54617913ef" +checksum = "5809dd3e6444651fd1cdd3dbec71eca438c439a0fcc8081674a14da0afe50185" dependencies = [ "serde", "serde_derive", @@ -262,30 +262,24 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.72" +version = "1.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee" -dependencies = [ - "jobserver", -] +checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" [[package]] name = "cfb" -version = "0.4.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca453e8624711b2f0f4eb47076a318feda166252a827ee25d067b43de83dcba0" +checksum = "74f89d248799e3f15f91b70917f65381062a01bb8e222700ea0e5a7ff9785f9c" dependencies = [ "byteorder", - "uuid", -] - -[[package]] -name = "cfg-expr" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b412e83326147c2bb881f8b40edfbf9905b9b8abaebd0e47ca190ba62fda8f0e" -dependencies = [ - "smallvec", + "uuid 0.8.2", ] [[package]] @@ -299,31 +293,19 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e068cb2806bbc15b439846dc16c5f89f8599f2c3e4d73d4449d38f9b2f0b6c5" +checksum = "0aacacf4d96c24b2ad6eb8ee6df040e4f27b0d0b39a5710c30091baa830485db" dependencies = [ "smallvec", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - [[package]] name = "checked_int_cast" version = "1.0.0" @@ -378,10 +360,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] -name = "constant_time_eq" -version = "0.1.5" +name = "combine" +version = "4.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "2a604e93b79d1808327a6fca85a6f2d69de66461e7620f5a4cbf5fb4d1d7c948" +dependencies = [ + "bytes", + "memchr", +] [[package]] name = "convert_case" @@ -391,9 +377,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "core-foundation" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ "core-foundation-sys", "libc", @@ -432,29 +418,29 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" +checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.3.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2209c310e29876f7f0b2721e7e26b84aff178aa3da5d091f9bfbf47669e60e3" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.2" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa" +checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] @@ -464,39 +450,40 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.6" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97242a70df9b89a65d0b6df3c4bf5b9ce03c5b7309019777fbde37e7537f8762" +checksum = "07db9d94cbd326813772c968ccd25999e5f8ae22f4f8d1b11effa37ef6ce281d" dependencies = [ - "cfg-if 1.0.0", + "autocfg", + "cfg-if", "crossbeam-utils", - "lazy_static", "memoffset", + "once_cell", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.6" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120" +checksum = "7d82ee10ce34d7bc12c2122495e7593a9c41347ecdd64185af4ecf72cb1a7f83" dependencies = [ - "cfg-if 1.0.0", - "lazy_static", + "cfg-if", + "once_cell", ] [[package]] name = "crypto-common" -version = "0.1.3" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", "typenum", @@ -547,9 +534,9 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" [[package]] name = "cxx" -version = "1.0.65" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0432498c7382a83e9d40a7e4293cdd789ca561aac0d0c17ddb32e3627d989b" +checksum = "b7c14d679239b1ccaad7acaf972a19b41b6c1d7a8cb942158294b4f11ec71bd8" dependencies = [ "cc", "cxxbridge-flags", @@ -559,9 +546,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.65" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "966ac3dae5d57d58b4240cd2038b9ef2afbfc9e77474f9308242bf0ba346239a" +checksum = "0fdbee15c52b8d9132c62c341d2046885717e4a180eb9d3cd34c5a78f2669257" dependencies = [ "cc", "codespan-reporting", @@ -574,15 +561,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.65" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63125c8c1bd5203a8dbf572e502c220383d409e8c287ae4bc455c2bc37de9223" +checksum = "2fdfa84261f05a9b69c0afe03270f9f26d6899ca7df6f442563908b646e8a376" [[package]] name = "cxxbridge-macro" -version = "1.0.65" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd893a7a7317226890316f59576112030de3484dca8573fe0d6c28323902697" +checksum = "0269826813dfbda75223169c774fede73401793e9af3970e4edbe93879782c1d" dependencies = [ "proc-macro2", "quote", @@ -591,70 +578,35 @@ dependencies = [ [[package]] name = "darling" -version = "0.10.2" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" +checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" dependencies = [ - "darling_core 0.10.2", - "darling_macro 0.10.2", -] - -[[package]] -name = "darling" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0d720b8683f8dd83c65155f0530560cba68cd2bf395f6513a483caee57ff7f4" -dependencies = [ - "darling_core 0.13.1", - "darling_macro 0.13.1", + "darling_core", + "darling_macro", ] [[package]] name = "darling_core" -version = "0.10.2" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" +checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.9.3", - "syn", -] - -[[package]] -name = "darling_core" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a340f241d2ceed1deb47ae36c4144b2707ec7dd0b649f894cb39bb595986324" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", + "strsim", "syn", ] [[package]] name = "darling_macro" -version = "0.10.2" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" +checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ - "darling_core 0.10.2", - "quote", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72c41b3b7352feb3211a0d743dc5700a4e3b60f51bd2b368892d1e0f9a95f44b" -dependencies = [ - "darling_core 0.13.1", + "darling_core", "quote", "syn", ] @@ -679,6 +631,15 @@ dependencies = [ "byteorder", ] +[[package]] +name = "deflate" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c86f7e25f518f4b81808a2cf1c50996a61f5c2eb394b2393bd87f2a4780a432f" +dependencies = [ + "adler32", +] + [[package]] name = "derive_more" version = "0.99.17" @@ -707,9 +668,8 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" dependencies = [ - "block-buffer 0.10.0", + "block-buffer 0.10.2", "crypto-common", - "subtle", ] [[package]] @@ -727,15 +687,15 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "dirs-sys-next", ] [[package]] name = "dirs-sys" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" dependencies = [ "libc", "redox_users", @@ -776,9 +736,9 @@ dependencies = [ [[package]] name = "either" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" [[package]] name = "embed_plist" @@ -820,14 +780,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98" +checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", - "redox_syscall 0.2.10", - "winapi", + "redox_syscall 0.2.13", + "windows-sys", ] [[package]] @@ -841,14 +801,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.22" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" +checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" dependencies = [ - "cfg-if 1.0.0", "crc32fast", - "libc", - "miniz_oxide 0.4.4", + "miniz_oxide 0.5.3", ] [[package]] @@ -884,9 +842,9 @@ dependencies = [ [[package]] name = "futf" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c9c1ce3fa9336301af935ab852c437817d14cd33690446569392e65170aac3b" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" dependencies = [ "mac", "new_debug_unreachable", @@ -894,9 +852,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28560757fe2bb34e79f907794bb6b22ae8b0e5c669b638a1132f2592b19035b4" +checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" dependencies = [ "futures-channel", "futures-core", @@ -909,9 +867,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3dda0b6588335f360afc675d0564c17a77a2bda81ca178a4b6081bd86c7f0b" +checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" dependencies = [ "futures-core", "futures-sink", @@ -919,15 +877,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c8ff0461b82559810cdccfde3215c3f373807f5e5232b71479bff7bb2583d7" +checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" [[package]] name = "futures-executor" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29d6d2ff5bb10fb95c85b8ce46538a2e5f5e7fdc755623a7d4529ab8a4ed9d2a" +checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" dependencies = [ "futures-core", "futures-task", @@ -936,9 +894,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f9d34af5a1aac6fb380f735fe510746c38067c5bf16c7fd250280503c971b2" +checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" [[package]] name = "futures-lite" @@ -957,9 +915,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dbd947adfffb0efc70599b3ddcf7b5597bb5fa9e245eb99f62b3a5f7bb8bd3c" +checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" dependencies = [ "proc-macro2", "quote", @@ -968,21 +926,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3055baccb68d74ff6480350f8d6eb8fcfa3aa11bdc1a1ae3afdd0514617d508" +checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" [[package]] name = "futures-task" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72" +checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" [[package]] name = "futures-util" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164" +checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" dependencies = [ "futures-channel", "futures-core", @@ -1023,9 +981,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.15.6" +version = "0.15.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8750501d75f318c2ec0314701bc8403901303210def80bafd13f6b6059a3f45" +checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" dependencies = [ "bitflags", "gdk-pixbuf-sys", @@ -1036,13 +994,13 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.15.1" +version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413424d9818621fa3cfc8a3a915cdb89a7c3c507d56761b4ec83a9a98e587171" +checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" dependencies = [ - "gio-sys 0.15.7", - "glib-sys 0.15.7", - "gobject-sys 0.15.9", + "gio-sys", + "glib-sys", + "gobject-sys", "libc", "system-deps 6.0.2", ] @@ -1055,9 +1013,9 @@ checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", - "gio-sys 0.15.7", - "glib-sys 0.15.7", - "gobject-sys 0.15.9", + "gio-sys", + "glib-sys", + "gobject-sys", "libc", "pango-sys", "pkg-config", @@ -1071,7 +1029,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178" dependencies = [ "gdk-sys", - "glib-sys 0.15.7", + "glib-sys", "libc", "system-deps 6.0.2", "x11", @@ -1079,15 +1037,15 @@ dependencies = [ [[package]] name = "generator" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1d9279ca822891c1a4dae06d185612cf8fc6acfe5dff37781b41297811b12ee" +checksum = "cc184cace1cea8335047a471cc1da80f18acf8a76f3bab2028d499e328948ec7" dependencies = [ "cc", "libc", "log", "rustversion", - "winapi", + "windows 0.32.0", ] [[package]] @@ -1106,27 +1064,27 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi 0.9.0+wasi-snapshot-preview1", ] [[package]] name = "getrandom" -version = "0.2.4" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c" +checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", - "wasi 0.10.2+wasi-snapshot-preview1", + "wasi 0.11.0+wasi-snapshot-preview1", ] [[package]] name = "gif" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a7187e78088aead22ceedeee99779455b23fc231fe13ec443f99bb71694e5b" +checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06" dependencies = [ "color_quant", "weezl", @@ -1134,15 +1092,15 @@ dependencies = [ [[package]] name = "gio" -version = "0.15.7" +version = "0.15.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb50e113645fba48bc36c8abaee1fe5e43d353e8763966e29dfe69660514e461" +checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" dependencies = [ "bitflags", "futures-channel", "futures-core", "futures-io", - "gio-sys 0.15.7", + "gio-sys", "glib", "libc", "once_cell", @@ -1151,25 +1109,12 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.14.0" +version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0a41df66e57fcc287c4bcf74fc26b884f31901ea9792ec75607289b456f48fa" +checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" dependencies = [ - "glib-sys 0.14.0", - "gobject-sys 0.14.0", - "libc", - "system-deps 3.2.0", - "winapi", -] - -[[package]] -name = "gio-sys" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cb5dabebbb63c5cf763c9d9cb120280bf1a442cc496e17fd78ff75272d68244" -dependencies = [ - "glib-sys 0.15.7", - "gobject-sys 0.15.9", + "glib-sys", + "gobject-sys", "libc", "system-deps 6.0.2", "winapi", @@ -1177,9 +1122,9 @@ dependencies = [ [[package]] name = "glib" -version = "0.15.9" +version = "0.15.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89528258cfdc79b1e54591202705be67896ad254f99e3cc2ea3710e0307148f2" +checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" dependencies = [ "bitflags", "futures-channel", @@ -1187,8 +1132,8 @@ dependencies = [ "futures-executor", "futures-task", "glib-macros", - "glib-sys 0.15.7", - "gobject-sys 0.15.9", + "glib-sys", + "gobject-sys", "libc", "once_cell", "smallvec", @@ -1197,13 +1142,13 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.15.6" +version = "0.15.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41bfd8d227dead0829ac142454e97531b93f576d0805d779c42bfd799c65c572" +checksum = "25a68131a662b04931e71891fb14aaf65ee4b44d08e8abc10f49e77418c86c64" dependencies = [ "anyhow", "heck 0.4.0", - "proc-macro-crate 1.1.0", + "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", @@ -1212,19 +1157,9 @@ dependencies = [ [[package]] name = "glib-sys" -version = "0.14.0" +version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c1d60554a212445e2a858e42a0e48cece1bd57b311a19a9468f70376cf554ae" -dependencies = [ - "libc", - "system-deps 3.2.0", -] - -[[package]] -name = "glib-sys" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19289e4953dad38c9fea1c5c52cc594f29afc4a70802822ef382dca356b27bfd" +checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" dependencies = [ "libc", "system-deps 6.0.2", @@ -1238,9 +1173,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "globset" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10463d9ff00a2a068db14231982f5132edebad0d7660cd956a1c30292dbcbfbd" +checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" dependencies = [ "aho-corasick", "bstr", @@ -1251,31 +1186,20 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.14.0" +version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa92cae29759dae34ab5921d73fff5ad54b3d794ab842c117e36cafc7994c3f5" +checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" dependencies = [ - "glib-sys 0.14.0", - "libc", - "system-deps 3.2.0", -] - -[[package]] -name = "gobject-sys" -version = "0.15.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a085ec9acece647f905b675705c349eb00acba30505f5cee43459bc3b2e968cc" -dependencies = [ - "glib-sys 0.15.7", + "glib-sys", "libc", "system-deps 6.0.2", ] [[package]] name = "gtk" -version = "0.15.4" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f2d1326b36af927fe46ae2f89a8fec38c6f0d279ebc5ef07ffeeabb70300bfc" +checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" dependencies = [ "atk", "bitflags", @@ -1304,9 +1228,9 @@ dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", "gdk-sys", - "gio-sys 0.15.7", - "glib-sys 0.15.7", - "gobject-sys 0.15.9", + "gio-sys", + "glib-sys", + "gobject-sys", "libc", "pango-sys", "system-deps 6.0.2", @@ -1319,7 +1243,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24f518afe90c23fba585b2d7697856f9e6a7bbc62f65588035e66f6afb01a2e9" dependencies = [ "anyhow", - "proc-macro-crate 1.1.0", + "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", @@ -1328,9 +1252,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.11" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f1f717ddc7b2ba36df7e871fd88db79326551d3d6f1fc406fbfd28b582ff8e" +checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57" dependencies = [ "bytes", "fnv", @@ -1341,15 +1265,15 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util", + "tokio-util 0.7.3", "tracing", ] [[package]] name = "hashbrown" -version = "0.11.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "heck" @@ -1377,9 +1301,9 @@ dependencies = [ [[package]] name = "html5ever" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafcf38a1a36118242d29b92e1b08ef84e67e4a5ed06e0a80be20e6a32bfed6b" +checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" dependencies = [ "log", "mac", @@ -1391,20 +1315,20 @@ dependencies = [ [[package]] name = "http" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" +checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" dependencies = [ "bytes", "fnv", - "itoa 1.0.1", + "itoa 1.0.2", ] [[package]] name = "http-body" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", "http", @@ -1413,15 +1337,15 @@ dependencies = [ [[package]] name = "http-range" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eee9694f83d9b7c09682fdb32213682939507884e5bcf227be9aff5d644b90dc" +checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" [[package]] name = "httparse" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4" +checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" [[package]] name = "httpdate" @@ -1437,9 +1361,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.17" +version = "0.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043f0e083e9901b6cc658a77d1eb86f4fc650bbb977a4337dd63192826aa85dd" +checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" dependencies = [ "bytes", "futures-channel", @@ -1450,7 +1374,7 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 1.0.1", + "itoa 1.0.2", "pin-project-lite", "socket2", "tokio", @@ -1516,7 +1440,7 @@ dependencies = [ "gif", "jpeg-decoder", "num-iter", - "num-rational", + "num-rational 0.3.2", "num-traits", "png 0.16.8", "scoped_threadpool", @@ -1524,10 +1448,23 @@ dependencies = [ ] [[package]] -name = "indexmap" -version = "1.8.0" +name = "image" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" +checksum = "7e30ca2ecf7666107ff827a8e481de6a132a9b687ed3bb20bb1c144a36c00964" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "num-rational 0.4.1", + "num-traits", +] + +[[package]] +name = "indexmap" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg", "hashbrown", @@ -1535,9 +1472,9 @@ dependencies = [ [[package]] name = "infer" -version = "0.4.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92b41dab759f9e8427c03f519c344a14655490b8db548dac1e57a75b3258391" +checksum = "20b2b533137b9cad970793453d4f921c2e91312a6d88b1085c07bc15fc51bb3b" dependencies = [ "cfb", ] @@ -1557,7 +1494,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -1572,15 +1509,6 @@ dependencies = [ "winreg", ] -[[package]] -name = "itertools" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "0.4.8" @@ -1589,9 +1517,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "itoa" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" +checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" [[package]] name = "javascriptcore-rs" @@ -1610,27 +1538,46 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c" dependencies = [ - "glib-sys 0.15.7", - "gobject-sys 0.15.9", + "glib-sys", + "gobject-sys", "libc", "system-deps 5.0.0", ] +[[package]] +name = "jni" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24967112a1e4301ca5342ea339763613a37592b8a6ce6cf2e4494537c7a42faf" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + [[package]] name = "jni-sys" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" -[[package]] -name = "jobserver" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" -dependencies = [ - "libc", -] - [[package]] name = "jpeg-decoder" version = "0.1.22" @@ -1671,9 +1618,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libappindicator" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b29fab3280d59f3d06725f75da9ef9a1b001b2c748b1abfebd1c966c61d7de" +checksum = "db2d3cb96d092b4824cb306c9e544c856a4cb6210c1081945187f7f1924b47e8" dependencies = [ "glib", "gtk", @@ -1684,25 +1631,36 @@ dependencies = [ [[package]] name = "libappindicator-sys" -version = "0.7.0" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bdcb8c5cfc11febe2ff3f18386d6cb7d29f464cbaf6b286985c3f1a501d74f" +checksum = "f1b3b6681973cea8cc3bce7391e6d7d5502720b80a581c9a95c9cbaf592826aa" dependencies = [ "gtk-sys", - "pkg-config", + "libloading", + "once_cell", ] [[package]] name = "libc" -version = "0.2.117" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e74d72e0f9b65b5b4ca49a346af3976df0f9c61d550727f349ecd559f251a26c" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" + +[[package]] +name = "libloading" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" +dependencies = [ + "cfg-if", + "winapi", +] [[package]] name = "libudev" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea626d3bdf40a1c5aee3bcd4f40826970cae8d80a8fec934c82a63840094dcfe" +checksum = "78b324152da65df7bb95acfcaab55e3097ceaab02fb19b228a9eb74d55f135e0" dependencies = [ "libc", "libudev-sys", @@ -1720,9 +1678,9 @@ dependencies = [ [[package]] name = "libusb1-sys" -version = "0.6.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8772b7e8d4d988e19684aec5a3f5e470ecaf5c705cf0303da3973508e873027" +checksum = "6dfab089105aa85a3b492b421bd90d55e6257f00f8447cc3873c44f8206809ce" dependencies = [ "cc", "libc", @@ -1730,6 +1688,15 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "line-wrap" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" +dependencies = [ + "safemem", +] + [[package]] name = "link-cplusplus" version = "1.0.6" @@ -1741,29 +1708,30 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" +checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" dependencies = [ + "autocfg", "scopeguard", ] [[package]] name = "log" -version = "0.4.14" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] name = "loom" -version = "0.5.4" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc5c7d328e32cc4954e8e01193d7f0ef5ab257b5090b70a964e099a36034309" +checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "generator", "scoped-tls", "serde", @@ -1789,9 +1757,9 @@ dependencies = [ [[package]] name = "mach" -version = "0.2.3" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1" +checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" dependencies = [ "libc", ] @@ -1836,9 +1804,9 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" [[package]] name = "memchr" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" @@ -1869,32 +1837,31 @@ dependencies = [ ] [[package]] -name = "mio" -version = "0.7.14" +name = "miniz_oxide" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" +checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" dependencies = [ - "libc", - "log", - "miow", - "ntapi", - "winapi", + "adler", ] [[package]] -name = "miow" -version = "0.3.7" +name = "mio" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" +checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" dependencies = [ - "winapi", + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys", ] [[package]] name = "ndk" -version = "0.4.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d64d6af06fde0e527b1ba5c7b79a6cc89cfc46325b0b2887dffe8f70197e0c3c" +checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" dependencies = [ "bitflags", "jni-sys", @@ -1904,37 +1871,19 @@ dependencies = [ ] [[package]] -name = "ndk-glue" -version = "0.4.0" +name = "ndk-context" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3e9e94628f24e7a3cb5b96a2dc5683acd9230bf11991c2a1677b87695138420" -dependencies = [ - "lazy_static", - "libc", - "log", - "ndk", - "ndk-macro", - "ndk-sys", -] - -[[package]] -name = "ndk-macro" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d1c6307dc424d0f65b9b06e94f88248e6305726b14729fd67a5e47b2dc481d" -dependencies = [ - "darling 0.10.2", - "proc-macro-crate 0.1.5", - "proc-macro2", - "quote", - "syn", -] +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" [[package]] name = "ndk-sys" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121" +checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" +dependencies = [ + "jni-sys", +] [[package]] name = "new_debug_unreachable" @@ -1944,15 +1893,13 @@ checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" [[package]] name = "nix" -version = "0.16.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0eaf8df8bab402257e0a5c17a254e4cc1f72a93588a1ddfb5d356c801aa7cb" +checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc" dependencies = [ "bitflags", - "cc", - "cfg-if 0.1.10", + "cfg-if", "libc", - "void", ] [[package]] @@ -1961,20 +1908,11 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" -[[package]] -name = "ntapi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" -dependencies = [ - "winapi", -] - [[package]] name = "num-integer" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg", "num-traits", @@ -1982,9 +1920,9 @@ dependencies = [ [[package]] name = "num-iter" -version = "0.1.42" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" dependencies = [ "autocfg", "num-integer", @@ -2003,10 +1941,21 @@ dependencies = [ ] [[package]] -name = "num-traits" -version = "0.2.14" +name = "num-rational" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", ] @@ -2023,25 +1972,34 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "720d3ea1055e4e4574c0c0b0f8c3fd4f24c4cdaf465948206dea090b57b526ad" +checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d992b768490d7fe0d8586d9b5745f6c49f557da6d81dc982b1d167ad4edbb21" +checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate", "proc-macro2", "quote", "syn", ] +[[package]] +name = "num_threads" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +dependencies = [ + "libc", +] + [[package]] name = "objc" version = "0.2.7" @@ -2072,9 +2030,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.9.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" +checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" [[package]] name = "opaque-debug" @@ -2084,31 +2042,31 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "open" -version = "2.0.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176ee4b630d174d2da8241336763bb459281dddc0f4d87f72c3b1efc9a6109b7" +checksum = "f2423ffbf445b82e58c3b1543655968923dd06f85432f10be2bb4f1b7122f98c" dependencies = [ "pathdiff", - "winapi", + "windows-sys", ] [[package]] name = "palette" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9735f7e1e51a3f740bacd5dc2724b61a7806f23597a8736e679f38ee3435d18" +checksum = "8f9cd68f7112581033f157e56c77ac4a5538ec5836a2e39284e65bd7d7275e49" dependencies = [ "approx", "num-traits", "palette_derive", - "phf 0.9.0", + "phf 0.11.0", ] [[package]] name = "palette_derive" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7799c3053ea8a6d8a1193c7ba42f534e7863cf52e378a7f90406f4a645d33bad" +checksum = "05eedf46a8e7c27f74af0c9cfcdb004ceca158cb1b918c6f68f8d7a549b3e427" dependencies = [ "find-crate", "proc-macro2", @@ -2118,9 +2076,9 @@ dependencies = [ [[package]] name = "pango" -version = "0.15.7" +version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a159678be05876e40e1bb4e93db9c9e2f86986fac010b3630feab1273f83b605" +checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" dependencies = [ "bitflags", "glib", @@ -2131,12 +2089,12 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.15.1" +version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7022c2fb88cd2d9d55e1a708a8c53a3ae8678234c4a54bf623400aeb7f31fac2" +checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" dependencies = [ - "glib-sys 0.15.7", - "gobject-sys 0.15.9", + "glib-sys", + "gobject-sys", "libc", "system-deps 6.0.2", ] @@ -2160,12 +2118,12 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.1", + "parking_lot_core 0.9.3", ] [[package]] @@ -2174,27 +2132,33 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "instant", "libc", - "redox_syscall 0.2.10", + "redox_syscall 0.2.13", "smallvec", "winapi", ] [[package]] name = "parking_lot_core" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954" +checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", - "redox_syscall 0.2.10", + "redox_syscall 0.2.13", "smallvec", "windows-sys", ] +[[package]] +name = "paste" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" + [[package]] name = "pathdiff" version = "0.2.1" @@ -2227,17 +2191,6 @@ dependencies = [ "proc-macro-hack", ] -[[package]] -name = "phf" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ac8b67553a7ca9457ce0e526948cad581819238f4a9d1ea74545851fa24f37" -dependencies = [ - "phf_macros 0.9.0", - "phf_shared 0.9.0", - "proc-macro-hack", -] - [[package]] name = "phf" version = "0.10.1" @@ -2249,6 +2202,16 @@ dependencies = [ "proc-macro-hack", ] +[[package]] +name = "phf" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4724fa946c8d1e7cd881bd3dbee63ce32fc1e9e191e35786b3dc1320a3f68131" +dependencies = [ + "phf_macros 0.11.0", + "phf_shared 0.11.0", +] + [[package]] name = "phf_codegen" version = "0.8.0" @@ -2269,16 +2232,6 @@ dependencies = [ "rand 0.7.3", ] -[[package]] -name = "phf_generator" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d43f3220d96e0080cc9ea234978ccd80d904eafb17be31bb0f76daaea6493082" -dependencies = [ - "phf_shared 0.9.0", - "rand 0.8.4", -] - [[package]] name = "phf_generator" version = "0.10.0" @@ -2286,7 +2239,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" dependencies = [ "phf_shared 0.10.0", - "rand 0.8.4", + "rand 0.8.5", +] + +[[package]] +name = "phf_generator" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b450720b6f75cfbfabc195814bd3765f337a4f9a83186f8537297cac12f6705" +dependencies = [ + "phf_shared 0.11.0", + "rand 0.8.5", ] [[package]] @@ -2303,20 +2266,6 @@ dependencies = [ "syn", ] -[[package]] -name = "phf_macros" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b706f5936eb50ed880ae3009395b43ed19db5bff2ebd459c95e7bf013a89ab86" -dependencies = [ - "phf_generator 0.9.1", - "phf_shared 0.9.0", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "phf_macros" version = "0.10.0" @@ -2332,19 +2281,23 @@ dependencies = [ ] [[package]] -name = "phf_shared" -version = "0.8.0" +name = "phf_macros" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" +checksum = "cd94351ac44e70e56b59883e15029a5135f902a8a3020f9c18d580a420e526aa" dependencies = [ - "siphasher", + "phf_generator 0.11.0", + "phf_shared 0.11.0", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "phf_shared" -version = "0.9.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a68318426de33640f02be62b4ae8eb1261be2efbc337b60c54d845bf4484e0d9" +checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" dependencies = [ "siphasher", ] @@ -2359,10 +2312,19 @@ dependencies = [ ] [[package]] -name = "pin-project-lite" -version = "0.2.8" +name = "phf_shared" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" +checksum = "9dd5609d4b2df87167f908a32e1b146ce309c16cf35df76bc11f440b756048e4" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" [[package]] name = "pin-utils" @@ -2372,9 +2334,23 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" +checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" + +[[package]] +name = "plist" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd39bc6cdc9355ad1dc5eeedefee696bb35c34caf21768741e81826c0bbd7225" +dependencies = [ + "base64", + "indexmap", + "line-wrap", + "serde", + "time", + "xml-rs", +] [[package]] name = "png" @@ -2400,6 +2376,18 @@ dependencies = [ "miniz_oxide 0.3.7", ] +[[package]] +name = "png" +version = "0.17.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc38c0ad57efb786dd57b9864e5b18bae478c00c824dc55a38bbc9da95dde3ba" +dependencies = [ + "bitflags", + "crc32fast", + "deflate 1.0.0", + "miniz_oxide 0.5.3", +] + [[package]] name = "ppv-lite86" version = "0.2.16" @@ -2414,18 +2402,9 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "proc-macro-crate" -version = "0.1.5" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -dependencies = [ - "toml", -] - -[[package]] -name = "proc-macro-crate" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83" +checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" dependencies = [ "thiserror", "toml", @@ -2463,11 +2442,11 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro2" -version = "1.0.36" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" +checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] @@ -2477,14 +2456,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16d2f1455f3630c6e5107b4f2b94e74d76dea80736de0981fd27644216cff57f" dependencies = [ "checked_int_cast", - "image", + "image 0.23.14", ] [[package]] name = "quote" -version = "1.0.15" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" dependencies = [ "proc-macro2", ] @@ -2499,20 +2478,19 @@ dependencies = [ "libc", "rand_chacha 0.2.2", "rand_core 0.5.1", - "rand_hc 0.2.0", + "rand_hc", "rand_pcg", ] [[package]] name = "rand" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha 0.3.1", "rand_core 0.6.3", - "rand_hc 0.3.1", ] [[package]] @@ -2550,7 +2528,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ - "getrandom 0.2.4", + "getrandom 0.2.7", ] [[package]] @@ -2562,15 +2540,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_hc" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" -dependencies = [ - "rand_core 0.6.3", -] - [[package]] name = "rand_pcg" version = "0.2.1" @@ -2582,18 +2551,18 @@ dependencies = [ [[package]] name = "raw-window-handle" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba75eee94a9d5273a68c9e1e105d9cffe1ef700532325788389e5a83e2522b7" +checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41" dependencies = [ "cty", ] [[package]] name = "rayon" -version = "1.5.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" +checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" dependencies = [ "autocfg", "crossbeam-deque", @@ -2603,14 +2572,13 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.9.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" +checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" dependencies = [ "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "lazy_static", "num_cpus", ] @@ -2622,28 +2590,29 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "redox_syscall" -version = "0.2.10" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" +checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" dependencies = [ "bitflags", ] [[package]] name = "redox_users" -version = "0.4.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.4", - "redox_syscall 0.2.10", + "getrandom 0.2.7", + "redox_syscall 0.2.13", + "thiserror", ] [[package]] name = "regex" -version = "1.5.4" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" dependencies = [ "aho-corasick", "memchr", @@ -2661,9 +2630,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.6.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" [[package]] name = "remove_dir_all" @@ -2676,9 +2645,9 @@ dependencies = [ [[package]] name = "rusb" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b454219aa5007af92a042ec13b2035325318a21d3c6be18bf592f841430794" +checksum = "703aa035c21c589b34fb5136b12e68fc8dcf7ea46486861381361dd8ebf5cee0" dependencies = [ "libc", "libusb1-sys", @@ -2699,20 +2668,26 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.4", + "semver 1.0.12", ] [[package]] name = "rustversion" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f" +checksum = "24c8ad4f0c00e1eb5bc7614d236a7f1300e3dbd76b68cac8e06fb00b015ad8d8" [[package]] name = "ryu" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" +checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" + +[[package]] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" [[package]] name = "same-file" @@ -2778,9 +2753,12 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.4" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012" +checksum = "a2333e6df6d6598f2b1974829f853c2b4c5f4a6e503c10af918081aa6f8564e1" +dependencies = [ + "serde", +] [[package]] name = "semver-parser" @@ -2793,18 +2771,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.136" +version = "1.0.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" +checksum = "0171ebb889e45aa68b44aee0859b3eede84c6f5f5c228e6f140c0b2a0a46cad6" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.136" +version = "1.0.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" +checksum = "dc1d3230c1de7932af58ad8ffbe1d784bd55efd5a9d84ac24f69c72d83543dfb" dependencies = [ "proc-macro2", "quote", @@ -2813,20 +2791,20 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.78" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085" +checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" dependencies = [ - "itoa 1.0.1", + "itoa 1.0.2", "ryu", "serde", ] [[package]] name = "serde_repr" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98d0516900518c29efa217c298fa1f4e6c6ffc85ae29fd7f4ee48f176e1a9ed5" +checksum = "a2ad84e47328a31223de7fed7a4f5087f2d6ddfe586cf3ca25b7a165bc0a5aed" dependencies = [ "proc-macro2", "quote", @@ -2835,22 +2813,21 @@ dependencies = [ [[package]] name = "serde_with" -version = "1.12.0" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec1e6ec4d8950e5b1e894eac0d360742f3b1407a6078a604a731c4b3f49cefbc" +checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" dependencies = [ - "rustversion", "serde", "serde_with_macros", ] [[package]] name = "serde_with_macros" -version = "1.5.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12e47be9471c72889ebafb5e14d5ff930d89ae7a67bbdb5f8abb564f845a927e" +checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" dependencies = [ - "darling 0.13.1", + "darling", "proc-macro2", "quote", "syn", @@ -2880,16 +2857,16 @@ dependencies = [ [[package]] name = "serialport" -version = "4.0.1" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cd7c0f22290ee2c01457009fa6fc1cae4153d5608a924e5dc423babc2c655" +checksum = "aab92efb5cf60ad310548bc3f16fa6b0d950019cb7ed8ff41968c3d03721cf12" dependencies = [ "CoreFoundation-sys", "IOKit-sys", "bitflags", - "cfg-if 0.1.10", + "cfg-if", "libudev", - "mach 0.2.3", + "mach 0.3.2", "nix", "regex", "winapi", @@ -2912,7 +2889,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" dependencies = [ "block-buffer 0.9.0", - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.9.0", "opaque-debug", @@ -2924,7 +2901,7 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.10.3", ] @@ -2951,15 +2928,18 @@ dependencies = [ [[package]] name = "siphasher" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a86232ab60fa71287d7f2ddae4a7073f6b7aac33631c3015abb556f08c6d0a3e" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" [[package]] name = "slab" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" +checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +dependencies = [ + "autocfg", +] [[package]] name = "slider_io" @@ -2973,11 +2953,11 @@ dependencies = [ "futures", "futures-util", "hyper", - "image", + "image 0.23.14", "ipconfig", "log", "palette", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "phf 0.10.1", "qrcode", "rusb", @@ -2986,7 +2966,7 @@ dependencies = [ "serialport", "tokio", "tokio-tungstenite", - "tokio-util", + "tokio-util 0.6.10", "tungstenite", "vigem-client", "winapi", @@ -3000,7 +2980,7 @@ dependencies = [ "env_logger", "log", "open", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "simple-logging", "slider_io", "tauri", @@ -3009,9 +2989,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" +checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" [[package]] name = "socket2" @@ -3024,15 +3004,29 @@ dependencies = [ ] [[package]] -name = "soup2-sys" -version = "0.1.0" +name = "soup2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f056675eda9a7417163e5f742bb119e8e1d385edd2ada8f7031a7230a3ec10a" +checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0" dependencies = [ "bitflags", - "gio-sys 0.14.0", - "glib-sys 0.14.0", - "gobject-sys 0.14.0", + "gio", + "glib", + "libc", + "once_cell", + "soup2-sys", +] + +[[package]] +name = "soup2-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf" +dependencies = [ + "bitflags", + "gio-sys", + "glib-sys", + "gobject-sys", "libc", "system-deps 5.0.0", ] @@ -3045,102 +3039,54 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "state" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cf4f5369e6d3044b5e365c9690f451516ac8f0954084622b49ea3fde2f6de5" +checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" dependencies = [ "loom", ] [[package]] name = "string_cache" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "923f0f39b6267d37d23ce71ae7235602134b250ace715dd2c90421998ddac0c6" +checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" dependencies = [ - "lazy_static", "new_debug_unreachable", - "parking_lot 0.11.2", - "phf_shared 0.8.0", + "once_cell", + "parking_lot 0.12.1", + "phf_shared 0.10.0", "precomputed-hash", "serde", ] [[package]] name = "string_cache_codegen" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f24c8e5e19d22a726626f1a5e16fe15b132dcf21d10177fa5a45ce7962996b97" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", + "phf_generator 0.10.0", + "phf_shared 0.10.0", "proc-macro2", "quote", ] -[[package]] -name = "strsim" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" - [[package]] name = "strsim" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" -[[package]] -name = "strum" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2" - -[[package]] -name = "strum_macros" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec" -dependencies = [ - "heck 0.3.3", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "subtle" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - [[package]] name = "syn" -version = "1.0.86" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" dependencies = [ "proc-macro2", "quote", - "unicode-xid", -] - -[[package]] -name = "system-deps" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "480c269f870722b3b08d2f13053ce0c2ab722839f472863c3e2d61ff3a1c2fa6" -dependencies = [ - "anyhow", - "cfg-expr 0.8.1", - "heck 0.3.3", - "itertools", - "pkg-config", - "strum", - "strum_macros", - "thiserror", - "toml", - "version-compare 0.0.11", + "unicode-ident", ] [[package]] @@ -3162,7 +3108,7 @@ version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1a45a1c4c9015217e12347f2a411b57ce2c4fc543913b14b6fe40483328e709" dependencies = [ - "cfg-expr 0.10.2", + "cfg-expr 0.10.3", "heck 0.4.0", "pkg-config", "toml", @@ -3171,9 +3117,9 @@ dependencies = [ [[package]] name = "tao" -version = "0.6.4" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a01ed3d6141768e0e36bfe3910f24511022c3dfb977810b00c518d507d4ead4" +checksum = "a71c32c2fa7bba46b01becf9cf470f6a781573af7e376c5e317a313ecce27545" dependencies = [ "bitflags", "cairo-rs", @@ -3182,6 +3128,7 @@ dependencies = [ "core-foundation", "core-graphics", "crossbeam-channel", + "dirs-next", "dispatch", "gdk", "gdk-pixbuf", @@ -3189,40 +3136,33 @@ dependencies = [ "gdkx11-sys", "gio", "glib", - "glib-sys 0.15.7", + "glib-sys", "gtk", + "image 0.24.3", "instant", + "jni 0.19.0", "lazy_static", "libappindicator", "libc", "log", "ndk", - "ndk-glue", + "ndk-context", "ndk-sys", "objc", + "once_cell", "parking_lot 0.11.2", + "paste", + "png 0.17.5", "raw-window-handle", "scopeguard", "serde", - "tao-core-video-sys", "unicode-segmentation", - "windows", - "windows_macros", + "uuid 0.8.2", + "windows 0.37.0", + "windows-implement", "x11-dl", ] -[[package]] -name = "tao-core-video-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271450eb289cb4d8d0720c6ce70c72c8c858c93dd61fc625881616752e6b98f6" -dependencies = [ - "cfg-if 1.0.0", - "core-foundation-sys", - "libc", - "objc", -] - [[package]] name = "tar" version = "0.4.38" @@ -3236,15 +3176,13 @@ dependencies = [ [[package]] name = "tauri" -version = "1.0.0-rc.4" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1112a78b3de89c41e01b671d62f24038d324c6cb61708896ee16f533b655c82e" +checksum = "827f61bd3dd40276694be5c7ffc40d65b94ab00d9f8c1a4a4db07f2cdc306c83" dependencies = [ "anyhow", - "bincode", - "cfg_aliases", + "cocoa", "dirs-next", - "either", "embed_plist", "flate2", "futures", @@ -3252,13 +3190,15 @@ dependencies = [ "glib", "glob", "gtk", + "heck 0.4.0", "http", "ignore", + "objc", "once_cell", "percent-encoding", - "rand 0.8.4", + "rand 0.8.5", "raw-window-handle", - "semver 1.0.4", + "semver 1.0.12", "serde", "serde_json", "serde_repr", @@ -3273,18 +3213,23 @@ dependencies = [ "thiserror", "tokio", "url", - "uuid", - "windows", + "uuid 1.1.2", + "webkit2gtk", + "webview2-com", + "windows 0.37.0", ] [[package]] name = "tauri-build" -version = "1.0.0-rc.4" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7e31905edc1b40f369beccbbfb30b2e44c2f2bb1ffc06a3778d844af4a81da8" +checksum = "acafb1c515c5d14234a294461bd43c723639a84891a45f6a250fd3441ad2e8ed" dependencies = [ "anyhow", "cargo_toml", + "heck 0.4.0", + "json-patch", + "semver 1.0.12", "serde_json", "tauri-utils", "winres", @@ -3292,31 +3237,34 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "1.0.0-rc.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbcba93e945eb73ee232621763a1295247d0155867bb72e815ab107a10a7cf97" +checksum = "16d62a3c8790d6cba686cea6e3f7f569d12c662c3274c2d165a4fd33e3871b72" dependencies = [ "base64", - "blake3", + "brotli", "ico", - "png 0.16.8", + "json-patch", + "plist", + "png 0.17.5", "proc-macro2", "quote", + "semver 1.0.12", "serde", "serde_json", "sha2", "tauri-utils", "thiserror", - "uuid", + "time", + "uuid 1.1.2", "walkdir", - "zstd", ] [[package]] name = "tauri-macros" -version = "1.0.0-rc.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed251657dcdd21922e0146af5f8a3b9ccf92707d4a42add615c250ff92a6838d" +checksum = "7296fa17996629f43081e1c66d554703900187ed900c5bf46f97f0bcfb069278" dependencies = [ "heck 0.4.0", "proc-macro2", @@ -3328,61 +3276,69 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.3.3" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae0442d935c2d168541d74be51c4d4f176b1c00ee6bf052f07c1aa5f688ba497" +checksum = "4e4cff3b4d9469727fa2107c4b3d2eda110df1ba45103fb420178e536362fae4" dependencies = [ "gtk", "http", "http-range", "infer", + "raw-window-handle", "serde", "serde_json", "tauri-utils", "thiserror", - "uuid", + "uuid 1.1.2", "webview2-com", - "windows", + "windows 0.37.0", ] [[package]] name = "tauri-runtime-wry" -version = "0.3.3" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643aaa56237304264804dbf34748b21042eadda71d2e964bced1651c19cc0314" +checksum = "3fa8c4edaf01d8b556e7172c844b1b4dd3399adcd1a606bd520fc3e65f698546" dependencies = [ + "cocoa", "gtk", + "percent-encoding", + "rand 0.8.5", + "raw-window-handle", "tauri-runtime", "tauri-utils", - "uuid", + "uuid 1.1.2", + "webkit2gtk", "webview2-com", - "windows", + "windows 0.37.0", "wry", ] [[package]] name = "tauri-utils" -version = "1.0.0-rc.3" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21f11483d205c77d1ec398e80566485101696335983e69832cc6c41ab1e07266" +checksum = "12ff4b68d9faeb57c9c727bf58c9c9768d2b67d8e84e62ce6146e7859a2e9c6b" dependencies = [ + "brotli", "ctor", "glob", "heck 0.4.0", "html5ever", "json-patch", "kuchiki", + "memchr", "phf 0.10.1", "proc-macro2", "quote", + "semver 1.0.12", "serde", "serde_json", "serde_with", - "serialize-to-javascript", "thiserror", "url", "walkdir", - "zstd", + "windows 0.37.0", ] [[package]] @@ -3391,19 +3347,19 @@ version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "fastrand", "libc", - "redox_syscall 0.2.10", + "redox_syscall 0.2.13", "remove_dir_all", "winapi", ] [[package]] name = "tendril" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9ef557cb397a4f0a5a3a628f06515f78563f2209e64d47055d9dc6052bf5e33" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" dependencies = [ "futf", "mac", @@ -3412,9 +3368,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" dependencies = [ "winapi-util", ] @@ -3427,18 +3383,18 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.30" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.30" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" dependencies = [ "proc-macro2", "quote", @@ -3477,10 +3433,21 @@ dependencies = [ ] [[package]] -name = "tinyvec" -version = "1.5.1" +name = "time" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" +checksum = "72c91f41dcb2f096c05f0873d667dceec1087ce5bcf984ec8ffb19acddbb3217" +dependencies = [ + "itoa 1.0.2", + "libc", + "num_threads", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" dependencies = [ "tinyvec_macros", ] @@ -3493,25 +3460,28 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.16.1" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a" +checksum = "57aec3cfa4c296db7255446efb4928a6be304b431a806216105542a67b6ca82e" dependencies = [ + "autocfg", "bytes", "libc", "memchr", "mio", "num_cpus", + "once_cell", "pin-project-lite", + "socket2", "tokio-macros", "winapi", ] [[package]] name = "tokio-macros" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" +checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" dependencies = [ "proc-macro2", "quote", @@ -3532,9 +3502,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.6.9" +version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" +checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" dependencies = [ "bytes", "futures-core", @@ -3545,27 +3515,41 @@ dependencies = [ ] [[package]] -name = "toml" -version = "0.5.8" +name = "tokio-util" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" dependencies = [ "serde", ] [[package]] name = "tower-service" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.29" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" +checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -3573,9 +3557,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.18" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e" +checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" dependencies = [ "proc-macro2", "quote", @@ -3584,18 +3568,19 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.21" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" +checksum = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7" dependencies = [ - "lazy_static", + "once_cell", + "valuable", ] [[package]] name = "tracing-log" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" dependencies = [ "lazy_static", "log", @@ -3604,13 +3589,13 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.7" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5312f325fe3588e277415f5a6cca1f4ccad0f248c4cd5a4bd33032d7286abc22" +checksum = "3a713421342a5a666b7577783721d3117f1b69a393df803ee17bb73b1e122a59" dependencies = [ "ansi_term", - "lazy_static", "matchers", + "once_cell", "regex", "sharded-slab", "smallvec", @@ -3647,7 +3632,7 @@ dependencies = [ "http", "httparse", "log", - "rand 0.8.4", + "rand 0.8.5", "sha-1", "thiserror", "url", @@ -3662,30 +3647,36 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "ucd-trie" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" +checksum = "89570599c4fe5585de2b388aab47e99f7fa4e9238a1399f707a02e356058141c" [[package]] name = "unicode-bidi" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" +checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" + +[[package]] +name = "unicode-ident" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" [[package]] name = "unicode-normalization" -version = "0.1.19" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" +checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" [[package]] name = "unicode-width" @@ -3693,12 +3684,6 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" -[[package]] -name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - [[package]] name = "url" version = "2.2.2" @@ -3724,9 +3709,24 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.4", + "getrandom 0.2.7", ] +[[package]] +name = "uuid" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f" +dependencies = [ + "getrandom 0.2.7", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "vcpkg" version = "0.2.15" @@ -3760,12 +3760,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - [[package]] name = "waker-fn" version = "1.1.0" @@ -3801,73 +3795,74 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" +version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "webkit2gtk" -version = "0.17.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cbd39499e917de9dad36eb11c09f665eb984d432638ae7971feed98eb96df88" +checksum = "29952969fb5e10fe834a52eb29ad0814ccdfd8387159b0933edf1344a1c9cdcc" dependencies = [ "bitflags", "cairo-rs", "gdk", "gdk-sys", "gio", - "gio-sys 0.15.7", + "gio-sys", "glib", - "glib-sys 0.15.7", - "gobject-sys 0.15.9", + "glib-sys", + "gobject-sys", "gtk", "gtk-sys", "javascriptcore-rs", "libc", "once_cell", + "soup2", "webkit2gtk-sys", ] [[package]] name = "webkit2gtk-sys" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddcce6f1e0fc7715d651dba29875741509f5fc12f4e2976907272a74405f2b01" +checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3" dependencies = [ "atk-sys", "bitflags", "cairo-sys-rs", "gdk-pixbuf-sys", "gdk-sys", - "gio-sys 0.15.7", - "glib-sys 0.15.7", - "gobject-sys 0.15.9", + "gio-sys", + "glib-sys", + "gobject-sys", "gtk-sys", "javascriptcore-rs-sys", "libc", "pango-sys", "pkg-config", "soup2-sys", - "system-deps 5.0.0", + "system-deps 6.0.2", ] [[package]] name = "webview2-com" -version = "0.13.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb8e90ac2d9ce39cdb70017aaec641be09fbdd702b7b332b9896d053eb469524" +checksum = "a489a9420acabb3c2ed0434b6f71f6b56b9485ec32665a28dec1ee186d716e0f" dependencies = [ "webview2-com-macros", "webview2-com-sys", - "windows", - "windows_macros", + "windows 0.37.0", + "windows-implement", ] [[package]] name = "webview2-com-macros" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515c6c82fcee93f6edaacc72c8e233dbe4ff3ca569dce1901dfc36c404a3e99" +checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" dependencies = [ "proc-macro2", "quote", @@ -3876,23 +3871,23 @@ dependencies = [ [[package]] name = "webview2-com-sys" -version = "0.13.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92160310b3322397e4ff8a8285a7429d73a07a68fda44ee80879605b93e53f76" +checksum = "0258c53ee9adc0a4f8ba1c8c317588f7a58c7048a55b621d469ba75ab3709ca1" dependencies = [ "regex", "serde", "serde_json", "thiserror", - "windows", + "windows 0.37.0", "windows-bindgen", ] [[package]] name = "weezl" -version = "0.1.5" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b77fdfd5a253be4ab714e4ffa3c49caf146b4de743e97510c0656cf90f1e8e" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" [[package]] name = "widestring" @@ -3933,32 +3928,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b749ebd2304aa012c5992d11a25d07b406bdbe5f79d371cb7a918ce501a19eb0" -dependencies = [ - "windows_aarch64_msvc 0.30.0", - "windows_i686_gnu 0.30.0", - "windows_i686_msvc 0.30.0", - "windows_x86_64_gnu 0.30.0", - "windows_x86_64_msvc 0.30.0", -] - -[[package]] -name = "windows-bindgen" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "944c545fcae9dd66488308f8b69aa3ba34f53714416ecfcdcbbfa4b6821e27c6" -dependencies = [ - "windows_quote", - "windows_reader", -] - -[[package]] -name = "windows-sys" version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6" +checksum = "fbedf6db9096bc2364adce0ae0aa636dcd89f3c3f2cd67947062aaf0ca2a10ec" dependencies = [ "windows_aarch64_msvc 0.32.0", "windows_i686_gnu 0.32.0", @@ -3968,10 +3940,63 @@ dependencies = [ ] [[package]] -name = "windows_aarch64_msvc" -version = "0.30.0" +name = "windows" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29277a4435d642f775f63c7d1faeb927adba532886ce0287bd985bffb16b6bca" +checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647" +dependencies = [ + "windows-implement", + "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-bindgen" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bed7be31ade0af08fec9b5343e9edcc005d22b1f11859b8a59b24797f5858e8" +dependencies = [ + "windows-metadata", + "windows-tokens", +] + +[[package]] +name = "windows-implement" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a1062e555f7d9d66fd1130ed4f7c6ec41a47529ee0850cd0e926d95b26bb14" +dependencies = [ + "syn", + "windows-tokens", +] + +[[package]] +name = "windows-metadata" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f33f2b90a6664e369c41ab5ff262d06f048fc9685d9bf8a0e99a47750bb0463" + +[[package]] +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", +] + +[[package]] +name = "windows-tokens" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3263d25f1170419995b78ff10c06b949e8a986c35c208dc24333c64753a87169" [[package]] name = "windows_aarch64_msvc" @@ -3980,20 +4005,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" [[package]] -name = "windows_gen" -version = "0.30.0" +name = "windows_aarch64_msvc" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30dff4d91d22520628bb94b66f2bb313cb16a09a515a32320a84a1b449bc94c0" -dependencies = [ - "windows_quote", - "windows_reader", -] +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" [[package]] -name = "windows_i686_gnu" -version = "0.30.0" +name = "windows_aarch64_msvc" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1145e1989da93956c68d1864f32fb97c8f561a8f89a5125f6a2b7ea75524e4b8" +checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a" [[package]] name = "windows_i686_gnu" @@ -4002,10 +4023,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" [[package]] -name = "windows_i686_msvc" -version = "0.30.0" +name = "windows_i686_gnu" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a09e3a0d4753b73019db171c1339cd4362c8c44baf1bcea336235e955954a6" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + +[[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_msvc" @@ -4014,34 +4041,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" [[package]] -name = "windows_macros" -version = "0.30.0" +name = "windows_i686_msvc" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ae44ab917e9005fe710d99d52d227ca0164b10a09be90649142cc3fab825d3" -dependencies = [ - "syn", - "windows_gen", - "windows_quote", - "windows_reader", -] +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" [[package]] -name = "windows_quote" -version = "0.30.0" +name = "windows_i686_msvc" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71f02c51a77e6248c1206aaa920802c32d50a05205e229b118d7f3afd3036667" - -[[package]] -name = "windows_reader" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e44e6df0da993cda589c5ac852272fbb2a0ead67a031a017dd3eac11528a2d72" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca64fcb0220d58db4c119e050e7af03c69e6f4f415ef69ec1773d9aab422d5a" +checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c" [[package]] name = "windows_x86_64_gnu" @@ -4050,10 +4059,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" [[package]] -name = "windows_x86_64_msvc" -version = "0.30.0" +name = "windows_x86_64_gnu" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08cabc9f0066848fef4bc6a1c1668e6efce38b661d2aeec75d18d8617eebb5f1" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + +[[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_msvc" @@ -4061,6 +4076,18 @@ version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d" + [[package]] name = "winreg" version = "0.7.0" @@ -4081,10 +4108,11 @@ dependencies = [ [[package]] name = "wry" -version = "0.13.3" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9514586e5c964d30cc7123c9aea9880ff7b3cb1c43f6a1dc8703941eb72ac89f" +checksum = "ce19dddbd3ce01dc8f14eb6d4c8f914123bf8379aaa838f6da4f981ff7104a3f" dependencies = [ + "block", "cocoa", "core-graphics", "gdk", @@ -4092,6 +4120,7 @@ dependencies = [ "glib", "gtk", "http", + "jni 0.18.0", "libc", "log", "objc", @@ -4105,8 +4134,8 @@ dependencies = [ "webkit2gtk", "webkit2gtk-sys", "webview2-com", - "windows", - "windows_macros", + "windows 0.37.0", + "windows-implement", ] [[package]] @@ -4140,38 +4169,15 @@ dependencies = [ [[package]] name = "xattr" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c" +checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" dependencies = [ "libc", ] [[package]] -name = "zstd" -version = "0.10.0+zstd.1.5.2" +name = "xml-rs" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b1365becbe415f3f0fcd024e2f7b45bacfb5bdd055f0dc113571394114e7bdd" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "4.1.4+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f7cd17c9af1a4d6c24beb1cc54b17e2ef7b593dc92f19e9d9acad8b182bbaee" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "1.6.3+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc49afa5c8d634e75761feda8c592051e7eeb4683ba827211eb0d731d3402ea8" -dependencies = [ - "cc", - "libc", -] +checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 1072c03..eda62b6 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -10,7 +10,7 @@ edition = "2018" build = "src/build.rs" [build-dependencies] -tauri-build = { version = "1.0.0-rc.4", features = [] } +tauri-build = { version = "1.0.4", features = [] } [dependencies] log = "0.4.14" @@ -19,7 +19,7 @@ env_logger = "0.9.0" parking_lot = "0.12.0" -tauri = { version = "1.0.0-rc.4", features = ["system-tray", "window-start-dragging"] } +tauri = { version = "1.0.4", features = ["system-tray", "window-start-dragging"] } open = "2.0.2" slider_io = {path = "../src-slider_io" } diff --git a/src-tauri/icons/128x128.png b/src-tauri/icons/128x128.png index 62be30907703e7f171c0c8760c55c28cf9a51628..aa4ed32f3f4ba5bed85e75dc11bdf066ce6473ed 100644 GIT binary patch literal 2005 zcmds2`8V5%7XKz{8EToPXd4oxE#--!mWCqKUR$-6YDGn<64aKeCDGEBXXjWVT8znv zr8Lw!LsF)71Qk_F8Wm-%u>`dTkD2$=JM$O3d+u`1{psG%xu4HXac5;JWVN*m?Js>c|2o}!{)U{%;X;(UP75pex{?L#-;V@_*H8#+UbvE z;Kz{~LGbXPMdPVLPLy3r_npqoCc8&5YXz9ki023CPs(I7^ZGSzDymtUOq#d5>wy=N zT3cv+)-E`Go1DTKnp`M;XSL!~UNhp>*NcIlHlAJ0fQO4?Zejc;i0u!^T2A%Zh6|Ss z{$($WC!(v`#vTk?d%-bcaV3rmVHn5k^pducPfIU;5%FVfHHDuGt4S5t&sE7J3fnN=Yf#|GWL@i(L!Bt@2pANmC1IR{kKr zrF_zD>=HG{jr)4APGwRuvTrj|%`LW!lM4gR7uxA1YTrsJW*0Nvp+ViTO&SLljU1({Bs0xHcK^VKgt~LWOimfP zC}#eFGKgLvprGkI4WafGIJ_Gb9kz2#AXIK)}#ywxdMKpJzy2 zzMc|?ME<|Dabp3LOu+qE;LXMbO>qHF0V&5G0Vr_S(jP5^$`6wPstf_&tRDcc@d$Vv zvkEA|f_w!CJ-M9?`!k9co!#YS5=N%j!j!#93^+?wwljf)Ch zPt^a7S^(v{h!k*})i=Mj@u42_{DMv*E$#mJ#oC$V8te>tx)|R_~Rlm|wcyD#|>;kr1k$j2?Z?M)XSf?1{noSbD^Q3M)F8Pf1uEd{5oL zvcSJ<3(sl}qeFMlLCX~o5w!>CyDkZ4aBTRHV%x{9u1}+PSF55fBWdgIp-~;Z2}1g( zzh22?(gRAhhF1)OIs%&|H&aD<19F8vGND!He9?w^dttWGB=5j?uBdB@BXJ5mwcdNt zkK1#M2It?*wcdC(@K(AAzT4^_h6$eHBa;6n z4{L3;d8dW~_aqob(vJ4UkPgA9Cq4yxA-?tC6#L%qT}0U%TC)G6ked4|Yenyydj6IQ zm0_Bc=TxF=+GE!K&ocTd^7r<3|o23_;^mgQM%F{>G2A#CZ|5LJTO(Nw=ImR4{1V<_3&&|KaW zpNgJCm0fe@(r38I5(^XYXJ_6o#(#XhS5~;@c?U9ih;wVu_JyHomKOr|kFW5s2`{CA Y#z@(Yq9a?Ujwo(zZf{m?diUvn0Px0aYybcN literal 1533 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD~={f$>&=Plzj!+b=P%Uvl0gh1pY- zW=>I>wK}-z%Ce{{%c8F=kGi=b?B1@x2mAdV?Dv0g!0*8U|A+hi9`5&lc);)B0slvb zeEWs8lWs#9IP0q63F$3>4kEk3ScTHE6tj!GGnUB%yY96&d*K&+I4St z0747Imczb(ei;A%&j1sLSOjtjOa$yIh}9sIflh^34Yw4;g;?Dyx}Z;N{w)2;v-GEI zNv*uKDfIqcxQ!4GLRCIJ;SKaM*ffOKK;DOV3T9vj*U}!Lg+0OxfhGe(^3tN12m9c@ zh8TzlvB$@JTA5e0voCAsSk}e6xLa@$NUzYMUXcYr?bFn!FS761mRYf|bU}53m;o(IEW*}fb6%3|L+qv_?g$oy7zj^Z!75x193kd%F`3nU9(7^1=(@rrk zFo%1(IEGZ*dOIsJ{IY{cL!^lKq_mw{Sw|Oyh>13Ov5JO>aC1ckG>WZMTD^(0mFuvU zg2rsABX{75oVZkLnWbN}<%x$7r?dF$=vB*5Y*!17a?fsbK=1B3OEWcSOH zCSUH86V5%(QXE*L`2XW3g>1c}g7p`KLVfM$6{?ti^*Gj961sKvlmiQQm_&+Mipngo zFbzC&PWR)K3Z25;>ti)_wRcr)T(RcMDbww@t1iV%o~`S7D^pM=W`BHBFvIot*M2eS z9&8Y;tIxjNeJtJo)$92-*)`B@7Ai>Msrx!U1xaEGRJyKQ1amgZK73Q zK3_Z4{&MEcn=@bXYe&ytyz6O3jo{Ml`VGMk1tugvzh0xdepmIOmYyg>I~&6<+wuz* z?5|JQ@c!+EBOi7=)lhsm?_F8al_w3sQ!Mo!^aOa`=8#pq!WR2~pT$;#-}h3=60<(G zue)Z;#)mC{>^jeDJ>bTOE$6|V2xW` zoP4BCKKA}U3sZS(`!oalznRr@KQb(wD;;Or?aUCv|5ff#g!}cfX=>t+p3i3Ep6qR% zy+-}mJ(pK83pTMHv6+8wHb-OJtJCcBq(9i)Pnfr#o6&30zof_nE{#>{83kNt{x$_S zu-SGUC}wt)^6P21zgWYDi80wkkZG~ofy3W<7cg*(|gH&mhk8ZRq4C2 zCtRYvWcd2RCp=%=>9Mn8X3^8aTIO|D%7#o;v1a}!O61;ME_)XK;k;$M#-)YTtn=pR z2W#{TYRr_s`s`!?xFH0XuXi>)W2L;BCbUFdZvf# zbG{9{;uTk3DiD?HwpPaR@%%OBUYSSCUdR5M`&I9D+FrLmLQ3DyteL)9+l>9F^u1fh z&z?QIX2Z`+=flBaH)Jw+?W!K=nqTj#DcsKNvOMjd^yj0+Na v^ZW882A}H!9(C?LQg73wz|o}eU)-Lt$V6=Mgnh+bpzQ7G>gTe~DWM4f+$;G* diff --git a/src-tauri/icons/128x128@2x.png b/src-tauri/icons/128x128@2x.png index 4c8f7027831d3d8d76ca5f7c7248fdecf290fa38..ccd5d9296a8de298c9485b67f11e6d6e6245a754 100644 GIT binary patch literal 3844 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 WmZ7q+Bf^{e1)IR&M)`&pZvO+IBbxI7 diff --git a/src-tauri/icons/32x32.png b/src-tauri/icons/32x32.png index 23a1804261ef3d21958cce69c02496d1eca60bfb..cb2cf40a46d3a7981eaf12f63e2a36d7f7165cef 100644 GIT binary patch delta 536 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 SwrZ$=GJ&V7pUXO@geCy^TV<;N diff --git a/src-tauri/icons/Square142x142Logo.png b/src-tauri/icons/Square142x142Logo.png index f84eaa9f8b9c6c46cc278f899bd382ef8b216384..f98b72958e40159bf9e95f257c70000481784610 100644 GIT binary patch literal 2140 zcmd^>`#Teg8^Bi)r>yCMh@9wlLL_4jBDXafxy#5kYs@7ywHl#9+H}r3%8ZKR7TO_8 zOfJW5*f3*Tt~({lVpzx87-xOI-yhF^@O_^5^3(gg@AJOT`+48&3vN*04y_#k000O( z=jbW-gzu`nU2f-OCdvSSvOdi5toQY?g?wh5n$P~sW8#F104+P7otaeWA>G9b(-f7~ zczBOrS$1gY&J6&*`hw)e6GYI`A*bV~-n;_37FO9+J>0Ki;Hee)?Ni;&bLBl^n>oe; z%602imL=D^b%x0x=QhqYi^$?z6Nk?#AG)Jz|1Tz>w0InoS2{3rhBB;IXT5i=rqH^n z*7);5OY$w6NGTdiL6OQY7e|W|*Q+?(wwcw8E177dRv6RzQy@>$RQ;)}x5IYz*lD8D z-f;8mBbt^c%L~!n()W1V^ER`*Ve~OBY%YM)gsQ6O zJ)F)HbO_cEe(VyXa8g({wKgrT+GkLnvmWi=kcUZrD>TKa2V<(*uTX#}gueD885sO- z2?b5VLx$6~Gzzoe+06TD!>m7pxKo{ttKz?uF=37ln(KmPmc7?{*Lk!qXp zW<5&g{&Cr_yZ@IMjeajgYG5R(>_&idf0Ry5m5}}lE4?5YTuV61kZ^!QH-u|T2uBs> zupVT2WKaVW(eTs-scvJJGj$#}tH&&<#LX^#gF5p~j#&hoZq34*O0`L4@0yt>-33=B zPppiLKkj>qy0$q|K1hoTDM{&|r0QK#H8x@#O#s1%DoJUmf~dYnS)sGBK+;o?Hh2&0 zK{e9XF0mH@$bBTAEwq?`%M^yIM9OG0i8l)?%#V+{84N5WbH;6eGbz|#w;OjWz!eGT zDkg)PQ6`$Tq!BIx87_&E0F3uMBXF&)MPD!8{<^yCYbomHx&>-qZTenDxlXJ9P4%SX zT1tX_qU%^nV`AtV3t6)vWV9ZGMDtoY;C`%jw&<s3cy$$XAPvf#wwZm~QTasPxd|vXl9L@^Y2*bXy5H!5IjAliu zK?*juK?>e)?^$d9Di(i4@Eq)e<{W8ikB4|GN?zS@2Y~#Mkl3MlDt!|5%7&T?BG23I zNmjY^t?Lwj1o@lrnrcI_P5%$OHUl<}7iD=_K`L_~KR-Dw7CY2$-lN&RSI|yg2STWD zAMBrGX;z7sPv>r>c)ScixhVfWa>NM6MQq-wUNwzq^tgqC*u#g3&F`JRSJj& zHmZnVg+Wiv8qpx{4;=Ik-%xtaOOi5@LS*0y{2M+1gBtr~2SEerCDVl4UDur>#;w=G zTk{(+LrGKCNVjIJq_q9}A_(TKRt#VN^a8o_OiZpW1JBdw0j3r%0aKfby*zG<FTp6lQiI#jclZ5rS!xDteeI`R!yi{TuRBx13w!nrdioMys# z=nqcF*qU~W zIFd><%l3@*qoQkGA*}e&kLkf8L*AsX@6(T%DpKB_Q+a?dO{j&?l3N^|v)H20o=HanAM;4or z3(WQ}dV|E)dkiMU7F-fn2<|ZttQG9Xn@0WjaMYvKPzepum8`KA;6i*K`HPcQTKB-# z+KdmyZdM8v7w?{H+(oDA+reS^7n7UF>KhS>Os39*($y2Jk|#79|B1Da9bqd&$gcdL zX^py~+A^`6=ndbQc<-7Zs&y0O0tyi3z3Wy?%3xcWKY83r=hK0w$#5ovFzXkxz$<6VleMtI0;m7{1 literal 1691 zcmeAS@N?(olHy`uVBq!ia0vp^eIU%i3?wfoAFyIzVB!t%32_B-CrHnoBs*u4+?-j4 zljocF&$sA5P@8w4F7Ni{kO%wxAME#gu;2f|0lxchfk~j75e%3hR0QNBkm6p^1v7Q0%+#H_Ik{?ca`nxPVfXh2 zK>Q2xEZBr+r#&Gq1gb|^0rd{VUkIvVfJJoQk=Capyg9S4FtckTkg zLuByo-MgPZe*wWC5crD%{(-^s_vcqKFfi}*ba4!+xb^n-%izln5^M$eN0%&&bY$#x z4-HwP(WOzbNa>#WgGQmP*KRi~aNzvfp%n1`cMh{>oM`|4i@nEJJofpt&3JC&vF|^p z&AfXyf3nHnN$E#8xLTbS255+IJ)LhbZT4xEwhjx!{6i-u3V%}TnsIT`Zar^tWll#` zm74kQWh;ZuJ^Ay;F!|GG_2)j5YT0(b=2TSG@W^abQ4`e?;udK?yfk%QWXQHPDV3E! z_f$T8dfI#1N9XfX+72IORMTdynf~&QhFLf3^^kn)1!gPfW#(kr6#e1))k8iL3{kuBfzV4Uh%Ng?y z2WuXeYPhnDOKj2w{t4addm75zvaf%g5pK0>U0Hl)Ugq92mv3FFS^7IGy!|;#Z2t9g zna%3jKQ$-Fh=oMB9_fo?KFsjm;w1li;o9%Ng>C+R|1GrMUPX4kX4^xFz>bg;ms8qm z`nV%{B};1z8J_Ld_s_F^Fl%@D&gTc$s>k1-xo)8LD>R3K8bV7pWA+~%i8fg?)+ze3BDuxJZ~Q9r^~p{+iiX|Q^B(Q-;+CzMLe?K z&hT-Zxc@UrG--k_U&*13mmC<5a&je>2AtP(XD`+KboB6zOUH8JW$#*w@pYZ3|7>*i zl#zPc%G49}rH=&KEsiMi6?Qnwki_J1KlkAmOWBWFg*D4I)oxxOcvdj&efgI+busr+ z-_O)eUf;JxRxj4QsLJT!5!34BI*YqGr61;`9c>BUk)>d2YLmg#@H&O88|Hts?dAWk`%~i* zQm3Pw<*pSWIJr<%#gS*@s*aU&ukLvrV9ynpyPrESx2{#g_L|`1(}y~>Y7|ec?LM2L zovnCud;ZVsN9X-r)ouHEZFl6f+*@i_KJA*(@LswrFVQD%cin5duNupI$~P=rw~jG% zS@7(#{FQOKpPydVl=kuo=yFjLnXa^|jl1${!NHo4s|I^gPRi^HPxXolJ^cQAx8`Nn zee9f}M`X;!!jDY3qm7N&Yk0+Xjik)F_24|~Qr=R+tc&~Xy^(t>x Rcmyg*JYD@<);T3K0Ra8CS?2%% diff --git a/src-tauri/icons/Square150x150Logo.png b/src-tauri/icons/Square150x150Logo.png index cb68bc44e13d0d3474e1c4e9a11eb73afa0553bf..a363968579d3d00b91ad03328097ce5c880d101b 100644 GIT binary patch literal 2176 zcmeH}`#%$m9>*7Qse|NnIjx6hm87Aj~ zyO50}XH2dmB(Er{jX9dR?Bd~hz0UdRIsd_Vy}p;9zTY3dukZKs{-(HHfN5^qw+#RQ zXu_S(dTivZO;=alh&EdyrvLzT82s#+OL1d!IlU449d~z*&lw*`Ob$BpYemfZ{lDFj zso|a)dZ<$XjRx+>#l#hzD2z7OnoCD1MW$?xIrnCZRx2oO>J{v+L;QmFb-1?r!8Tj9 zi)M8qK6O5EGK7YMim}JVb>0HpG7F-WuXZ$d z)C|zUGksdueZK!A&$QZSL>t>cIhjq8_dmD_k{*B3%fg1}vxClymU7sGW@yVH*COra zYywmlP@Wqyahnl#>}E|*%~bry!kx_r(otT(MgeB*aCl7&Zn_U6n6XpcnWhRn#?#I! ze04ldUe!?Xy#+cLi+1Y%{T5u@CLLNs5Si@V8CtcS^w2bSug9E^FlIsY^GA~<^=3_l zbhwn6(w+tgWJ`(fiL3A2Yls+b-g@`FQwx+tkv zMe^k5mMp$CdSt1{j?cDGM9;bT`4np7zFmA9=!wU|Q)566^Tq{{rwPKV_4#>mt%nE7 z;5%!4ihA%Vm#hjb{92asyouL)oJ!WAYw0@KKSB|(3b`WxQGYcWCir0`_DMPW8Qwk8 zu80|`pC;!8J7{HDUIHZ;3!M4)?SJO?abL8;-TY#3(b7L+HEI+a6R@4K$!-HVQnN^L#r3ARr`6$=la0OV`EV)`!;UWvRGrTZ-(% z%dq{S#CK-1}pO7|=(o^}MK5EY8s7*m|d>hP` z-T$}0o`4*=?`EY8KVhX;Ibd#e7)!B@hq&l7-&j`f+by8Yspx$fg5pSWoE=Aj*{`lZZ-_4fm0Jw;r_C{cokz#dj_sIc8Vo(Tf|(k zm3U|lH_FTHlt=EF=(aZ95_YiSA^#2xknR0`4J!XK;Q*N~@)}Kkfe4rM#9GbpdaS6q z9csh8RT$FdlAUH2#AxGiSY!tdExPvT1nOVcDr--_8K5E-F|-O5_8z?OeY$sMUt{{F z(vBG~XYq1cMDusi;AOxrI&D)3tcZq?r;K-#u|dRh`zwSfn(42HD*j2ye7mPpuqFBd zZc5EF)-VNt%>L2jRAJcT6=55)TmQ28tfXRI$qRV2C2aJG$L8S^=gmmElgKoRVNo!@ zFMlmk6F}>|lX)i$HgxacNXoaNW!BvD@x?CpB;T*j^t_TrOJ}mhr?r44xgR@n$XFkBL&t^w*vSwly{z)53^%=II0qXsV<^7E+*{sB z8k1?E{0md}gS{VR;QXU%98Sl&^ty?6AgmkbSrSTlS#GQU-0-_+3BmEb-wGLr+zVKuKMT!hb=Z=nZ%04=?f%wMX za-)b3xYbz`iq9Cy5)4+IENs6DZO+R754GkcRJHKY&4w%azT+=V&3eB5aMv8iT9@xF zn4y#fP#I75a!Pt~J)}P8nBrzn?k9oypN#OE_Y~e=i@W$? zwWC#jZAgi!(M>Md&^!5QL4-0swcsaF%6{N&Ex5#QW<2 literal 1653 zcmeAS@N?(olHy`uVBq!ia0vp^(?FPm8Ax*9Z@j?3!1yx2C&U%VEn?VR!?3Z7Z*dp@ z;t5i7C(6v3C_86&N%5YNqFb9n@9zzGu;1^&e*Xst{2mI{9#6+nDh9E50W_41fYQs zTR@h=tvΙFd_05}4xfpTF+LEP!zCpN!NeEwXs342P5?(Ydeal-+>XJJeIapeFA?Z62Ngd3MSRZVo7*fUZS^8`NKItjpWjmbY^*?ciS02}C?g zx&;_#*=qefGRMut4o6Xf`K$Pzz7CRXn+|ESXfw0OiWEp zv$L~vs%w@lU%q0;P7v6I0Q-U97Xs3Sy3{PF?nU*ZURCNjnvG7|gu5;($wmEStE%CmcGLQdT?zzUthri4E&D*uA{?4hBx5HIcIhqu}sK?xePcTx^TVUz4v-1p-zu7ER z@o(3Wx?2;Yp%fb%x$t`S{VD73?nt}(>FVm~>!UUo=I;Fe`E{vl>eg@f1SFPT+0|+y z^;G=$OzZk{S2Qm#_n&E%{x9bE$5?}1Yxnw0PGxTjoUx+okoDrN8zY=2$IqJGFJoQx z<3b~IJD)Gdh-FtGQmA3S0$T%$ZxSaQ_BzlqYOrIM2xhK2B^^ZK3m3@A$wB*QR@pW-NWxsSh zXQ|)1H0OS9+~OyXm6oq6xqjk==JdOA_v`okc=fjXUt^3~_N0@%U-no0UiD)4isLzV zqn^ZWnVPfmRG6qp;=W_+PU~14xz7K-V%0&%^QF%pW*=1Cw7uN?v%XjNan~(VqIRrR za5UuKTUqvgU;C#?XYcL*{pRe1jD@G)-bsp6P0Q5&l>cj)&r$vR|1YPvnI1d!?X8`gedfCNsa1TgKfiR$__{>je3{X@nES$pr+c#de=1Jev}%pjyIn_}uC=@G zjo(xyUn{Wb#@;#i-J_T2cn2#lk1>2*n4k9{xM*+x(KXU5A6BW_yBt2Xyy8*hoJaO= z9dzE!kqK+AiJBJXJ7)$@Skvq&+YT^s>uey4SR>#2wRxIc2J>5e74>$}1xiBSmX*Fd zc4YG%y>-*KFY;QwqEGnKyz}N?l`UU?6J59U$=VfOw+^qhkxX5iG-1=UmD>t$&Ha%z zdv@CTi<+sCr(Z0oh`BGu`2J*fL;8;$QA+wuZCk=;znORA))U`%a%P7wZTnKb`p9a| z|HtmUD(bI)|L*mq%w_*~E=j3c-F~<1S-kUX&oxGme?^?!d+*-VT{`QYRCOLd&#kqy zGexQNn||8*Nzz;w61JVtTs})o@6Ykp#QV-N+6L)HkC=)N{x)EJHed6=2D@u}wbx$q z*s|^8cel*DzaKbe-nIVb{`X$SkuMW9Bkopjky$S;IF(J~xc}_5Qy;lio>rvJj$M27 z>9kGF+rOQ>cH1n|bI)p)uyq>R(Hn!xrZ${>_V(7c-csQBWcippmN01)z4*}Q$iB}72#PI diff --git a/src-tauri/icons/Square30x30Logo.png b/src-tauri/icons/Square30x30Logo.png index 051f7fd5787032a21ddad58371ae76f98afd0099..9f071c7140b275d11d7507a9c4cae951555a7e1b 100644 GIT binary patch delta 595 zcmV-Z0<8Uj1?&WnB!4qWL_t(Y$L&|KZqz^!wR}wg2K|?_S9esq5=n@w$ z_yE!*xq>21M1{y&DI$?76(y{rS~Aaadz`#D?5JikpUZHn2XoK*Li=$)PMQpaZHpr=Y)~Ia|c+$ z={UbWf0|$JzsmO>9x-5J40F6jeS8e@H6fXV+*c!6Np?O77i`0oU7tV8etvnG6`KbP z*cihcud$tvi#io|BO=!JTEigX34ND@qJt?YKyh_uieKNhi_ecgF<{qcGKV#(5675< zxZ2s2SlWc_K!4gYYzG=|e}8}8(w?@}hj;DXqeBMln~N=;bG`LGjstnOg}qkGet@_X z2Q#Mt4cQDDZzy;(yLi%^ynf&8ZcG`lF@`x8t!LQroGJxzsRwL?%F`2FnOskFQA@UP zz71LXimAGzR%5ghQ@V=t(<7EP=zrc&5Yt3K0`UyQZ-{tf%78sv zPTa=Cy2ndfo$Kj~D_)=2dSc-ihzH_YB<*WySLFr^dqF^@0xRfT}qX0F7gwz?+-(uyawT~qo5U*oHv=r%4Mu2gBR zCibrG5KMbc#h$1Sv#2s%B-~>)m?X4>313UlJ1^*MkW`BmC%-V& h-B|4xW;yQt`2$AjXnV=Txn}?X002ovPDHLkV1kL79{vCT delta 615 zcmV-t0+{{m1b_vQB!5RqL_t(YiS1XhZWBQeJ)Ii^%HQx47_{rSf`)|bzk5{urQCwb#N|_Ru|@jDKejF;V7R25$%YE(vh9 zq+?rNo<1&reSBUX-v7dYjWNve8udwgh_7ja$;eYS5|u=kg5WH59GP97J}G{GeO6R^ zpBS()hB;oN>lv*|g;q6M#9CelM<$*GZ)d^VY6DY|v(?3kss8-juRc6{&ww3HWDaX` zAKqiq?5mZ{iGQU`hz_KY;Wi*=g z^8hiTjKQ0AaJCL!K+e|ZN8@_6cvOFX@ur>*=M2~w!yL8NGn`$MGa#Pn1sfpq{6>3I z>W!{AYH|MCM4d8TjN*@12XT6D&VZd|oT??hwc3>umw&iF9bzeio=qfYl2b;!0`bd( zI33OzuvgoOW1E;Hsja2P&!L;~&532K(p%mW+rHGXzg*P+oQC}$$awd^OcEi$o#WP< z1bVY)fdK8*A=b{J&6w#ZF7crznWAM18g-&F{RZPrRW(^7YYK%VhL z&*l2kr(p3lDf@{YdIfIb}*`5QpUw1fhsKuSUZQmB$B#6U1aPOx*n-F+0ZyFS~yccwXkw4ZLZ zvpX~2_vV{7bDFm>*kJ!}Q`gHoSI@U)LlDR_I=HS3S;gaxr+@kG)3ZGJYnit{xyH&X z4=BeG1nTHK^MOB2hf%~V~ zhA8oi;p-;77Jt5d^*k?5WjX6eSMniQa2dGNgL5h~s-ueQpS{lJty2JefB8+$eteC% zRN_jVlxU`2d*IiNF8~wv)zq}>@DOS*=YUIfxtMvGA}*E1*1Z$O&tJV%0EME9JKvrz ze*0my$c_~SRbPKiKTm-7WL*?OD9)t>IDjhbH6(0G$$xP+i$TFulZa##(&WeGl5(8Y zc@*j;Ma$tr0>ql_cCu#zw&m1GWy25~q&bKa>*l|k;X!J6?ov`s7G_hT;h8=CP7B#$ z?F3LHwCdq&-_q5>{}gm!>-blI|D!el9sm!32fzd10q_8L06YL501to%zzYU!oP;hL z>~vq0d4KBeBLKGDoIl+h1{ZW5ZR6E4MyFB~I*zU~#wMy(H4cn@jyAFXAhg~Z^ zS_jsFT#yUpK=&o`ayRBDo_my^e&=pp6(KJtF@Ilu?e~23)dzVwj=6&S`=i{cJd*UI z;YzLKl+4Sptt3m?Ho72j5m+M$&FU6Fl0KY`3eJ3RldXFv89!X+jgPK#d}W*6$4i7* z^>t5tfC%2eTmk;9scFsA)>@@X686OAb2a+-tVyjzTrSz(9P!6b&oZepw(g$f`M2(~ z`*>(+HkBIgDoL`98t=sHIT=n(X{1I;(eu`ilaO8RMs_wwxJrxl$-@zo?FhC_-1_2W{{HnT&U|W4mMba{R5B( VZ?$$Ys+9l$002ovPDHLkV1oDTy#@dP delta 1042 zcmV+t1nv8l2d4;-B!BKnL_t(oh3#3-YZO-;e>&^M5Ni{Ug$lj)VlTaUDU`UIytf6h zt)yTbwb+VY1VMxxG@H1yOEFQXNh#e;(pssNLJkGH^PV*^F19&D(H6n|zGOFoe?Sj2 zFt5BH*&njIGdVN|nJ;{pVdj0m^O^5_-oX1jgyM+fH4M&39e=>ccFu?e2D}Y`YOLNH zvYy=h)SBKmX-)2(vX-xZZmlg2THxyYZF3uS6Xu$EHde>b0E!W(L>+*vx4gt;WF24e)02qXJ}lHO0r%e||k=*UCw|QcCMFZE|(Ks(YL>k~D-B zX?ZRYMGhOCo#2d!FaXt9y*DIoA083T?xMo%2U+p_&PRgZ#p-_heEjOQd0=>lZdL?Y zaIIN++;0j5oDshpz$O0L;-LTd$HV^R-dW$-UG#JP1%H1ual>EAec{*2NgqnxYZ!Ry znUtI`9IOb0al%MKej?c!pEE2;cLca3s4k^~mEvbXcGpah>njAg{z5R`GZ!q3eihWp z$)Hk7cdeo7P(zrJyqZf4hZ8olS-#y-lk5XkggZ;ZC8ByiC01sJMRwPW$n_OOuD>A0 zcg~50%zu}nR!)jaDIF#)`3w(aJ%+R94;7`udJxbCVN>k?CM=pd?8rX^-xOgzd$*J@ zXHA4R-Qk#UI_|KFSQ43d(zQk`iA*es)`%sMi6zk*u_Q9FBw8buL?)KRYaj{G28In3 z3r_J?t(t`*OdE^PjTL;?0IIzJWgkhx4EvmtEq`0)bA7Is`H@!5z(_*bL{xcQS`wOY z5K6c>EV6Gj5$>523!{+;2hy^V%Y5lea7yypstoxa+|ju%(g*` z>mNCyZ56cI{gqN0t^aud(Fk#B`2YX_ diff --git a/src-tauri/icons/Square71x71Logo.png b/src-tauri/icons/Square71x71Logo.png index fa9498477110060efc21a5cf3f022c8271bdb819..94e1c5d03305b40c25e480d50d2eaa18faec3499 100644 GIT binary patch delta 1207 zcmV;o1W5a>3d;$QB!7}gL_t(|+U=Xoixfu~#%rceLc~u{5EAr|c+*R~#Dl0|S>5U0 zB!00G5os^^BaEy{@48N0KXB2_>N*aJCaWljs4+e0s4*%MqKIGFo;6B9@(Sp}Ug>mR-fnjQ!x{df==4o1IVaj3=h?-t zofp5YkmtoXF+TnE@tum*gZ>uum&ULvX0E0ydlZbEqCFdvSJCH~go`$tOpcP_C>?(P z__zGff_=PiYKiZfaa6X$i;Mj6xz&8^T0xGhrJM^uAb-q}JXWzraGgnU1!&2fI5j1t zs=B$?IPTXn3fGewyK4G}7xnww^C$h{%wZpyBin9v%0F4y;s1Ser4KlAY}UDIVlJ## zt-GxDoxG;Zk(-*hU_tyE=)XoAgnhISj-?WAI6&3}f0ow=$d&+mO@sQTl!Cn<4+c-p zuL{Pl7Jo38m3oeZxN6^cVFoQ!_mkHKN9-|bB43qMkhQEtsUR!(y}^wfFgP+swvj|> z?Vf#@KRUZ6EG^e+qJ+bBdNN~8QEnSV6`(aVY{=rT&}4FRQwLvRQV!67&Vhu{z#g7YE5seE|v1bX2M=XzeXRR)Weg`?Kn zkbgOzj#q7^B`3_B9<|68d=I(dRol(V?4q%(Tyskzb6V~V_QbloH10X3vJy#KPQv>T z*K(jXy!V&#K0G+l6~G8m_dHB1NiW3CDaV3+a}NbiFMJbwADR%d#e5s~&9_+Zr;-0k zml-YcD2=EzeG|E6yo3uTtpLa`FWc#FgMUi~P<#NA>SjOrXS%-kU))*|yJpfTa^}=s zI>NvrOR5-o$3$sqg@eBEE0vqv9Am%LShXNar?jL`daXoBA(QwiYdinz(pMaoBUMrv zyj^ZX9~om7)gwu$iUv3dYhW&6DO>=-ePV4^yMHR-hS8e#=r5f%oO<%}@wOftaDVL6 zYq#3S7#n+%4X2(Q7mm*)vA!-ZDy7CM_zygu%E%=QYITdFnc3s{>cMh`EMW&e8(_U3 zmD$jue)jVBcJ|M`HU@Z^Jf5DqzO)Y2O|SX!A2@2l7yT+V3*~9<<002ovPDHLkV1mNlOp5>j delta 1306 zcmV+#1?Bq739Sl{B!BctL_t(|ob6lfYaB%!p4@&Clr)!s1wqjd>bLsEe$fw7m6GIc zCRM8;N+{*}#XmwNwrtwF)7VObP1EMiqouJ`6hy3TW{62+trEnRP+xj8mluTMKae#$ z@|%6R%|*oBTZHKEfrr_VEk9=T#ck-aMJfAbaL%-PLx6Ds+mXT)u9^qP2f%FIS z*`atSP#XlXDXD)oKz_fyhkQSNki2vMSyIYY$nl3J$kN3@a`)!*=J(*n#A0NAGC1a} zLkiXre1_|4Uw<4PPA=2DFqT(>jYv*Mm0&hdavFp1A8OaH4%llqdhMl)gZ9)@WxLo_ zwa@q3_OD;QV6T4DXMTr%&_Dk8%$9#60{>YZX3!I!we_|+bKDnQ-WzJ zsD?Hfsg^TLFVE-n&2z8nQ@c*+;*P2=byrL~^>kVP^nclY-S|3h`a%CV<4X>tT1LMU z?2;1np0EN^agGSAX+$!@C_&eyV2(;i$vrk^sdHxcm~%LD!72AlImNE3X-CMkb0L4k zSy||JA4h~OVD+H-Zg*S$)w~Q28$XDn1{Qe1Y4J!y52E$rJ$}7EEeSqbC>6H z?vJ(C+<#Jc#Vutwv)Ea6k3Tr!{`~n%Zeup@N*-_g7HYr!1DqrUd&0k-OlsmN!AATO z!JP_p*Yw2_2TJPalE$J8GnegKMir<|KL8y|6K4NEGdX1Lg&~` z=cFJGIOp^MBg__YcBCziDSb~I&I;!BBn{^%zEvEx?Zh$jZE+4uPaMhVwiah=S)n)@ z#S!Qnjb)X^HAmxuEbwWi@lnq4JqKR`<3QmXGK!N33Y~-EB!WWcpg4)3&^ahhA}DkY zihq*`3Y~-EB!WWcpg4)3&^ahhA}DkYijxQmorB^efh$H@c zdjd_sC5>%wGIY-N6~~|Nragf&jjgr{A~~LOAY_rAIRENCbp zxOMctnl<_4d)CsWL8~#F_xk)r+Bf#O!r-nK-c2R^ia;O`2m}H_wlDq!l@peKJ81Wj Q(*OVf07*qoM6N<$f+7@=wEzGB diff --git a/src-tauri/icons/Square89x89Logo.png b/src-tauri/icons/Square89x89Logo.png index 2566952795ab15b0f2fa2320f88be5bd08f9ca18..a7ee0de93b59231936b156791da700216b6e4ab7 100644 GIT binary patch literal 1172 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 Y136He^Xm_urT_o{07*qoM6N<$f`#?`e*gdg delta 1145 zcmV-<1cv+n2aO4kBYy-`NkliZ2Z52Gk;P6P~vb#+$aD_TqqFt z-pyY3&cvJU#iu`Y&v#yS*~oyqzSO6`r_pk8jU?2+OLP))adjh3gb9FQ1JV+lVN}Ye zQMs5xKh3^|CZC!@=k{Gew@$r-e*f`hR9Z-@HN0&eY}QoYgEOMuLn6j)gh}*^b4CsT z#lxJD5E*Cz&VO(Q3M8|6yC<`D?QmxLxrxk$Cog4+Q%5u9)l{aGPwO?bbq=7F=N#jV z^w*F`gohQUtisJ_IU}MTxZ!gZK#AasSp4?gAu;p98FBj28FBit88P+Dr1*L6h`4vN zS3seC4*npn1I4?{p+>(I&WK~`@_{WFh$?q@r4 z{wVs=|MvA`{?-p&Y7Nk6`8Xr@^*fM3psM7Ok%<7qvdLt<4s&_JI$;13)ckFM(n2~Y z7gNEF!J%Nx^@40iF39f91t)jU245W-4K|j00w}c4!)pLEB!WFfgkshFQEx;Op?DZ- zh(sxa(tko)l#3~`@WGH6b3Kvm$cgOUoEU#(R$T2rE;erUsM0cdw?hCF%V!HfYViCC^i6s9y5zdGYx}Q8#?$L>ar6s3}N$A7Q5D}&t6cMg}7UXYQ z>>Jr}B4CIBC7zjBj+|bW2-q9R+0x>+M@-nM#eeMh74~j5{2q<=q52BPtl}roS z|E^?8jnYW5l1#OTtp)a2+OP5_8bs{vZl-c0L-j;X?w%D_UpX!|mLm}f42g>N%Ndyu zZ+|3?(wO9$eLv`vk&5{JTDc!uKw1XnV#?2d^u9lum{*p9#0h8K|N7NW{LPhaAM)~) zTj${Q_)8upP%@^RG-chzFnW~LMwQufJ)%Y%Hm6u$>Jw|%4vXn$C&j5fUnryJeCK6R zoOgKYx7@ zdA;N4ZM2NuLyPEK=N0tFFE7=Zq0RO~or9|lQ$2QZ!i?W&B*M}%M5IF`lS#WPX>uB^ zEu@uQ$`fbnPM34(`3ufl=(h7NT5`sB%{l8!ed>E-cW)1h<*1c|N0Tsz8atYumMOa$ ztGWp&Q5N;qY8T3XIEcPE@-f<6=|)g!w7Hw@#Z@#s--Znv=%M3pI78-4VlJ(p00000 LNkvXXu0mjflJ+t< diff --git a/src-tauri/icons/icon.icns b/src-tauri/icons/icon.icns index 8734c32cd776ba9178aec17f1ca7ecb07e5ab029..2fab23480e6a52d0c51f806d8ad8482d5738bd21 100644 GIT binary patch literal 22121 zcmeHv2Ut_f*7i<9?;>EK+OP|XG-){&umTE#^bXRif*>YXKtusSdPk*77myyMNe2~> z9+2LP7ziZ!X9v&u?tQM;d;jyD`#<0JKMrJP_RN|!WvzK#KH9;(@T80%El894G1D_KPP>kg}2wWy`uY+mVf#9A1Suy=%Rk7K=J7zdHdxU2-{k%yF2gvwM%` z$F4hD-FvnPzKz5Q$A%@vhJ|CdJ*w2RxYQ#NAt7^s%d71sjYbr-%$}ks`e0ToXV|#h zik58s+4hw0@YmS#_!T+&D;EjX9~Ge7*Bq?wug%jyqo8wVluu`#G`wqRa`Y$!A&>t+ zNrVMBnA}J-#8dw_vbU`in0o$Ug=W!rs!LG;}27XNmi0aB1vRLB>aa|BrB3Pf+88Ih{_|A zk@8AN6bgyT%ad1(mRSl01%D{iaagEQ4Ku+?{*|IEXUxQ}C_B2xJUeHv?p{WDi=_2u z{mejzxT|&MAk*y?-T9|E>~g6ujw+ftt=>NJTsJkzo;G}s(rE?W<9^lVfy|`R7yd2yDUba7F}q{GMi}#N@JK{xr6{ zAi9nN&5T!kCE3$wSE5z2Nlxf7XW$12OJdyI$Sibz1xcY>FFI7W&inexl%3vDK{o83*xSIsS01B!fT0Z5Eh8Khl00ET0!$^1D z)j-~uKNby`)$f3_K?82Vg0Qh-P?r(7x{W0QuCYQTkT0e?PaSZEF^9T3Jz{@e7hnc* z>jKT{0?Yy2Jz`I+4>EncIbpc=Ld~P=!8;p`pPLi5Lt9LBnez!Qlk_q1LECO-lz zgcA%_*D7biI-M$oIL>Ht9>e#0%h?5l=efFz<*M&3f`Uv7&NM4M+Oh*$ zpqEYD<6Yi0`)#f7=5yZb7xv8xKSMJbf&t zG{>W}wriIKTZ9d;b&YK3lLOK&x{&|tDd-{wQlpROJHuw%$-uXth!Q%(b`hdMfBz@b z3XQU(C*SWFhhFa((s4BYx)sr$Aw{=Geoy-3(Yq|C9&?^7wh+&{ZE)wf)sd#DO0{vr zg>!z_C3qRvkaDH_MCVoe0!bN^q~d{G&)Qv2opbdDOOw`nqf3i-RGc0;{k1>Tqo zREq}0smc$u=zBV>$=_$ncP#~KNufYM_g6@i69=AF@Z_ahYSglD3N z3#?=Wl68TMB9q9|G_0ZIg#|L1l?;->Kbd+*W?f)mL8016#MadiB+I&l1aX~MR74XJ zvcSp;7{FK7R+QuviWG`uMYKvxBSJ!mWQkRY5CoFMdRrd{YsZf!HZlgD*lyi3k)3MW zFLU{@JD5FXOWgOZ-=nii|AWWeNcOdBJk|Qa*B4zagzCP`>ho=DYMk?sC&UKC=*7zK z1Z*L!^`noTMTDZ5TTiw~`<|e`cV6{q)nJOg|Cuf37F!Z?Myz})-HxTu(98Hni;NI3 zJKYI6opX;q>nVP=*~7YgmD|tR*^m3`GV30RsKFGup+&+sjF9^Q(%OE9;E49e^=X^5 ziQ~iTZYGi;-F;H>3exATy`LBPg&Xw6@0=h7D^y42*u`;FE2?)KmlW@44-E?m>Ff}f z5bspq?$0zhCBVC7(iHsxfAo@L96sA{^YNM5LGzs<7lngUt40T1FNsC*81Z-#xjaMN zDVDoEaFt2Z)BM8)wO^!t?v?Q`-C}2E4+v~5#3u!I2Qx+u)avvMND%VY^61uhlY4Y{ z=xGS1CqM02u9N>*{Gj?qX>M^r?E9I3+F;-1{C4j2%`XkU9w|}?lc*Ryd>$L(K(ZMAsQhF!GMO49N2#u z#Zh)TjBIMSY9U*=OJh$D?I~e@nmuYqj-0OFQ#x%QJf%|d=^ev$y_jQbf~~s*3U4zn zHm}MOQ-s5oSX;A?RK28sGLgMS0-G3yV*-Nx7(&8%Dm%JUVk1&Yc9gFBYjlhE?N7;RMYm>CDl2|1x--TM#N+zk0VH^9gmyiQiIEG+3ucpaY9cOhrIF*r-C?Q@W2cgE{|Gp@eTx28qV zz5Ro`H`J=${;tL|4WZ6N0(}2Bj~ikT#KirN7>EE=2#AV-)~~Lq1N$=d4>JG;7BIE{ zfFSBEfVe;4j*283t1t`^RLFvnVWS{S1{e9=TG)WBjl_-gjd;9_KY&UAnBX?o$b&** z1+dWbT79VMQgfsczz}$euR9Nl0~i7E%xhS1^<{psQ5@jI27*y}ey?;R3jhcJ94Y|} zsvBhB7E~9oJ@)tFFc<>B1Qx<;Gj~wS>XHPETHisB+J5T8EAi`bxCj+Lzk}iTo__B# zKzPt*K=W)z1QqwFI9Z|cY$w1;Dx6lRvn9)f?ap%r;;(^%kfBV+;mr z96T&wU_sjk-ztMAJ71O;VD#W7RVaf;ya%)?KvLdx$zbvFWqkq6DlkNT9EqUU335+> zXaJ0ZrKh)0?fGwhKydX>O@RUCO`8ll61G2VwBcO7`K{5$bHFSF<{|+6Of5{N78XD~ z7_xzo^)JwpiZc%`B^?O;T(RMMiBOkiHSL{Y0DJkl>{|j zG%`ORb~{Kw+E#^AMzY^g*@cKX;v(HmNRH4t>dkSIVaNS{xO8$^@p`Pu_g>Q(7s6Do zIFehsQpN6G;@%b^o0uXb;!&Bqx)f&nzWLz3?N9l(S=u#iOU)y-NZ73l`B&7`e7^sH z*_$n5GbfMnPM_zWFH7V)Xxoi`xV02&KB|0>Piu7FO{vCL+jx#yylqk2cw}U{h`WoCl@TRaiz_ih zFn4BgY~Wo|d1to&=0eVhXoHo>$bgPD`mFIL_RE;pMa_FJGI3~0J64mLYZnPS@nw>jyyy+yp;x?AB3f%Cey=f@(&0FI=vv1l&hS5y}Py|1BbGA=Ia4*Eljgg~bF zC+o2}IeNvJr!{#e>NY*>dplgt?47ffvVJot8*y6G^$CHvN<#KW&K}ue#2gs&QTWkQ z4~CkY&UJ-~Rg%gJk8aG2dOPnZ!GOkUEa7Ir{ljS4yB~S2yR1?r(R6#B-Y2Q-o>acw zH#EbJ>v39Cj|p7hkM4hQ)h4Hr7vDvbdp08Oev0fhlk41`AMT{CCS5s;h<~VA?H9be zA1U#TOFBbC8Y(B%_ORrOV69$z5;9cSu;TB|shlsRt;uyuI33J~tw$xN6C)}TPi7Do z&@cI*p{V`(lTo5iLY=jsb`N{H>_TlG^rPSprscE(ceFdW9sHm-54<0TG6Y8AW6yfg zpn0~7sqIA1AIhcUfs(VOd?ClnRVZd$nh$M5FJgzChauw4IEKy8)dx(C|K-6>8teDY z6j^m<6Z;`3{Rp>^8;=%>8LM_J`ZV^_eUnfeGP^ZAf)g?88F)xG5K7!!9oWW+xVBvy z#e|jN{jl2~qu_Cu%Mzkj9-zS|3zmn`a^(0AX$2m~8Xby>mepp%+EW%Jo(m${udm&z zP+^0{8urI@y+Fv;2=95bM-O>YUEtNx*X2;;W#{ZG?-37U-3}RXdg%9WV=&%kcc$3@ zaoKgKkSD9#f;lCvaAY|3#Evokl-35D{HhE1Jp~fJQUQVU4#mkN)#PqLZ1=5{zULRD zA&o1-7fO*^O(b|uovWHT=8qkp%v`XNWJrlDOe(qXUJ7~B!{?+y_VTeYiv$~`L$<<4 z2D!#9wzGF`pIk;x#-&~Mc(d^M$QQ!i2gV8(30Dx;IHGd>xPly*?$5uDwNLBJJOfyAF%QDQz*vTVFwK z5)Zt#T5l>$S*H+=WFP%@-F>~4e)i!brlU_QFHi5|)si|a>0Gy~Yu`EeQJ_b45ydHZRVM_&r$e1HJ!3kckT*S;^H1Q%W@lUUW?Uv8l$Ote5drW z51)b@-x7LfFa_1W**GxgvzipzR@x-6`~dmEYLGc$Z#&4(SS=O+b_V{|C=`|YWfa0z z6xGuDWfX#O_+=FSG75hgg};o#Uq<0yVvhbY3V#`e|J#hhqrgaHeEyG~LL`_G$PG_n zWzz2Vz-{RHcb>uxciR8zD{zm2_6G?>M~ejkuT^V|VSBR9`zIE0Cjvet=>%+x>o2*I zqj%>+fT& zRAAtCz}XS(vBaMUc*-B+&l4ZAJF@(iW1i9NY+X#E!jn+p2tB@bcn|aR#vZ16Bga)% z1f9!F)k~wEK;Dc6vH7XR$M+|96~375G}LJ5Se^FV`T5I<%H3EQ{t^6>r1s@L7CwQ8 zU5~steTjbE0mJb*s~-WsA9< zZt7JCi=K1a>cPBnm!LGkyA%VA7qcdGjb>{X; z^2B0o(zbEl$GSr&nF%5dT@T*-2u`QBktEM#IxODmy7K(#94a!(YFB)Yw38QmZ9NaK z$5v_FXz@Dt%5f*prlQ=D(PMj8(gX-|jlKO<##0c_-eVRi)fQf5>APGd@8rK~eX{U= zhsIpSTVCwF2$9&-+$(AkYJ80t-t5E9&P{RYh;TN3lYL}D9BYJMl*qxG($4;@6BR5s z?w31}Q<(6^<3jvh1j=D^DJ(d*@>M5$zqCF;vSM>4x83DA}NbJqmJ9*GspqZ3|Jh-D!ciX}>$Qp57 zsl)_v9R7kCdw3X~} zv8}jTMj^HSR`693weQ49!p)omSigjOe9a)cY=^UbSUU1ev~;bvNF{>nR6r>eu5Br*noRdX1+^6?{+I`))ioc)93{*{K-uj+V0h0L0VUu2<`)I7zv$>7Z@ahXys8b^56 z;G@YscV<@%|K5^vijZ}Q*jQ}et>eU%h4JSVu`vzA$+4-!f;VHP$NBdEsnrjxnIB~4 z1iOgmcJwfNjl#3xzczD4rGJ@dzf81$IP?6=MEhl;{W8)1KQ$bFb?g7t2>de9ewk?h zrpw}=n`lQx!CO4N|L8@d0a{G6;YB-J*^>jjXm)?=MfY59TBF;H2I618pDz-qHfsl#AYl);A|VoS_mcgTwu8@p>Q~ILt=t&w(Sq z;N>E46b#O-Pywg4z&0W{<@}}c5;)@iBa8?YQ=j+PS07uO- zHL>8(SlGTWaNsZHf_H0-L7|mv`7H-tLSkj0Ao-a8eC;!hl~5IMO1I zJgdBG(-3S5{A$%cmf$QPzD)Iv?M-lcxWK}#GyU2-j4jU7E=D4-#L2lS%=pD=U*N85 z3N;4jiNOgr!c}HpAO~5h+e~nX0nOt2k)0(0uZiiRDs5dwz-EZ*@vvw}|II7T2}1nVD|t zm6dZC^gK12F>&vkb9>H!qpe$ZPD$2@mA$%|SrVHr(!A772#mrkR0g;A)e}F|bliI& z6I|UT`uLqgfz&OF!M7bXAKcAcm+RO?M$;*;zb;{3DtJErP3?k#>lgfdzJD5WtXn~J zrT=dKwl}>!?x|h0#e_1-LS=o;$($4820C0kTOn*+P=x;#HZM}n8!Yhco zFASd)+SGglw^;8O?*v10i$wS0^UcKc-6gKi`*jMU@mM z<)0j@LE-4%kC7}~Y%dg(d2sTGHQT&LEv78*i3dcoE!OT!Q zkLFnHh_Jqm=B$dh;~Q5;saqAfB;%c9COvtf>05f5-8oiDlE|b8{{`=)0ri_Ln3<25 zZyGyX?N`mrQf0SY8cQD9=U#~qNOU`(z<((;?0`tv+z3-)t_D(HL2zYR&C+V?-21N{ zTvF@(a$+vVZ@S`D90=?@VVVU&eI$bjTAPeRB6Q{mM$zj6@<&}p^-e9SN|L%uj>X(F zsgMmQB2bn;Vp3JZZ+*3~vp&{5_GRDTd_Wq-&B=PU>v_b<1k*kEOH;`97IT|yv5)O` zCi5Kjl$kIQ|83tq!dRV_tfNM{q#nO>Ib$TN)2|!VLMs3IQc_j)=7LknIoyur{?rD! z3|5UbLMbK8sVHWoec9<~bswc&3!PJ1UR)Zywt5lUUnmh$%Aez;UY!pPVBmM z*7>*VeSJS7cJz`1ZY)2Rq$FgKC&_UQAv}c#34ROe zlRXssU~K9ew~E}dYxN_Ih;QMv>Me9n2rm3$j495w%C6ljD#b*~mr+wL#X+*)yX#I% zN+k$J>j_!UMvjcBeo9dRJ8v&(b05XkJhoBp;nIQ^1TOcA_KL}jLcZn*R>6W8XW@AN zbjq0fcD;v;a}=?jsp?cz9|aSEy2#yGXwit^eAn~Yx!Dd~RxH}x^Es%A?8tTjlTS7{ za9Cc;AiQ3Qo=&J<p_GynC3+TsFQGgx{Vj=7 zD2?kS5CGGTzAiJd_#+J%5`W*N&9P)c`DU}c_Ad(TNsIYgDMnjIk_Bw+TE=plX@sva zhF_nY9WUg%=Cg*uSjQbabor&>n4Q@%Hfu35MxI+rtEl9QEczW$d#wp!MP46hZ?jld z=wgWv)afr1N7*#hQT86<vwcOcJYHPd7^ zZzx-^-{pl*^iiaboe ze#=wT)Og4A_IZ<&6n95KYIf=BzI`ihn>)a$WoPuQQVME#2ozHp=r_9st)i{9;&ej( zej^rs?P2$t5J8Oy?d?6KTU1MyD4n`j85?K`p=0JtM(QR|qNsvQ;q-CzVn{f986ZHR zS!XGAu8>B#|B}&6L#@uio5-MMgz#ND`ny)kQ0o^`MO9y{ThY}XeynE2-uaRHSFu(3 zU)>l|&Lk_=^ieizFx}Kw7q%`z&DSgAOh+DkLD!8zUv?$44BU%@-pI~sVuG@uMjMd_ z%Wlxh>JA~@MSa6Zk+mW+tPXfu?6=q)9E;Ed6MCZOymTfnp_2#J+Lv~1S%M7%8z`g!(Cg1!8+&ALg z?2t1CT(P&=S{-s4PT{;x1TWCy_J=}af-Mg|8j&K|#sp-T0~2!^x7}M2nuAzw2(b4$ za*81OJy-N}HKCz7fqq)_BTMvHpevHC73cfgmdis-Z`nh-D`@8h?P=6YHw7lW-Hh^H zAWsPjLzYZ4A#UHA4ZUiS>7yUyY$GThpu9C2Jck54R{7R(g?K+;3Qoq3u#uS zj^ShMr%^9brI)f14h_gmsb`g0Ei8*guQ>^OkC!;UC?QiAPI zl*1Z)Lr8ea7^cV{I4n~4 zly3>QtbSigj|YS)WzWtbO1&BRqO7Y%IOpT_t^GkuDP45p$@wo!8S|Dg2)FHaa+Eej z!$@uUCGNLtx=5FW7f3_f+28b35bI8y__w3mp)2i<9ga9sDVr1o0m(RdyZ46H)V*STP)5Srxb@ zMI9zRp;|9O4&&#kcjwwG?)D9RJO$w`9VJ)70%Y1xp|j!`&XzGswHm?f4(5IIfpA}^ znV>5(D4O4Du}^T%R>kALLbtb(WnN(@Y!x)<`t|dw#4TRRY$bMAkn^&{2@YswzdIZD z8SB~u?CY4a*%E9cNmSC@?dPsu2nTg5OIiD~$qiv%5Pp0Zv|h24kp{bKiNT@Ns47rdGfENx zIk-%s(Atpp`U(x?f3eBd+okx}rOnL<2><>S5-DW1SNAw1b<8a4n74~NRLabN-G#(0 zZ1#S=4T8w7@XsmCD|9=8FUTBhkOQ+Hj{Z0TziYGcI}HCM0vG+O0|Q`)g_-_10zZ#{ zH-TY-A4mRKXN2G)|FHo7Sj9gXBx=?_=?#|JAe=ZX7Bn3HXMKY6{uANHf)|3Tg0uc~ zpJ3tr=faOi2~Dlg@GLx-KamH7h3S5*UDPZ%`>zhSdtr`0Yqt1plpG!3_T5@UK7%3)lDG>eXM|V3^%cB>yibBHZDhX*Hbvp9wz^J)HH^ zZb1%BFvZViDxCkH2w0fupVWY#_Gv>@|A{8UJb$9t(AEzy#ZTk`3Bd$EQ8PIEuMUFX zw+w#X?w?2j&iZMWHdKsC^_O0RU~WGfsh{ZV1{D9xUj3!*r7}aq*Z-FM|7EYJ_57t5 zEX?gEg9V{sf|}-fPj`KRL{Siqas;}x?bHdqh$LU3 zsd@yiE#+ksFywU_?l;guN-xc!7qszRS5eqqY6B0!Gr?1NO;A{I^VaNgYwI1{$#hukPTF&Hbat!jT`?h_1 zppxoj9|$d5#M}GLF*&W1M(Bp1X*A9G_8ELs-3kZvaP~F|>ymFOFB-4r`q2pg43gDh zU`JrP9#}wUuYPV3i1O?aUI*R$%7qBf`~vXc6=T) z-O?R*f@z^AcDRp8Aj|Il>IqaJyQGF7ec|oiIs#OzQf@6em)_>bs+Eig4rMkk2upNF ziSi%LXrhr8bp61MwW+MWeCk%52u=Qz5^qjTrcv0ZuuLb^TUxUD+3j9mUi+n;t>iF7 z`u$>W&Jb27zYyc{%)N*-d!(#E=?Ep5D;TyZ~Brv z&P9r_A^-(Rh8`ue-`tuqWqi+`?tBh=_A#vrGu*z%!kRqJp=O)2pyRsJP7EnLSv316 zQjJQh;541uKXCw8Hd55pUBSuqV705r%mNAuUA9Jx z-)4~N==f~R7I>XbRgQW7mF{C}5(h_Z^~_P*v;9p34C}BJ9FEzYdta8eUJR6ti_6SW+}e2 zluLbOW6_Ar2}^8Svt6ggyX2O4x0m;x9O|Bho@tITYZwFfrSv2X+P0*%y=_Z4YIh&w z=Q6<&YYF;?iMLDht?7j(NDAXq%2nzPL^$Y7HhzvLE_9VQktazhqMd1f;>m-0z0{#WR5YrE%6x|o0m9MY*m?Y=H#eW zb6mJ%=3)MhgqbU$oNkrv|2VQv*ceSL1UTX6-IZB~5MZw7A-mY?J z+CdnRe1z~?Vtu0PLRKI1`;nWWnw<^Rw}~Oxea&Nj>>Zk6u1?ZZ6#McuO@$cmj@X9e zUNXD2WISoT`sgXlT<&jncWm=yqsZ!pTs3(kP5HMBkg*TFa{R`6GRT6XCTPv1B?3Ky zYrUOMNap~Txqw{MTJhFo;DetdJ1$HWSp=9fJqTLD*z2!mDU)Ty^pYq(vW!yHEsIu_ zT;A+ArMV%qoyZ{vCu_4?ZIc*Ix=5ca_L!qP*(n!sXiSnxX~IO9N8kNhIO{QJbC=G8 z-m;Ofke7?5$7AB$mk2bcFUyL{{p}9P=2=Qs8G%A9Ixha$)s#p-O`^zoI)FWyJ+(;A zMkKr^!$~$*T_#`-^oR)ek_ee2AF2!T1h+oK3>?CL8gH5s%$N8kezh}ASifi~g1t1C zGw>kSP4jY+mDy~`VvMMQTny#}cdg^s^NzC1uZcbmx$Aws^_m0C(_Bo_Din-+cMEyJ zm#!;5H7jTN`IMxRO3@l+CIA`cp;OX?`j*CZNdC^Xu50_qBmU^`+f*Xms{?EO1AW~d zU7sj3ZXDMIPk0{t*aJ4r=B-=}E(E79QL<=$yk#~tZ6hV4b4a;g%Pl)U=e2&9p66nv z-|D2oVcJ+SWl4=CGE$pZoW;gwFg4y3Ei3oQZjr)c%c8$k%5(8Fb$hSeoT1cGz`@ma zd3E%IV$pfr^t8>5l`zRriMXuHz8iCt1|Muv=xF(D`jg6-vc1Z&0&fgI&SgwB=BS}g zJtvK+_`f#$cQ+dKA};p4uls$cF>h+`pM0(1f52Ajzt?i|6j1^B=48&dZddTzLH~99 G^#1_5CMEa) literal 42599 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 Vn^E0aL_K|;RJ$`qJ45IB9Y2^EGB*GK diff --git a/src-tauri/icons/icon.ico b/src-tauri/icons/icon.ico index 45cda469c3aa409cdf404f118dcdb4f3f97245c3..2831bc25ce5908ab712727efe3c52792e443178a 100644 GIT binary patch literal 4286 zcmeHK&1w`u5H2T&ARZJCxte31V)P)huz@TJ`VhWF5LOcM5&$!TwbI}tp@+dhHx zfB|#!=)vvD_f>UIW@i5g**!V4e7n8XRrOWX^h{TaJiupnSNJV^PegV^WDkHyUI3JL z*YXMsE(&QNFOos-6377l20(W3tw>&d`I(%grwWcKGkw!Lpsm{TKj)%0F;`9#g@`uds73yU7Kvt{eySBoAdryeanSxaT)xxMTkXU##IY z^i%Yi0(0|c?`?DJKZ{W^#kJ)bjjQjSCkbs}DvR+(|3hT}0 z_21Vk`)}CB_09Ze`K|X3al~^-RTH&=4?8D>^T#pHAH<^b$8Al+*~OkOGYH$3e xcdzpo*EnjeKwn+u9(wFH{eSzv4A(!A=N$eOdG<%-@kHd&IzgZGO^(RL@eSsH-!uRK literal 5856 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 L$tIY#yzl=5D8eb8 diff --git a/src-tauri/icons/icon.png b/src-tauri/icons/icon.png index a7d5e953fde9454a7236b6d8c73aa59d671508b9..49591ac9ac0c904d9f0e2e6e093eba703a023ccc 100644 GIT binary patch literal 3863 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 literal 2575 zcmds2X;hO}8vX(pkkx`EmK{oQK^9>Qm`I6$q83?F3PrY{P_%XchdmGy+M&uw2*?s* z!!8j-HX&@mBlTU#Y-zip9KIQoU?=Lu8nn!@-628h!QOikD&q>wHeyl})tWD0)CuQhA$@qqpX^@p^Kq8*XBAzB@ogtFV zALm%4xu<(Jb=0`DP;C+C?bkA|G2 zxlA)YzPW~+>b97Y%V9{z@5P*e3ywl4uiY?;D+)G!(ego|9qJEuSZFE zLdw%3N?BcNTTd@%cx3b~cWh$n-R#^Fe|hD@>e~92U~kF&As+yw1=s8@xkhnU#>axw z0yLOwbran1XNq^@OH`B`AeZ#8I5pd;D@hORlueQng@Ne&MBO!326$)z%WO}-a0w+J zx!gTW4JdsR#Y(T@g!NUt+juq3%bbtqIZdi0xSn}^=*3kAbO0$Fa14+@05SmRuM29t zC(2^0J5;Uvw*ofa3h5A=z9xE;7%v;o)eFP0Sc9Qay0=HU5eEv6+(8;06e3F|z^1M& zh8i0~{oD84i`|m8R?}Ami-TSztswtxZM4;RBec8vO{8EgL^oH~Vwe!zHv)$sYE98* zJdX;q@OzIYHPFQtybu$IUJgtJ(YQKP62)(T!rzXf&udu^d>PF0J+!Rj#RKbvrY}|t zcG$DaR#@NI0{B#M{~?lR1bEZJxrXGZ(^J=t3B(Vtn!8(2P+lcrxI2RllX$9)fzR9s z7ChkAj`??jzg9dvEahv4NiC>h3}^JplY$wdG-^ABgu9K6__^x!IiN8IZ9XGpn9~~z zd)kU_wapiHK7*)fO6XwpXNA6^lA3A-K1Uh}>clSZ`F7$KfGajRqBKv7h}h>WMLRNc ztqaKqEw?lWiDB#I;CJMq!XbXXLSP_0WeCIts=G-OpOFLU? zhE8|WguiZwH6Bw(?A+-M|Bmv6epeor`r6?RkdStcSQbHBeAI#NC6ULqze1q(7v_Iz zP&kQ)Ze4|$;tqOZq!HgNxUy#@B~M9t*UUO@n0P#b5pSV@-&`Oo*jTcA0Xx9d7{_zp zIfk1n4vj7{F~$|&%RC@-!Z?*_iE?=+F6!M0M@&)kHHGn&fLVkiyxUS@d~)meBPrFP zTo>qB9AudsF{Gl3;|_-Y?@9)wK8N-{S@d%?;wLU6_OQRs2tHB&zpdyKTpoY%?-q&O zVfI~nP9@;BLXL2ilbfo|ev^F04>a^KjFhTp&@@$UhZ5u0 zIrgm(!8#Q2`mE1&f>Y9iH3;>wui)PvJ#KFk=f3@$A)XBkoVuYcS0A^SpO8IayOW%7 z5Q8Ha2+`mZnux(4WuoP;&d-lTRC;VLrqtoI9S^K_R{^M$7X~^Lz+|>;D-D|8mi%Hz zv~Mjk-`oWrcgz%BXVRK;^4B8*xUZ8IO&d9&EzApoH|Ln|~ zXnc2u;>mU6Y1OUwsr}*9(0)*8X zVthAT?ANjN|M6?~!G5kpxI7MT`24W7BEfU8V{m-aJMN+vt20Kp)3tdZ{?uVI%qzCi z+u29!$~l9*?}Ob|3>Dk=)m8=VBwC!Pv>Ny&ozL$I+~3bpqBd@=FJ)gZda}9s-mIb7 zc~T^xyLpru{or1^2hs5Z6>qF-+kLKvtob_wWPAWe5;4#@Ks>HpcC;(ELH+tCqVW)! diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 0f89e41..e7a2c1a 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -193,8 +193,8 @@ fn main() { .expect("error while running tauri application") .run(|app_handle, event| match event { // After app starts - RunEvent::CloseRequested { label, api, .. } if label.as_str() == "main" => { - api.prevent_close(); + RunEvent::ExitRequested { api, .. } => { + api.prevent_exit(); hide_window(app_handle); } _ => {} diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index aa0b03f..d0e3ef4 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -21,22 +21,18 @@ "icons/icon.icns", "icons/icon.ico" ], - "resources": [ - "./README.txt" - ], + "resources": ["./README.txt"], "externalBin": [], "copyright": "© 4yn 2022", "category": "DeveloperTool", "shortDescription": "slidershim", "longDescription": "slidershim", "deb": { - "depends": [], - "useBootstrapper": false + "depends": [] }, "macOS": { "frameworks": [], "minimumSystemVersion": "", - "useBootstrapper": false, "exceptionDomain": "", "signingIdentity": null, "entitlements": null @@ -75,4 +71,4 @@ "iconAsTemplate": true } } -} \ No newline at end of file +} diff --git a/yarn.lock b/yarn.lock index ab96cb4..d2e08aa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -99,72 +99,70 @@ estree-walker "^1.0.1" picomatch "^2.2.2" -"@tauri-apps/api@^1.0.0-beta.8": - version "1.0.0-rc.2" - resolved "https://registry.yarnpkg.com/@tauri-apps/api/-/api-1.0.0-rc.2.tgz#bac494a6b8868e05f86184d2ee1ccc8477470363" - integrity sha512-JhUDCJpfxmf/S1R+yHmJGsher4CGi07Qv4fYeucB7naeFZ7yTQe7S1CHKUZaRYpurGSdwOF3my9k0LyGmpAGYw== - dependencies: - type-fest "2.12.0" +"@tauri-apps/api@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@tauri-apps/api/-/api-1.0.2.tgz#5228720e35d50fd08df87067dc29e7306c1f7a10" + integrity sha512-yuNW0oeJ1/ZA7wNF1KgxhHrSu5viPVzY/UgUczzN5ptLM8dH15Juy5rEGkoHfeXGju90Y/l22hi3BtIrp/za+w== -"@tauri-apps/cli-darwin-arm64@1.0.0-rc.7": - version "1.0.0-rc.7" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.0.0-rc.7.tgz#c7d190ea7496381bf456494e93dd8b35005a0e78" - integrity sha512-fb1plxZZHDG0KwZOoAl6tuisFU+oZFtNtqK3V2KL+4hz75DyH6BfsrgjyYSecJrtQejL2cHi8q7vUsU+EeLopw== +"@tauri-apps/cli-darwin-arm64@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.0.4.tgz#fd63fad851c8c899233618af0a9dc2d1a29a8c41" + integrity sha512-hMVTPoinjKYV8fgviQ871ZnVipAVXJV3ZwfiK9FcE9/dkUCUtKtetfwnicRV6YDSFbWY9qAg+Sm0INrLT5Ky+A== -"@tauri-apps/cli-darwin-x64@1.0.0-rc.7": - version "1.0.0-rc.7" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.0.0-rc.7.tgz#b152f333ea081674e8e6c45d1c3ff1850bff854c" - integrity sha512-FOFPNsYUgCDaxEK+9oQ3vv9bMD3XVcOKdh1vo/DImzZNO6fQkcsDC8zlmA+Q4axd+X8kvu0iti1fK8Vl7HIUEA== +"@tauri-apps/cli-darwin-x64@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.0.4.tgz#52e7a4151a26e9333375a82a0cb15614f01cf3e0" + integrity sha512-6bR8WIqJdcutLLcmv4S+bkCRbLAwjl80zPL97vs7Zgum01aeygjUTaZS46fpeDgqF8nR8piFAZkz8Bnco6fbzw== -"@tauri-apps/cli-linux-arm-gnueabihf@1.0.0-rc.7": - version "1.0.0-rc.7" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.0.0-rc.7.tgz#14fb37a337526200dbbe9b49dabd221b81682b02" - integrity sha512-tFzcJtNHy5AInU3E7kKDyhg4Qb7csu3uZ3FhGfORmGvQAiNQFpGV3ypC230RQYa3sxxRMbn8vjUAZMlU6JArbA== +"@tauri-apps/cli-linux-arm-gnueabihf@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.0.4.tgz#8889ce864dba0763290fa3f05af99f8cd2f574bf" + integrity sha512-NNhz8Nh/CQvAPzR5bj1sC2CgpkUOjZg8Eg1i/Ta/pbrjgT0E/reD+12TGdkNuQNEOUQ1klWcdeHfAptWPicRgQ== -"@tauri-apps/cli-linux-arm64-gnu@1.0.0-rc.7": - version "1.0.0-rc.7" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.0.0-rc.7.tgz#43e7a38018258ad2bf665bb61e0328688b345355" - integrity sha512-QAoNUJMmoCv/mDZsfEZOOTeEPYuxtMgCgqTDqMd0H8S0Y3Cu2D/Q2fwVl0s9pMb6wLD2GJ2FEneySEMhMxt7Pg== +"@tauri-apps/cli-linux-arm64-gnu@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.0.4.tgz#27ae14f15d5fef76dcb70b4d7dac7bbb9e13ea81" + integrity sha512-chzpMgkZyu0MWF75DDiEV06XyI8LM7q0NMxRx7esJwZpypj4AG0Pj4+9Di38zYWZrfYqz/bWrCMPIV30vty1Gg== -"@tauri-apps/cli-linux-arm64-musl@1.0.0-rc.7": - version "1.0.0-rc.7" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.0.0-rc.7.tgz#37ebcfc7d1431dd698f529fa57248adadd94b3b4" - integrity sha512-ieLyACtbY7ezReTnjWLw/kKDXRCbnbrUjQ+hltSmHaRuV51nX+I2rmFO5e7VPdj406jvyKwfSPuBC34bHxt3Og== +"@tauri-apps/cli-linux-arm64-musl@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.0.4.tgz#118a44226c3e0c324b9c842718548b22fcfbd3d2" + integrity sha512-w+wbNoIOdHoV65Q/z29EK4KtFiNXfV+2lIsML/Hw0VEJEzl9FsqGelu1zAycq8hkoQhf0yPlD/m4FfAWnFzg6Q== -"@tauri-apps/cli-linux-x64-gnu@1.0.0-rc.7": - version "1.0.0-rc.7" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.0.0-rc.7.tgz#b47239c4f10b3fe8e1e2f031f639125ededc6d79" - integrity sha512-wPAZctuFpurACxdCrjw+aaSuFReuIvv1nalVezfqA78AlsCk785yF2YVjoZr5bT8a9+6F+t8uNi3l6Vp5oNqwQ== +"@tauri-apps/cli-linux-x64-gnu@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.0.4.tgz#1724345de55a597a7fbd363f3af33ebf4eaaad4d" + integrity sha512-TiVRk+VBYA2mE4DqwLu/WD6wTHewHVbdMUtfeXdwe/kabLqbJTWuswUv5T8JUp3mYFZKqlPhyi+qWSJOc0Ianw== -"@tauri-apps/cli-linux-x64-musl@1.0.0-rc.7": - version "1.0.0-rc.7" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.0.0-rc.7.tgz#9e62494cf80aed170f389d84b2b23f354e8ce748" - integrity sha512-/AxuXFC2d1V8KpZJ6cFDcD5QqPFIZFXC/tAJlnTW75VnHgjat9TYP3BdSOuEA81ZLs9tV4PQF40tNnUSzfRYMg== +"@tauri-apps/cli-linux-x64-musl@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.0.4.tgz#b36904c42be4bdab21cefdd052c8c85f9913f6be" + integrity sha512-TKdncZ6aFu9PfHakrrqg3XIoxgl510rN0tOTJuZ1WQT2nDD5zlP3Mo++FNIt6/TfjqayLcubIZp3dG9pU383dA== -"@tauri-apps/cli-win32-ia32-msvc@1.0.0-rc.7": - version "1.0.0-rc.7" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.0.0-rc.7.tgz#71c2f9498f4d03fd2c0ca6137a2be7db95a006f3" - integrity sha512-C4M2rHXlYVPSHGl2Iax1rfiNM5GPSRP1JHxW7/4jH9FfW6mVFcjULZAyVMRfOMQEQ9bYXbVnSTPbhG2Fm0jPxQ== +"@tauri-apps/cli-win32-ia32-msvc@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.0.4.tgz#6db7d26050f15fca0ad067119001e566085990f5" + integrity sha512-KedA4LB/PsePE3BLm2gg/IIA4rLjbyBUzV2FTdpWqx8ws3OzL6BLDGRVJ+zXe/b9SddhhZk7Rqss6y+gtsWKsA== -"@tauri-apps/cli-win32-x64-msvc@1.0.0-rc.7": - version "1.0.0-rc.7" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.0.0-rc.7.tgz#6d719f70a0789f2a179d160c302996ce81194099" - integrity sha512-lpstJKOtP+ahhjbutapA02TpvfNTZqXwhmA1fvqxDu6BYVezFn7ZiGG5HwdXlkiRDfbwZwBd1evdkV3MxwY1NQ== +"@tauri-apps/cli-win32-x64-msvc@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.0.4.tgz#bf14bb0cfa2c0e74a981c6424dc36f68dbfd4b5c" + integrity sha512-6m1Ie7+YeKdOY7aXZCw/Py30DeMEAukE2+WWuZgfxZTTG9QrnZO+DbaKtjuEG0A8HKHCz63+ZNxOTshS1ognEw== -"@tauri-apps/cli@^1.0.0-beta.10": - version "1.0.0-rc.7" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli/-/cli-1.0.0-rc.7.tgz#0eb73718f6ebddc159b0b54f6fd6dfc26d110b36" - integrity sha512-g7lUsI2iFiB2JuPFr209vWNqOnxCOGXN6yBttMRY+94UUXZOeWlKxYYpSabyjSr7EbfAUNzjITYmE4urdtmB+A== +"@tauri-apps/cli@^1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli/-/cli-1.0.4.tgz#4a943d10ff022ae6ad9fb33e94cc5c25509bcfb9" + integrity sha512-AqfbQUFU2jDYmkjiowl+Yv1yNkey/e+N23sKyDtXQQNvxE6ieR4voY4i6bShY97F+DbRVdjWcjGiLkWS3i4DHw== optionalDependencies: - "@tauri-apps/cli-darwin-arm64" "1.0.0-rc.7" - "@tauri-apps/cli-darwin-x64" "1.0.0-rc.7" - "@tauri-apps/cli-linux-arm-gnueabihf" "1.0.0-rc.7" - "@tauri-apps/cli-linux-arm64-gnu" "1.0.0-rc.7" - "@tauri-apps/cli-linux-arm64-musl" "1.0.0-rc.7" - "@tauri-apps/cli-linux-x64-gnu" "1.0.0-rc.7" - "@tauri-apps/cli-linux-x64-musl" "1.0.0-rc.7" - "@tauri-apps/cli-win32-ia32-msvc" "1.0.0-rc.7" - "@tauri-apps/cli-win32-x64-msvc" "1.0.0-rc.7" + "@tauri-apps/cli-darwin-arm64" "1.0.4" + "@tauri-apps/cli-darwin-x64" "1.0.4" + "@tauri-apps/cli-linux-arm-gnueabihf" "1.0.4" + "@tauri-apps/cli-linux-arm64-gnu" "1.0.4" + "@tauri-apps/cli-linux-arm64-musl" "1.0.4" + "@tauri-apps/cli-linux-x64-gnu" "1.0.4" + "@tauri-apps/cli-linux-x64-musl" "1.0.4" + "@tauri-apps/cli-win32-ia32-msvc" "1.0.4" + "@tauri-apps/cli-win32-x64-msvc" "1.0.4" "@tsconfig/svelte@^2.0.0": version "2.0.1" @@ -1383,11 +1381,6 @@ tunnel-agent@^0.6.0: dependencies: safe-buffer "^5.0.1" -type-fest@2.12.0: - version "2.12.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.12.0.tgz#ce342f58cab9114912f54b493d60ab39c3fc82b6" - integrity sha512-Qe5GRT+n/4GoqCNGGVp5Snapg1Omq3V7irBJB3EaKsp7HWDo5Gv2d/67gfNyV+d5EXD+x/RF5l1h4yJ7qNkcGA== - typescript@*, typescript@^4.0.0: version "4.6.2" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.2.tgz#fe12d2727b708f4eef40f51598b3398baa9611d4"