From eb90be3bba96092dedadab098cb8321acf7a3fe5 Mon Sep 17 00:00:00 2001 From: Ryan Killeen Date: Sun, 3 Apr 2022 18:39:59 -0400 Subject: [PATCH 1/2] deps: update tauri, minor breaking changes 0.9.3 --- package-lock.json | 4 +- package.json | 2 +- src-tauri/Cargo.lock | 356 +++++++++++++++++--------------------- src-tauri/Cargo.toml | 6 +- src-tauri/src/main.rs | 13 +- src-tauri/tauri.conf.json | 7 +- 6 files changed, 180 insertions(+), 208 deletions(-) diff --git a/package-lock.json b/package-lock.json index aea5ba4..10cd490 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "brancato", - "version": "0.9.2", + "version": "0.9.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "brancato", - "version": "0.9.2", + "version": "0.9.3", "dependencies": { "@algolia/autocomplete-js": "^1.5.3", "@algolia/autocomplete-theme-classic": "^1.5.3", diff --git a/package.json b/package.json index 975c6f1..05e7e34 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "brancato", - "version": "0.9.2", + "version": "0.9.3", "private": true, "dependencies": { "@algolia/autocomplete-js": "^1.5.3", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 839d678..1489ae2 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -23,6 +23,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" @@ -50,26 +65,6 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" -[[package]] -name = "arrayvec" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" - -[[package]] -name = "ashpd" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084a8df12135f75ec7501c7c593b14621d1da962d222127fe72fb6de116aa9eb" -dependencies = [ - "enumflags2", - "futures", - "rand 0.8.5", - "serde", - "serde_repr", - "zbus", -] - [[package]] name = "async-broadcast" version = "0.3.4" @@ -249,25 +244,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" dependencies = [ "arrayref", - "arrayvec 0.5.2", + "arrayvec", "constant_time_eq", ] -[[package]] -name = "blake3" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" -dependencies = [ - "arrayref", - "arrayvec 0.7.2", - "cc", - "cfg-if", - "constant_time_eq", - "digest", - "rayon", -] - [[package]] name = "block" version = "0.1.6" @@ -298,6 +278,27 @@ dependencies = [ "tauri-build", ] +[[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" @@ -371,15 +372,18 @@ name = "cc" version = "1.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" -dependencies = [ - "jobserver", -] + +[[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", @@ -468,6 +472,16 @@ dependencies = [ "objc", ] +[[package]] +name = "combine" +version = "4.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50b727aacc797f9fc28e355d21f34709ac4fc9adecfe470ad07b8f4464f53062" +dependencies = [ + "bytes", + "memchr", +] + [[package]] name = "concurrent-queue" version = "1.2.2" @@ -558,35 +572,11 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "crossbeam-deque" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00d6d2ea26e8b151d99093005cb442fb9a37aeaca582a03ec70946f49ab5ed9" -dependencies = [ - "cfg-if", - "crossbeam-utils", - "lazy_static", - "memoffset", - "scopeguard", -] - [[package]] name = "crossbeam-utils" -version = "0.8.7" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e5bed1f1c269533fa816a0a5492b3545209a205ca1a54842be180eb63a16a6" +checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" dependencies = [ "cfg-if", "lazy_static", @@ -727,12 +717,11 @@ dependencies = [ [[package]] name = "deflate" -version = "0.8.6" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174" +checksum = "c86f7e25f518f4b81808a2cf1c50996a61f5c2eb394b2393bd87f2a4780a432f" dependencies = [ "adler32", - "byteorder", ] [[package]] @@ -767,7 +756,6 @@ checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" dependencies = [ "block-buffer", "crypto-common", - "subtle", ] [[package]] @@ -1563,9 +1551,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", ] @@ -1633,19 +1621,24 @@ dependencies = [ ] [[package]] -name = "jni-sys" -version = "0.3.0" +name = "jni" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" +checksum = "24967112a1e4301ca5342ea339763613a37592b8a6ce6cf2e4494537c7a42faf" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] [[package]] -name = "jobserver" -version = "0.1.24" +name = "jni-sys" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" -dependencies = [ - "libc", -] +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "js-sys" @@ -1820,27 +1813,27 @@ dependencies = [ [[package]] name = "minisign-verify" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ccf091884470c4b3a80ad6daadbb2e7736611d631cbf0c9e603bb7dbcfdfd9" +checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881" [[package]] name = "miniz_oxide" -version = "0.3.7" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" +checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" dependencies = [ - "adler32", + "adler", + "autocfg", ] [[package]] name = "miniz_oxide" -version = "0.4.4" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082" dependencies = [ "adler", - "autocfg", ] [[package]] @@ -2340,14 +2333,14 @@ dependencies = [ [[package]] name = "png" -version = "0.16.8" +version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6" +checksum = "dc38c0ad57efb786dd57b9864e5b18bae478c00c824dc55a38bbc9da95dde3ba" dependencies = [ "bitflags", "crc32fast", - "deflate 0.8.6", - "miniz_oxide 0.3.7", + "deflate 1.0.0", + "miniz_oxide 0.5.1", ] [[package]] @@ -2363,12 +2356,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "pollster" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5da3b0203fd7ee5720aa0b5e790b591aa5d3f41c3ed2c34a3a393382198af2f7" - [[package]] name = "ppv-lite86" version = "0.2.16" @@ -2554,31 +2541,6 @@ dependencies = [ "cty", ] -[[package]] -name = "rayon" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" -dependencies = [ - "autocfg", - "crossbeam-deque", - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "lazy_static", - "num_cpus", -] - [[package]] name = "redox_syscall" version = "0.1.57" @@ -2617,9 +2579,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.5.4" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" dependencies = [ "aho-corasick", "memchr", @@ -2652,11 +2614,10 @@ dependencies = [ [[package]] name = "rfd" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aaf1d71ccd44689f7c2c72da1117fd8db71f72a76fe9b5c5dbb17ab903007e0" +checksum = "e7ca9214be1b6d296d4d539a31e795e556cdb43e60cbf0b77003be5b01075c13" dependencies = [ - "ashpd", "block", "dispatch", "glib-sys 0.15.6", @@ -2668,12 +2629,11 @@ dependencies = [ "objc", "objc-foundation", "objc_id", - "pollster", "raw-window-handle", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "windows 0.30.0", + "windows 0.33.0", ] [[package]] @@ -3110,12 +3070,6 @@ dependencies = [ "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" @@ -3173,9 +3127,9 @@ dependencies = [ [[package]] name = "tao" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c4c62fc16d698750c5c918088c8134c63e8661e65efc608fe614236c59462f4" +checksum = "2b6a3359088d4c4735a13f933202f4ecd91f5991b41a8eb757f2449c044ce925" dependencies = [ "bitflags", "cairo-rs", @@ -3238,9 +3192,9 @@ dependencies = [ [[package]] name = "tauri" -version = "1.0.0-rc.4" +version = "1.0.0-rc.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1112a78b3de89c41e01b671d62f24038d324c6cb61708896ee16f533b655c82e" +checksum = "f6d514a34b3f9a07e2002d95e1371b42a446636e3d571a59e974b21d6acf3007" dependencies = [ "anyhow", "attohttpc", @@ -3293,9 +3247,9 @@ dependencies = [ [[package]] name = "tauri-build" -version = "1.0.0-rc.4" +version = "1.0.0-rc.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7e31905edc1b40f369beccbbfb30b2e44c2f2bb1ffc06a3778d844af4a81da8" +checksum = "ede6462a4692e2fd5030497ad576264dc90eea5fa337182492e77291d45fc78b" dependencies = [ "anyhow", "cargo_toml", @@ -3306,14 +3260,14 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "1.0.0-rc.3" +version = "1.0.0-rc.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbcba93e945eb73ee232621763a1295247d0155867bb72e815ab107a10a7cf97" +checksum = "54193ebdb010e85824301ce5f0940742b680d66376203f6425d549d2f32ad499" dependencies = [ "base64", - "blake3", + "brotli", "ico", - "png 0.16.8", + "png 0.17.5", "proc-macro2", "quote", "regex", @@ -3324,14 +3278,13 @@ dependencies = [ "thiserror", "uuid", "walkdir", - "zstd", ] [[package]] name = "tauri-macros" -version = "1.0.0-rc.3" +version = "1.0.0-rc.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed251657dcdd21922e0146af5f8a3b9ccf92707d4a42add615c250ff92a6838d" +checksum = "c8b867ef4703cb8e50f128ee3c941895d94c01e0ebd9007a7b45ecca52516dbf" dependencies = [ "heck 0.4.0", "proc-macro2", @@ -3343,9 +3296,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae0442d935c2d168541d74be51c4d4f176b1c00ee6bf052f07c1aa5f688ba497" +checksum = "5b289ac8eafc52a36425fcaf3de23febd0b2606d3cce2b39ac412a1817fae537" dependencies = [ "gtk", "http", @@ -3362,11 +3315,12 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643aaa56237304264804dbf34748b21042eadda71d2e964bced1651c19cc0314" +checksum = "6a8bf16e0476a8249aa2c75e7b49ec4c059be5fb27d9f6514e30ed327e8e9fa2" dependencies = [ "gtk", + "rand 0.8.5", "tauri-runtime", "tauri-utils", "uuid", @@ -3377,10 +3331,11 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "1.0.0-rc.3" +version = "1.0.0-rc.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21f11483d205c77d1ec398e80566485101696335983e69832cc6c41ab1e07266" +checksum = "a67fcf8fdd1340de4e75c01966fceab03057a8b0e97864eb39a21e420deed503" dependencies = [ + "brotli", "ctor", "glob", "heck 0.4.0", @@ -3397,7 +3352,6 @@ dependencies = [ "thiserror", "url", "walkdir", - "zstd", ] [[package]] @@ -3935,13 +3889,26 @@ version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b749ebd2304aa012c5992d11a25d07b406bdbe5f79d371cb7a918ce501a19eb0" dependencies = [ - "windows_aarch64_msvc", + "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" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0128fa8e65e0616e45033d68dc0b7fbd521080b7844e5cad3a4a4d201c4b2bd2" +dependencies = [ + "windows_aarch64_msvc 0.33.0", + "windows_i686_gnu 0.33.0", + "windows_i686_msvc 0.33.0", + "windows_x86_64_gnu 0.33.0", + "windows_x86_64_msvc 0.33.0", +] + [[package]] name = "windows-bindgen" version = "0.30.0" @@ -3958,6 +3925,12 @@ version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29277a4435d642f775f63c7d1faeb927adba532886ce0287bd985bffb16b6bca" +[[package]] +name = "windows_aarch64_msvc" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd761fd3eb9ab8cc1ed81e56e567f02dd82c4c837e48ac3b2181b9ffc5060807" + [[package]] name = "windows_gen" version = "0.30.0" @@ -3980,6 +3953,12 @@ version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1145e1989da93956c68d1864f32fb97c8f561a8f89a5125f6a2b7ea75524e4b8" +[[package]] +name = "windows_i686_gnu" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab0cf703a96bab2dc0c02c0fa748491294bf9b7feb27e1f4f96340f208ada0e" + [[package]] name = "windows_i686_msvc" version = "0.24.0" @@ -3992,6 +3971,12 @@ version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4a09e3a0d4753b73019db171c1339cd4362c8c44baf1bcea336235e955954a6" +[[package]] +name = "windows_i686_msvc" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cfdbe89cc9ad7ce618ba34abc34bbb6c36d99e96cae2245b7943cd75ee773d0" + [[package]] name = "windows_macros" version = "0.30.0" @@ -4028,6 +4013,12 @@ version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ca64fcb0220d58db4c119e050e7af03c69e6f4f415ef69ec1773d9aab422d5a" +[[package]] +name = "windows_x86_64_gnu" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4dd9b0c0e9ece7bb22e84d70d01b71c6d6248b81a3c60d11869451b4cb24784" + [[package]] name = "windows_x86_64_msvc" version = "0.24.0" @@ -4040,6 +4031,12 @@ version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08cabc9f0066848fef4bc6a1c1668e6efce38b661d2aeec75d18d8617eebb5f1" +[[package]] +name = "windows_x86_64_msvc" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff1e4aa646495048ec7f3ffddc411e1d829c026a2ec62b39da15c1055e406eaa" + [[package]] name = "winres" version = "0.1.12" @@ -4062,10 +4059,11 @@ dependencies = [ [[package]] name = "wry" -version = "0.13.3" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9514586e5c964d30cc7123c9aea9880ff7b3cb1c43f6a1dc8703941eb72ac89f" +checksum = "6fd09ffc86ecea0a0d5f50cc8e4a8121a1bfc0b0825a160f86ac39e86979344c" dependencies = [ + "block", "cocoa", "core-graphics", "gdk", @@ -4073,6 +4071,7 @@ dependencies = [ "glib", "gtk", "http", + "jni", "libc", "log", "objc", @@ -4189,42 +4188,13 @@ dependencies = [ [[package]] name = "zip" -version = "0.5.13" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815" +checksum = "db2a3b9c90b21734aaf4449cee7735305f559f28894123b57e0f700be8459418" dependencies = [ "byteorder", "crc32fast", - "thiserror", -] - -[[package]] -name = "zstd" -version = "0.10.0+zstd.1.5.2" -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", + "crossbeam-utils", ] [[package]] diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 171a485..898fbfb 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "brancato" -version = "0.9.2" +version = "0.9.3" description = "A tool for stage-managing your life" authors = ["Ryan Killeen"] license = "" @@ -14,12 +14,12 @@ rust-version = "1.57" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [build-dependencies] -tauri-build = { version = "1.0.0-rc.4", features = [] } +tauri-build = { version = "1.0.0-rc.5", features = [] } [dependencies] serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } -tauri = { version = "1.0.0-rc.4", features = ["api-all", "system-tray", "updater"] } +tauri = { version = "1.0.0-rc.5", features = ["api-all", "system-tray", "updater"] } execute = "0.2.9" open = "2.0.2" directories = "4.0.1" diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 4e2a8c3..1d78372 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -284,11 +284,14 @@ fn main() { .expect("Couldn't create shortcut"); } - // // Triggered when a window is trying to close - RunEvent::CloseRequested { label, api, .. } => { - api.prevent_close(); - let _ = &app_handle.get_window(&label).unwrap().hide().unwrap(); - } + // Triggered when a window is trying to close + RunEvent::WindowEvent { label, event, .. } => match event { + tauri::WindowEvent::CloseRequested { api, .. } => { + api.prevent_close(); + let _ = &app_handle.get_window(&label).unwrap().hide().unwrap(); + } + _ => {} + }, // Keep the event loop running even if all windows are closed // This allow us to catch system tray events when there is no window diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 4ff62a2..289bb4d 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "package": { "productName": "brancato", - "version": "0.9.2" + "version": "0.9.3" }, "build": { "distDir": "../build", @@ -32,13 +32,11 @@ "shortDescription": "", "longDescription": "", "deb": { - "depends": [], - "useBootstrapper": false + "depends": [] }, "macOS": { "frameworks": [], "minimumSystemVersion": "", - "useBootstrapper": false, "exceptionDomain": "", "signingIdentity": null, "providerShortName": null, @@ -54,6 +52,7 @@ "dialog": true, "active": true, "endpoints": [ + "https://tauri-update-server.rykilleen.workers.dev/v1/{{target}}/{{arch}}/{{current_version}}", "https://tauri-update-cloudflare-1.rykilleen.workers.dev/{{target}}/{{current_version}}" ], "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IENGMkRDMEZCNkIxQUU5MTgKUldRWTZScHIrOEF0eitLc3BYcHkrdHNTSmt3VUJPQzhlbWpsNWxTQ2NjMGRuamZoMnplTEo0bzcK" From 1da8a7e616aa44fdb9e464a2548e777f7d8eb505 Mon Sep 17 00:00:00 2001 From: Ryan Killeen Date: Sun, 3 Apr 2022 19:55:32 -0400 Subject: [PATCH 2/2] chore: bonus rc.6 update --- src-tauri/Cargo.lock | 2 +- src-tauri/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 1489ae2..becd9a5 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -265,7 +265,7 @@ dependencies = [ [[package]] name = "brancato" -version = "0.9.2" +version = "0.9.3" dependencies = [ "directories", "execute", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 898fbfb..49f808d 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -19,7 +19,7 @@ tauri-build = { version = "1.0.0-rc.5", features = [] } [dependencies] serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } -tauri = { version = "1.0.0-rc.5", features = ["api-all", "system-tray", "updater"] } +tauri = { version = "1.0.0-rc.6", features = ["api-all", "system-tray", "updater"] } execute = "0.2.9" open = "2.0.2" directories = "4.0.1"