diff --git a/.changes/tauri-beta-3.md b/.changes/tauri-beta-4.md similarity index 97% rename from .changes/tauri-beta-3.md rename to .changes/tauri-beta-4.md index a225edd68..530264852 100644 --- a/.changes/tauri-beta-3.md +++ b/.changes/tauri-beta-4.md @@ -54,4 +54,4 @@ "window-state-js": patch --- -Update to tauri beta.3. +Update to tauri beta.4. diff --git a/.scripts/ci/check-license-header.js b/.scripts/ci/check-license-header.js index 65be6eca7..bb8055fb8 100644 --- a/.scripts/ci/check-license-header.js +++ b/.scripts/ci/check-license-header.js @@ -27,7 +27,7 @@ const ignore = [ "api-iife.js", "init-iife.js", ".build", - "notify_rust" + "notify_rust", ]; async function checkFile(file) { diff --git a/Cargo.lock b/Cargo.lock index 6f9675222..b8d417569 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -326,7 +326,7 @@ dependencies = [ "serde_repr", "tokio", "url", - "zbus 4.0.1", + "zbus", ] [[package]] @@ -339,16 +339,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "async-broadcast" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" -dependencies = [ - "event-listener 2.5.3", - "futures-core", -] - [[package]] name = "async-broadcast" version = "0.7.0" @@ -397,8 +387,8 @@ dependencies = [ "async-lock 3.3.0", "async-task", "concurrent-queue", - "fastrand 2.0.1", - "futures-lite 2.2.0", + "fastrand", + "futures-lite", "slab", ] @@ -410,27 +400,7 @@ checksum = "bc19683171f287921f2405677dd2ed2549c3b3bda697a563ebc3a121ace2aba1" dependencies = [ "async-lock 3.3.0", "blocking", - "futures-lite 2.2.0", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite 1.13.0", - "log", - "parking", - "polling 2.8.0", - "rustix 0.37.27", - "slab", - "socket2 0.4.10", - "waker-fn", + "futures-lite", ] [[package]] @@ -443,10 +413,10 @@ dependencies = [ "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.2.0", + "futures-lite", "parking", - "polling 3.5.0", - "rustix 0.38.31", + "polling", + "rustix", "slab", "tracing", "windows-sys 0.52.0", @@ -479,14 +449,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "451e3cf68011bd56771c79db04a9e333095ab6349f7e47592b788e9b98720cc8" dependencies = [ "async-channel", - "async-io 2.3.1", + "async-io", "async-lock 3.3.0", "async-signal", "blocking", "cfg-if", "event-listener 5.1.0", - "futures-lite 2.2.0", - "rustix 0.38.31", + "futures-lite", + "rustix", "windows-sys 0.52.0", ] @@ -507,13 +477,13 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-io 2.3.1", + "async-io", "async-lock 2.8.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.31", + "rustix", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -584,6 +554,17 @@ dependencies = [ "rand 0.8.5", ] +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi 0.3.9", +] + [[package]] name = "authenticator" version = "0.3.1" @@ -746,9 +727,9 @@ dependencies = [ "async-channel", "async-lock 3.3.0", "async-task", - "fastrand 2.0.1", + "fastrand", "futures-io", - "futures-lite 2.2.0", + "futures-lite", "piper", "tracing", ] @@ -1162,6 +1143,17 @@ dependencies = [ "objc", ] +[[package]] +name = "color-backtrace" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd6c04463c99389fff045d2b90ce84f5131332712c7ffbede020f5e9ad1ed685" +dependencies = [ + "atty", + "backtrace", + "termcolor", +] + [[package]] name = "color_quant" version = "1.1.0" @@ -1681,6 +1673,29 @@ dependencies = [ "libloading 0.8.1", ] +[[package]] +name = "dlopen2" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1297103d2bbaea85724fcee6294c2d50b1081f9ad47d0f6f6f61eda65315a6" +dependencies = [ + "dlopen2_derive", + "libc", + "once_cell", + "winapi 0.3.9", +] + +[[package]] +name = "dlopen2_derive" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.49", +] + [[package]] name = "dotenvy" version = "0.15.7" @@ -1703,7 +1718,7 @@ dependencies = [ "bytemuck", "drm-ffi", "drm-fourcc", - "rustix 0.38.31", + "rustix", ] [[package]] @@ -1713,7 +1728,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" dependencies = [ "drm-sys", - "rustix 0.38.31", + "rustix", ] [[package]] @@ -1960,15 +1975,6 @@ dependencies = [ "zune-inflate", ] -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - [[package]] name = "fastrand" version = "2.0.1" @@ -2193,28 +2199,13 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - [[package]] name = "futures-lite" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" dependencies = [ - "fastrand 2.0.1", + "fastrand", "futures-core", "futures-io", "parking", @@ -2722,7 +2713,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b83e1915177ea624b5bbbdb16bc54f0c106c9664892c695f995e53f5c6793b80" dependencies = [ "bytes", - "fastrand 2.0.1", + "fastrand", "futures-util", "http 0.2.11", "pin-project-lite", @@ -2792,6 +2783,15 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + [[package]] name = "hermit-abi" version = "0.3.6" @@ -2930,7 +2930,7 @@ dependencies = [ "httpdate", "itoa 1.0.10", "pin-project-lite", - "socket2 0.5.5", + "socket2", "tokio", "tower-service", "tracing", @@ -3120,17 +3120,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "iota-crypto" version = "0.15.3" @@ -3190,7 +3179,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.5", + "socket2", "widestring", "windows-sys 0.48.0", "winreg 0.50.0", @@ -3217,7 +3206,7 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.6", "libc", "windows-sys 0.52.0", ] @@ -3551,12 +3540,6 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - [[package]] name = "linux-raw-sys" version = "0.4.13" @@ -3640,6 +3623,12 @@ dependencies = [ "libc", ] +[[package]] +name = "maplit" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + [[package]] name = "markup5ever" version = "0.11.0" @@ -3869,20 +3858,6 @@ dependencies = [ "memoffset 0.6.5", ] -[[package]] -name = "nix" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.6.5", - "pin-utils", -] - [[package]] name = "nix" version = "0.27.1" @@ -4014,7 +3989,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.6", "libc", ] @@ -4467,7 +4442,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand", "futures-io", ] @@ -4525,22 +4500,6 @@ dependencies = [ "miniz_oxide", ] -[[package]] -name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - [[package]] name = "polling" version = "3.5.0" @@ -4550,7 +4509,7 @@ dependencies = [ "cfg-if", "concurrent-queue", "pin-project-lite", - "rustix 0.38.31", + "rustix", "tracing", "windows-sys 0.52.0", ] @@ -4779,7 +4738,7 @@ checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" dependencies = [ "bytes", "libc", - "socket2 0.5.5", + "socket2", "tracing", "windows-sys 0.48.0", ] @@ -5221,20 +5180,6 @@ dependencies = [ "semver", ] -[[package]] -name = "rustix" -version = "0.37.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - [[package]] name = "rustix" version = "0.38.31" @@ -5745,16 +5690,6 @@ version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi 0.3.9", -] - [[package]] name = "socket2" version = "0.5.5" @@ -5777,7 +5712,7 @@ dependencies = [ "cocoa 0.25.0", "core-graphics 0.23.1", "drm", - "fastrand 2.0.1", + "fastrand", "foreign-types 0.5.0", "js-sys", "log", @@ -5785,7 +5720,7 @@ dependencies = [ "objc", "raw-window-handle 0.6.0", "redox_syscall", - "rustix 0.38.31", + "rustix", "tiny-xlib", "wasm-bindgen", "wayland-backend", @@ -6292,17 +6227,17 @@ dependencies = [ [[package]] name = "tao" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa7ba6ee5b8908ba3a62e6a4f3683490ed732fca614cdd3f4c989bba548f9a9" +checksum = "29d9325da2dd7ebd48a8a433c64240079b15dbe1249da04c72557611bcd08d1c" dependencies = [ "bitflags 1.3.2", - "cc", "cocoa 0.25.0", "core-foundation", "core-graphics 0.23.1", "crossbeam-channel", "dispatch", + "dlopen2", "gdkwayland-sys", "gdkx11-sys", "gtk", @@ -6328,7 +6263,6 @@ dependencies = [ "windows-implement", "windows-version", "x11-dl", - "zbus 3.10.0", ] [[package]] @@ -6367,9 +6301,9 @@ checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" [[package]] name = "tauri" -version = "2.0.0-beta.3" +version = "2.0.0-beta.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66497d130e3fb9889d738a3cffe1134a42ac1ce2177eca7fa0574a411000afde" +checksum = "bb6b10809e932ed85813fff9ac748cbcc0cf4c78209433b1b6e025660619f2e4" dependencies = [ "anyhow", "bytes", @@ -6420,9 +6354,9 @@ dependencies = [ [[package]] name = "tauri-build" -version = "2.0.0-beta.2" +version = "2.0.0-beta.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2932ca516808980f551fae4eb54009fd743648966ba4ce06a54f231cedefa2a0" +checksum = "e4ea663cde4862231178215d364b3650dade8cb159fc84a1bea5c365689dacd0" dependencies = [ "anyhow", "cargo_toml", @@ -6444,9 +6378,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.0.0-beta.2" +version = "2.0.0-beta.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f02a9d089133557849d11dfc30ad4be675ee05a4c191b7321da1e8d8dabd634" +checksum = "94a770b18aa021b0c8568c8f0d347044a72d349b6a13dd1db28c558832e8e681" dependencies = [ "base64 0.21.7", "brotli", @@ -6471,9 +6405,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.0-beta.2" +version = "2.0.0-beta.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "115afb62760852e70cd25633008c761999527d8e38352f335761dfb9c8f735dc" +checksum = "85b100bf9f05a013719fa6c9bf096da42511888b3671d9c22bffa12a030d76a9" dependencies = [ "heck", "proc-macro2", @@ -6485,9 +6419,9 @@ dependencies = [ [[package]] name = "tauri-plugin" -version = "2.0.0-beta.2" +version = "2.0.0-beta.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b377cf716c03b646f96901374f7615c21611516daf31fb658d51c324a23911e" +checksum = "140c010cfb7120c9276e6e0b0c271dabb7988be2998011f918b669e766224e55" dependencies = [ "anyhow", "glob", @@ -6715,12 +6649,15 @@ name = "tauri-plugin-notification" version = "2.0.0-beta.0" dependencies = [ "chrono", + "color-backtrace", + "ctor", "dbus", "env_logger", "image", "lazy_static", "log", "mac-notification-sys", + "maplit", "rand 0.8.5", "serde", "serde_json", @@ -6733,7 +6670,7 @@ dependencies = [ "url", "win7-notifications", "windows-version", - "zbus 4.0.1", + "zbus", ] [[package]] @@ -6815,7 +6752,7 @@ dependencies = [ "tauri", "thiserror", "windows-sys 0.52.0", - "zbus 3.10.0", + "zbus", ] [[package]] @@ -6944,9 +6881,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "2.0.0-beta.2" +version = "2.0.0-beta.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "014f1f9253ceaa503f5e07c1ca5d06271241090517b545c00cc6afb96a3d218e" +checksum = "dc687ef6571127f0ad9a9bef141ca3f8d9597b7f99949047d5c69ed731cf36c4" dependencies = [ "gtk", "http 0.2.11", @@ -6962,9 +6899,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "2.0.0-beta.2" +version = "2.0.0-beta.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e117db5f0f3b2f233063805d71459b096711fe803cabd32f19c6f5cf15b6d7ab" +checksum = "a07b1d76d4159aec5c2cff742e30b0f5b3675a2520b979acbbc66c5f92c99491" dependencies = [ "cocoa 0.25.0", "gtk", @@ -6984,9 +6921,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.0.0-beta.2" +version = "2.0.0-beta.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bbd83e66dab28c32a35e44ea71c02da16aca2259731b8b25d4c9476613f1681" +checksum = "2729b59832a96dd05f4f2ced33e2ab976ca60c58c1d675afe6aabc486eb51143" dependencies = [ "aes-gcm 0.10.3", "brotli", @@ -7045,8 +6982,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" dependencies = [ "cfg-if", - "fastrand 2.0.1", - "rustix 0.38.31", + "fastrand", + "rustix", "windows-sys 0.52.0", ] @@ -7215,7 +7152,7 @@ dependencies = [ "num_cpus", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2", "tracing", "windows-sys 0.48.0", ] @@ -7731,12 +7668,6 @@ dependencies = [ "libc", ] -[[package]] -name = "waker-fn" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" - [[package]] name = "walkdir" version = "1.0.7" @@ -7866,7 +7797,7 @@ checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" dependencies = [ "cc", "downcast-rs", - "rustix 0.38.31", + "rustix", "scoped-tls", "smallvec", "wayland-sys", @@ -7879,7 +7810,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" dependencies = [ "bitflags 2.4.2", - "rustix 0.38.31", + "rustix", "wayland-backend", "wayland-scanner", ] @@ -8580,7 +8511,7 @@ dependencies = [ "libc", "libloading 0.8.1", "once_cell", - "rustix 0.38.31", + "rustix", "x11rb-protocol", ] @@ -8609,7 +8540,7 @@ checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", "linux-raw-sys 0.4.13", - "rustix 0.38.31", + "rustix", ] [[package]] @@ -8622,54 +8553,16 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "zbus" -version = "3.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f770930448dd412a4a7131dd968a8e6df0064db4d7916fbbd2d6c3f26b566938" -dependencies = [ - "async-broadcast 0.5.1", - "async-executor", - "async-io 1.13.0", - "async-lock 2.8.0", - "async-recursion", - "async-task", - "async-trait", - "byteorder", - "derivative", - "dirs", - "enumflags2", - "event-listener 2.5.3", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix 0.25.1", - "once_cell", - "ordered-stream", - "rand 0.8.5", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tracing", - "uds_windows", - "winapi 0.3.9", - "zbus_macros 3.10.0", - "zbus_names 2.6.0", - "zvariant 3.11.0", -] - [[package]] name = "zbus" version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b8e3d6ae3342792a6cc2340e4394334c7402f3d793b390d2c5494a4032b3030" dependencies = [ - "async-broadcast 0.7.0", + "async-broadcast", "async-executor", "async-fs", - "async-io 2.3.1", + "async-io", "async-lock 3.3.0", "async-process", "async-recursion", @@ -8695,22 +8588,9 @@ dependencies = [ "uds_windows", "windows-sys 0.52.0", "xdg-home", - "zbus_macros 4.0.1", - "zbus_names 3.0.0", - "zvariant 4.0.0", -] - -[[package]] -name = "zbus_macros" -version = "3.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4832059b438689017db7340580ebabba07f114eab91bf990c6e55052408b40d8" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "regex", - "syn 1.0.109", + "zbus_macros", + "zbus_names", + "zvariant", ] [[package]] @@ -8727,17 +8607,6 @@ dependencies = [ "zvariant_utils", ] -[[package]] -name = "zbus_names" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" -dependencies = [ - "serde", - "static_assertions", - "zvariant 3.11.0", -] - [[package]] name = "zbus_names" version = "3.0.0" @@ -8746,7 +8615,7 @@ checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", - "zvariant 4.0.0", + "zvariant", ] [[package]] @@ -8847,20 +8716,6 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "zvariant" -version = "3.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "903169c05b9ab948ee93fefc9127d08930df4ce031d46c980784274439803e51" -dependencies = [ - "byteorder", - "enumflags2", - "libc", - "serde", - "static_assertions", - "zvariant_derive 3.11.0", -] - [[package]] name = "zvariant" version = "4.0.0" @@ -8872,19 +8727,7 @@ dependencies = [ "serde", "static_assertions", "url", - "zvariant_derive 4.0.0", -] - -[[package]] -name = "zvariant_derive" -version = "3.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cce76636e8fab7911be67211cf378c252b115ee7f2bae14b18b84821b39260b5" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 1.0.109", + "zvariant_derive", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 81afa26bf..5698c0909 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,9 +10,9 @@ resolver = "2" [workspace.dependencies] serde = { version = "1", features = ["derive"] } log = "0.4" -tauri = "2.0.0-beta.3" -tauri-build = "2.0.0-beta.2" -tauri-plugin = "2.0.0-beta.2" +tauri = "2.0.0-beta.4" +tauri-build = "2.0.0-beta.3" +tauri-plugin = "2.0.0-beta.3" serde_json = "1" thiserror = "1" url = "2" diff --git a/examples/api/package.json b/examples/api/package.json index 6522ce062..0b00b3ba2 100644 --- a/examples/api/package.json +++ b/examples/api/package.json @@ -9,7 +9,7 @@ "serve": "vite preview" }, "dependencies": { - "@tauri-apps/api": "2.0.0-beta.1", + "@tauri-apps/api": "2.0.0-beta.2", "@tauri-apps/plugin-barcode-scanner": "2.0.0-beta.0", "@tauri-apps/plugin-biometric": "2.0.0-beta.0", "@tauri-apps/plugin-cli": "2.0.0-beta.0", @@ -30,7 +30,7 @@ "@iconify-json/codicon": "^1.1.37", "@iconify-json/ph": "^1.1.8", "@sveltejs/vite-plugin-svelte": "^3.0.1", - "@tauri-apps/cli": "2.0.0-beta.2", + "@tauri-apps/cli": "2.0.0-beta.3", "@unocss/extractor-svelte": "^0.58.0", "internal-ip": "^8.0.0", "svelte": "^4.2.8", diff --git a/plugins/authenticator/package.json b/plugins/authenticator/package.json index c648ee158..eecda5e5d 100644 --- a/plugins/authenticator/package.json +++ b/plugins/authenticator/package.json @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "2.0.0-beta.1" + "@tauri-apps/api": "2.0.0-beta.2" } } diff --git a/plugins/autostart/package.json b/plugins/autostart/package.json index f40234ec6..c3e692d5c 100644 --- a/plugins/autostart/package.json +++ b/plugins/autostart/package.json @@ -23,6 +23,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "2.0.0-beta.1" + "@tauri-apps/api": "2.0.0-beta.2" } } diff --git a/plugins/barcode-scanner/package.json b/plugins/barcode-scanner/package.json index 5bfb05866..d8e468647 100644 --- a/plugins/barcode-scanner/package.json +++ b/plugins/barcode-scanner/package.json @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "2.0.0-beta.1" + "@tauri-apps/api": "2.0.0-beta.2" } } diff --git a/plugins/biometric/package.json b/plugins/biometric/package.json index 10fec6697..0e85db0bd 100644 --- a/plugins/biometric/package.json +++ b/plugins/biometric/package.json @@ -27,6 +27,6 @@ "tslib": "2.6.0" }, "dependencies": { - "@tauri-apps/api": "2.0.0-beta.1" + "@tauri-apps/api": "2.0.0-beta.2" } } diff --git a/plugins/cli/package.json b/plugins/cli/package.json index 55e18997b..471df2453 100644 --- a/plugins/cli/package.json +++ b/plugins/cli/package.json @@ -23,6 +23,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "2.0.0-beta.1" + "@tauri-apps/api": "2.0.0-beta.2" } } diff --git a/plugins/clipboard-manager/package.json b/plugins/clipboard-manager/package.json index 964d1466b..c6d29548c 100644 --- a/plugins/clipboard-manager/package.json +++ b/plugins/clipboard-manager/package.json @@ -23,6 +23,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "2.0.0-beta.1" + "@tauri-apps/api": "2.0.0-beta.2" } } diff --git a/plugins/deep-link/examples/app/package.json b/plugins/deep-link/examples/app/package.json index 300f392f0..05ff9cf98 100644 --- a/plugins/deep-link/examples/app/package.json +++ b/plugins/deep-link/examples/app/package.json @@ -10,11 +10,11 @@ "tauri": "tauri" }, "dependencies": { - "@tauri-apps/api": "2.0.0-beta.1", + "@tauri-apps/api": "2.0.0-beta.2", "@tauri-apps/plugin-deep-link": "2.0.0-beta.0" }, "devDependencies": { - "@tauri-apps/cli": "2.0.0-beta.2", + "@tauri-apps/cli": "2.0.0-beta.3", "internal-ip": "^8.0.0", "typescript": "^5.2.2", "vite": "^5.0.12" diff --git a/plugins/deep-link/package.json b/plugins/deep-link/package.json index 044b00d71..deb432eba 100644 --- a/plugins/deep-link/package.json +++ b/plugins/deep-link/package.json @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "2.0.0-beta.1" + "@tauri-apps/api": "2.0.0-beta.2" } } diff --git a/plugins/dialog/package.json b/plugins/dialog/package.json index 4371962ff..315d081dd 100644 --- a/plugins/dialog/package.json +++ b/plugins/dialog/package.json @@ -23,6 +23,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "2.0.0-beta.1" + "@tauri-apps/api": "2.0.0-beta.2" } } diff --git a/plugins/fs/package.json b/plugins/fs/package.json index 0ea8d9fa2..fffb5be56 100644 --- a/plugins/fs/package.json +++ b/plugins/fs/package.json @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "2.0.0-beta.1" + "@tauri-apps/api": "2.0.0-beta.2" } } diff --git a/plugins/global-shortcut/package.json b/plugins/global-shortcut/package.json index 15f52b46d..f8d501b82 100644 --- a/plugins/global-shortcut/package.json +++ b/plugins/global-shortcut/package.json @@ -23,6 +23,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "2.0.0-beta.1" + "@tauri-apps/api": "2.0.0-beta.2" } } diff --git a/plugins/http/package.json b/plugins/http/package.json index f56eaae04..bd26983ba 100644 --- a/plugins/http/package.json +++ b/plugins/http/package.json @@ -23,6 +23,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "2.0.0-beta.1" + "@tauri-apps/api": "2.0.0-beta.2" } } diff --git a/plugins/log/package.json b/plugins/log/package.json index 949f1d14f..e2bc7c31f 100644 --- a/plugins/log/package.json +++ b/plugins/log/package.json @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "2.0.0-beta.1" + "@tauri-apps/api": "2.0.0-beta.2" } } diff --git a/plugins/nfc/package.json b/plugins/nfc/package.json index 57f02d657..56b35e048 100644 --- a/plugins/nfc/package.json +++ b/plugins/nfc/package.json @@ -27,6 +27,6 @@ "tslib": "2.6.0" }, "dependencies": { - "@tauri-apps/api": "2.0.0-beta.1" + "@tauri-apps/api": "2.0.0-beta.2" } } diff --git a/plugins/notification/Cargo.toml b/plugins/notification/Cargo.toml index 5d6e307c0..b51b12f15 100644 --- a/plugins/notification/Cargo.toml +++ b/plugins/notification/Cargo.toml @@ -46,6 +46,11 @@ chrono = { version = "0.4", optional = true} [target.'cfg(target_os="windows")'.dependencies] winrt-notification = { package = "tauri-winrt-notification", version = "0.1" } +[dev-dependencies] +color-backtrace = "0.5" +ctor = "0.2" +maplit = "1.0" + [features] default = [ "zbus", "async" ] async = [] diff --git a/plugins/notification/package.json b/plugins/notification/package.json index f1ff2afb9..78dd948f5 100644 --- a/plugins/notification/package.json +++ b/plugins/notification/package.json @@ -23,6 +23,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "2.0.0-beta.1" + "@tauri-apps/api": "2.0.0-beta.2" } } diff --git a/plugins/notification/src/lib.rs b/plugins/notification/src/lib.rs index 61cb6a7e3..f8302ed16 100644 --- a/plugins/notification/src/lib.rs +++ b/plugins/notification/src/lib.rs @@ -32,6 +32,7 @@ mod commands; mod error; mod models; +#[allow(dead_code, unused_imports, deprecated)] mod notify_rust; pub use error::{Error, Result}; diff --git a/plugins/notification/src/notify_rust/error.rs b/plugins/notification/src/notify_rust/error.rs index cf8f0448d..923bf7133 100644 --- a/plugins/notification/src/notify_rust/error.rs +++ b/plugins/notification/src/notify_rust/error.rs @@ -1,13 +1,13 @@ #![allow(missing_docs)] #[cfg(all(feature = "images", unix, not(target_os = "macos")))] -use crate::image::ImageError; +use super::image::ImageError; use std::{fmt, num}; /// Convenient wrapper around `std::Result`. pub type Result = ::std::result::Result; #[cfg(target_os = "macos")] -pub use crate::macos::{ApplicationError, MacOsError, NotificationError}; +pub use super::macos::{ApplicationError, MacOsError, NotificationError}; /// The Error type. #[derive(Debug)] diff --git a/plugins/notification/src/notify_rust/hints.rs b/plugins/notification/src/notify_rust/hints.rs index 2d43b0226..9513abeb4 100644 --- a/plugins/notification/src/notify_rust/hints.rs +++ b/plugins/notification/src/notify_rust/hints.rs @@ -154,7 +154,7 @@ fn test_hints_to_map() { // custom value should only be there once if the names are identical - let n1 = crate::Notification::new() + let n1 = super::Notification::new() .hint(Hint::Custom("foo".into(), "bar1".into())) .hint(Hint::Custom("foo".into(), "bar2".into())) .hint(Hint::Custom("f00".into(), "bar3".into())) diff --git a/plugins/notification/src/notify_rust/image.rs b/plugins/notification/src/notify_rust/image.rs index a2ee3c5da..27e33038a 100644 --- a/plugins/notification/src/notify_rust/image.rs +++ b/plugins/notification/src/notify_rust/image.rs @@ -8,7 +8,7 @@ use std::error::Error; use std::fmt; use std::path::Path; -use crate::miniver::Version; +use super::miniver::Version; mod constants { pub const IMAGE_DATA: &str = "image-data"; diff --git a/plugins/notification/src/notify_rust/mod.rs b/plugins/notification/src/notify_rust/mod.rs index 2ca73dc4f..6177db84c 100644 --- a/plugins/notification/src/notify_rust/mod.rs +++ b/plugins/notification/src/notify_rust/mod.rs @@ -12,69 +12,6 @@ //! in these cases you will have to add platform specific toggles to your code. //! For more see [platform differences](#platform-differences) //! -//! # Examples -//! -//! ## Example 1: Simple Notification -//! -//! ```no_run -//! # use notify_rust::*; -//! Notification::new() -//! .summary("Firefox News") -//! .body("This will almost look like a real firefox notification.") -//! .icon("firefox") -//! .timeout(Timeout::Milliseconds(6000)) //milliseconds -//! .show().unwrap(); -//! ``` -//! -//! ## Example 2: Persistent Notification -//! -//! ```no_run -//! # use notify_rust::*; -//! Notification::new() -//! .summary("Category:email") -//! .body("This has nothing to do with emails.\nIt should not go away until you acknowledge it.") -//! .icon("thunderbird") -//! .appname("thunderbird") -//! .hint(Hint::Category("email".to_owned())) -//! .hint(Hint::Resident(true)) // this is not supported by all implementations -//! .timeout(Timeout::Never) // this however is -//! .show().unwrap(); -//! ``` -//! -//! Careful! There are no checks whether you use hints twice. -//! It is possible to set `urgency=Low` AND `urgency=Critical`, in which case the behavior of the server is undefined. -//! -//! ## Example 3: Ask the user to do something -//! -//! ```no_run -//! # use notify_rust::*; -//! # #[cfg(all(unix, not(target_os = "macos")))] -//! Notification::new().summary("click me") -//! .action("default", "default") -//! .action("clicked", "click here") -//! .hint(Hint::Resident(true)) -//! .show() -//! .unwrap() -//! .wait_for_action(|action| match action { -//! "default" => println!("you clicked \"default\""), -//! "clicked" => println!("that was correct"), -//! // here "__closed" is a hard coded keyword -//! "__closed" => println!("the notification was closed"), -//! _ => () -//! }); -//! ``` -//! -//! ## Minimal Example -//! -//! You can omit almost everything -//! -//! ```no_run -//! # use notify_rust::Notification; -//! Notification::new().show(); -//! ``` -//! -//! more [examples](https://github.com/hoodie/notify-rust/tree/main/examples) in the repository. -//! //! # Platform Differences //!
//! ✔︎ = works
diff --git a/plugins/notification/src/notify_rust/notification.rs b/plugins/notification/src/notify_rust/notification.rs index c032eedfc..256941afa 100644 --- a/plugins/notification/src/notify_rust/notification.rs +++ b/plugins/notification/src/notify_rust/notification.rs @@ -32,17 +32,6 @@ fn exe_name() -> String { /// Desktop notification. /// /// A desktop notification is configured via builder pattern, before it is launched with `show()`. -/// -/// # Example -/// ``` no_run -/// # use notify_rust::*; -/// # fn _doc() -> Result<(), Box> { -/// Notification::new() -/// .summary("☝️ A notification") -/// .show()?; -/// # Ok(()) -/// # } -/// ``` #[derive(Debug, Clone)] #[non_exhaustive] pub struct Notification { @@ -247,18 +236,6 @@ impl Notification { /// * [`image_data(...)`](#method.image_data) /// * [`image_path(...)`](#method.image_path) /// - /// ```no_run - /// # use notify_rust::Notification; - /// # use notify_rust::Hint; - /// Notification::new().summary("Category:email") - /// .body("This should not go away until you acknowledge it.") - /// .icon("thunderbird") - /// .appname("thunderbird") - /// .hint(Hint::Category("email".to_owned())) - /// .hint(Hint::Resident(true)) - /// .show(); - /// ``` - /// /// # Platform support /// Most of these hints don't even have an effect on the big XDG Desktops, they are completely tossed on macOS. #[cfg(all(unix, not(target_os = "macos")))] @@ -300,23 +277,6 @@ impl Notification { /// /// When passing a [`Duration`](`std::time::Duration`) we will try convert it into milliseconds. /// - /// - /// ``` - /// # use std::time::Duration; - /// # use notify_rust::Timeout; - /// assert_eq!(Timeout::from(Duration::from_millis(2000)), Timeout::Milliseconds(2000)); - /// ``` - /// ### Caveats! - /// - /// 1. If the duration is zero milliseconds then the original behavior will apply and the notification will **Never** timeout. - /// 2. Should the number of milliseconds not fit within an [`i32`] then we will fall back to the default timeout. - /// ``` - /// # use std::time::Duration; - /// # use notify_rust::Timeout; - /// assert_eq!(Timeout::from(Duration::from_millis(0)), Timeout::Never); - /// assert_eq!(Timeout::from(Duration::from_millis(u64::MAX)), Timeout::Default); - /// ``` - /// /// # Platform support /// This only works on XDG Desktops, macOS does not support manually setting the timeout. pub fn timeout>(&mut self, timeout: T) -> &mut Notification { diff --git a/plugins/notification/src/notify_rust/server.rs b/plugins/notification/src/notify_rust/server.rs index 291823907..508213bbc 100644 --- a/plugins/notification/src/notify_rust/server.rs +++ b/plugins/notification/src/notify_rust/server.rs @@ -21,7 +21,7 @@ use dbus::{ }; use super::{Hint, Notification, Timeout}; -use crate::xdg::{NOTIFICATION_NAMESPACE, NOTIFICATION_OBJECTPATH}; +use super::xdg::{NOTIFICATION_NAMESPACE, NOTIFICATION_OBJECTPATH}; static DBUS_ERROR_FAILED: &str = "org.freedesktop.DBus.Error.Failed"; /// Version of the crate equals the version server. diff --git a/plugins/notification/src/notify_rust/timeout.rs b/plugins/notification/src/notify_rust/timeout.rs index 295c97eed..6b76a55ae 100644 --- a/plugins/notification/src/notify_rust/timeout.rs +++ b/plugins/notification/src/notify_rust/timeout.rs @@ -4,12 +4,6 @@ use std::{convert::TryInto, num::ParseIntError, str::FromStr, time::Duration}; /// /// # `FromStr` /// You can also parse a `Timeout` from a `&str`. -/// ``` -/// # use notify_rust::Timeout; -/// assert_eq!("default".parse(), Ok(Timeout::Default)); -/// assert_eq!("never".parse(), Ok(Timeout::Never)); -/// assert_eq!("42".parse(), Ok(Timeout::Milliseconds(42))); -/// ``` #[derive(Debug, Copy, Clone, PartialEq, Eq)] pub enum Timeout { /// Expires according to server default. diff --git a/plugins/notification/src/notify_rust/urgency.rs b/plugins/notification/src/notify_rust/urgency.rs index 9c9ba96e0..eeddf763e 100644 --- a/plugins/notification/src/notify_rust/urgency.rs +++ b/plugins/notification/src/notify_rust/urgency.rs @@ -11,20 +11,6 @@ use std::convert::TryFrom; /// > **Critical notifications should not automatically expire**, as they are things that the user will most likely want to know about. They should only be closed when the user dismisses them, for example, by clicking on the notification. /// /// — see [Galago](http://www.galago-project.org/specs/notification/0.9/x320.html) or [Gnome](https://developer.gnome.org/notification-spec/#urgency-levels) specification. -/// -/// # Example -/// ```no_run -/// # use notify_rust::*; -/// # fn _doc() -> Result<(), Box> { -/// Notification::new() -/// .summary("oh no") -/// .icon("dialog-warning") -/// .urgency(Urgency::Critical) -/// .show()?; -/// # Ok(()) -/// # } -/// ``` -/// #[derive(Eq, PartialEq, Hash, Copy, Clone, Debug)] pub enum Urgency { /// The behavior for `Low` urgency depends on the notification server. diff --git a/plugins/notification/src/notify_rust/windows.rs b/plugins/notification/src/notify_rust/windows.rs index c1c768649..423aae991 100644 --- a/plugins/notification/src/notify_rust/windows.rs +++ b/plugins/notification/src/notify_rust/windows.rs @@ -1,6 +1,6 @@ use winrt_notification::Toast; -pub use crate::{error::*, notification::Notification, timeout::Timeout}; +pub use super::{error::*, notification::Notification, timeout::Timeout}; use std::{path::Path, str::FromStr}; diff --git a/plugins/notification/src/notify_rust/xdg/bus.rs b/plugins/notification/src/notify_rust/xdg/bus.rs index 6195f3adf..cd6c1ccae 100644 --- a/plugins/notification/src/notify_rust/xdg/bus.rs +++ b/plugins/notification/src/notify_rust/xdg/bus.rs @@ -1,4 +1,4 @@ -use crate::xdg::NOTIFICATION_DEFAULT_BUS; +use super::super::xdg::NOTIFICATION_DEFAULT_BUS; fn skip_first_slash(s: &str) -> &str { if let Some('/') = s.chars().next() { diff --git a/plugins/notification/src/notify_rust/xdg/dbus_rs.rs b/plugins/notification/src/notify_rust/xdg/dbus_rs.rs index 16e5f5b3d..b16581224 100644 --- a/plugins/notification/src/notify_rust/xdg/dbus_rs.rs +++ b/plugins/notification/src/notify_rust/xdg/dbus_rs.rs @@ -9,7 +9,7 @@ use super::{ NOTIFICATION_INTERFACE, }; -use crate::{ +use super::super::{ error::*, hints::message::HintMessage, notification::Notification, @@ -18,7 +18,7 @@ use crate::{ pub mod bus { - use crate::xdg::NOTIFICATION_DEFAULT_BUS; + use super::super::super::xdg::NOTIFICATION_DEFAULT_BUS; fn skip_first_slash(s: &str) -> &str { if let Some('/') = s.chars().next() { diff --git a/plugins/notification/src/notify_rust/xdg/mod.rs b/plugins/notification/src/notify_rust/xdg/mod.rs index 370d88b29..3012b5702 100644 --- a/plugins/notification/src/notify_rust/xdg/mod.rs +++ b/plugins/notification/src/notify_rust/xdg/mod.rs @@ -119,22 +119,6 @@ impl NotificationHandle { } /// Manually close the notification - /// - /// # Example - /// - /// ```no_run - /// # use notify_rust::*; - /// let handle: NotificationHandle = Notification::new() - /// .summary("oh no") - /// .hint(notify_rust::Hint::Transient(true)) - /// .body("I'll be here till you close me!") - /// .hint(Hint::Resident(true)) // does not work on kde - /// .timeout(Timeout::Never) // works on kde and gnome - /// .show() - /// .unwrap(); - /// // ... and then later - /// handle.close(); - /// ``` pub fn close(self) { match self.inner { #[cfg(feature = "dbus")] @@ -145,30 +129,6 @@ impl NotificationHandle { } /// Executes a closure after the notification has closed. - /// - /// ## Example 1: *I don't care about why it closed* (the good ole API) - /// - /// ```no_run - /// # use notify_rust::Notification; - /// Notification::new().summary("Time is running out") - /// .body("This will go away.") - /// .icon("clock") - /// .show() - /// .unwrap() - /// .on_close(|| println!("closed")); - /// ``` - /// - /// ## Example 2: *I **do** care about why it closed* (added in v4.5.0) - /// - /// ```no_run - /// # use notify_rust::Notification; - /// Notification::new().summary("Time is running out") - /// .body("This will go away.") - /// .icon("clock") - /// .show() - /// .unwrap() - /// .on_close(|reason| println!("closed: {:?}", reason)); - /// ``` pub fn on_close(self, handler: impl CloseHandler) { match self.inner { #[cfg(feature = "dbus")] @@ -190,26 +150,6 @@ impl NotificationHandle { }; } - /// Replace the original notification with an updated version - /// ## Example - /// ```no_run - /// # use notify_rust::Notification; - /// let mut notification = Notification::new().summary("Latest News") - /// .body("Bayern Dortmund 3:2") - /// .show() - /// .unwrap(); - /// - /// std::thread::sleep_ms(1_500); - /// - /// notification.summary("Latest News (Correction)") - /// .body("Bayern Dortmund 3:3"); - /// - /// notification.update(); - /// ``` - /// Watch out for different implementations of the - /// notification server! On plasma5 for instance, you should also change the appname, so the old - /// message is really replaced and not just amended. Xfce behaves well, all others have not - /// been tested by the developer. pub fn update(&mut self) { match self.inner { #[cfg(feature = "dbus")] diff --git a/plugins/os/package.json b/plugins/os/package.json index 9f383415c..c9a5a45b4 100644 --- a/plugins/os/package.json +++ b/plugins/os/package.json @@ -23,6 +23,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "2.0.0-beta.1" + "@tauri-apps/api": "2.0.0-beta.2" } } diff --git a/plugins/positioner/package.json b/plugins/positioner/package.json index c31c4fce4..b2af4a020 100644 --- a/plugins/positioner/package.json +++ b/plugins/positioner/package.json @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "2.0.0-beta.1" + "@tauri-apps/api": "2.0.0-beta.2" } } diff --git a/plugins/process/package.json b/plugins/process/package.json index 27ea805db..ed7eff212 100644 --- a/plugins/process/package.json +++ b/plugins/process/package.json @@ -23,6 +23,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "2.0.0-beta.1" + "@tauri-apps/api": "2.0.0-beta.2" } } diff --git a/plugins/shell/package.json b/plugins/shell/package.json index 15317809a..a1127c5c2 100644 --- a/plugins/shell/package.json +++ b/plugins/shell/package.json @@ -23,6 +23,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "2.0.0-beta.1" + "@tauri-apps/api": "2.0.0-beta.2" } } diff --git a/plugins/single-instance/Cargo.toml b/plugins/single-instance/Cargo.toml index 3a4c8fd42..31b2da6ef 100644 --- a/plugins/single-instance/Cargo.toml +++ b/plugins/single-instance/Cargo.toml @@ -32,4 +32,4 @@ features = [ ] [target."cfg(target_os = \"linux\")".dependencies] -zbus = "3" +zbus = "4" diff --git a/plugins/single-instance/examples/vanilla/package.json b/plugins/single-instance/examples/vanilla/package.json index d9ee6f141..0a0e8683b 100644 --- a/plugins/single-instance/examples/vanilla/package.json +++ b/plugins/single-instance/examples/vanilla/package.json @@ -9,6 +9,6 @@ "author": "", "license": "MIT", "devDependencies": { - "@tauri-apps/cli": "2.0.0-beta.2" + "@tauri-apps/cli": "2.0.0-beta.3" } } diff --git a/plugins/single-instance/src/platform_impl/linux.rs b/plugins/single-instance/src/platform_impl/linux.rs index c34187341..2eee89a08 100644 --- a/plugins/single-instance/src/platform_impl/linux.rs +++ b/plugins/single-instance/src/platform_impl/linux.rs @@ -10,8 +10,8 @@ use tauri::{ AppHandle, Config, Manager, RunEvent, Runtime, }; use zbus::{ - blocking::{Connection, ConnectionBuilder}, - dbus_interface, + blocking::{Builder, Connection}, + interface, }; struct ConnectionHandle(Connection); @@ -21,7 +21,7 @@ struct SingleInstanceDBus { app_handle: AppHandle, } -#[dbus_interface(name = "org.SingleInstance.DBus")] +#[interface(name = "org.SingleInstance.DBus")] impl SingleInstanceDBus { fn execute_callback(&mut self, argv: Vec, cwd: String) { (self.callback)(&self.app_handle, argv, cwd); @@ -43,7 +43,7 @@ pub fn init(f: Box>) -> TauriPlugin { let dbus_name = format!("org.{id}.SingleInstance"); let dbus_path = format!("/org/{id}/SingleInstance"); - match ConnectionBuilder::session() + match Builder::session() .unwrap() .name(dbus_name.as_str()) .unwrap() diff --git a/plugins/sql/package.json b/plugins/sql/package.json index fb3970180..469eac6c4 100644 --- a/plugins/sql/package.json +++ b/plugins/sql/package.json @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "2.0.0-beta.1" + "@tauri-apps/api": "2.0.0-beta.2" } } diff --git a/plugins/store/package.json b/plugins/store/package.json index c6d014f4e..05d16c9c6 100644 --- a/plugins/store/package.json +++ b/plugins/store/package.json @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "2.0.0-beta.1" + "@tauri-apps/api": "2.0.0-beta.2" } } diff --git a/plugins/stronghold/package.json b/plugins/stronghold/package.json index d3b0136a3..05494f6b5 100644 --- a/plugins/stronghold/package.json +++ b/plugins/stronghold/package.json @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "2.0.0-beta.1" + "@tauri-apps/api": "2.0.0-beta.2" } } diff --git a/plugins/updater/package.json b/plugins/updater/package.json index c5a60ba89..d56ecdb89 100644 --- a/plugins/updater/package.json +++ b/plugins/updater/package.json @@ -23,6 +23,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "2.0.0-beta.1" + "@tauri-apps/api": "2.0.0-beta.2" } } diff --git a/plugins/upload/package.json b/plugins/upload/package.json index eb2eb8fd1..5319d407d 100644 --- a/plugins/upload/package.json +++ b/plugins/upload/package.json @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "2.0.0-beta.1" + "@tauri-apps/api": "2.0.0-beta.2" } } diff --git a/plugins/websocket/examples/tauri-app/package.json b/plugins/websocket/examples/tauri-app/package.json index 77bb8ef4a..dc916a385 100644 --- a/plugins/websocket/examples/tauri-app/package.json +++ b/plugins/websocket/examples/tauri-app/package.json @@ -9,7 +9,7 @@ "preview": "vite preview" }, "devDependencies": { - "@tauri-apps/cli": "2.0.0-beta.2", + "@tauri-apps/cli": "2.0.0-beta.3", "typescript": "^5.3.3", "vite": "^5.0.12" }, diff --git a/plugins/websocket/package.json b/plugins/websocket/package.json index c21b29031..57c38af4a 100644 --- a/plugins/websocket/package.json +++ b/plugins/websocket/package.json @@ -23,6 +23,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "2.0.0-beta.1" + "@tauri-apps/api": "2.0.0-beta.2" } } diff --git a/plugins/window-state/package.json b/plugins/window-state/package.json index e94c302ce..a3b1c7d4c 100644 --- a/plugins/window-state/package.json +++ b/plugins/window-state/package.json @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "2.0.0-beta.1" + "@tauri-apps/api": "2.0.0-beta.2" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 519baa195..594b879b8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -64,8 +64,8 @@ importers: examples/api: dependencies: '@tauri-apps/api': - specifier: 2.0.0-beta.1 - version: 2.0.0-beta.1 + specifier: 2.0.0-beta.2 + version: 2.0.0-beta.2 '@tauri-apps/plugin-barcode-scanner': specifier: 2.0.0-beta.0 version: link:../../plugins/barcode-scanner @@ -122,8 +122,8 @@ importers: specifier: ^3.0.1 version: 3.0.1(svelte@4.2.8)(vite@5.0.12) '@tauri-apps/cli': - specifier: 2.0.0-beta.2 - version: 2.0.0-beta.2 + specifier: 2.0.0-beta.3 + version: 2.0.0-beta.3 '@unocss/extractor-svelte': specifier: ^0.58.0 version: 0.58.0 @@ -143,26 +143,26 @@ importers: plugins/authenticator: dependencies: '@tauri-apps/api': - specifier: 2.0.0-beta.1 - version: 2.0.0-beta.1 + specifier: 2.0.0-beta.2 + version: 2.0.0-beta.2 plugins/autostart: dependencies: '@tauri-apps/api': - specifier: 2.0.0-beta.1 - version: 2.0.0-beta.1 + specifier: 2.0.0-beta.2 + version: 2.0.0-beta.2 plugins/barcode-scanner: dependencies: '@tauri-apps/api': - specifier: 2.0.0-beta.1 - version: 2.0.0-beta.1 + specifier: 2.0.0-beta.2 + version: 2.0.0-beta.2 plugins/biometric: dependencies: '@tauri-apps/api': - specifier: 2.0.0-beta.1 - version: 2.0.0-beta.1 + specifier: 2.0.0-beta.2 + version: 2.0.0-beta.2 devDependencies: tslib: specifier: 2.6.0 @@ -171,33 +171,33 @@ importers: plugins/cli: dependencies: '@tauri-apps/api': - specifier: 2.0.0-beta.1 - version: 2.0.0-beta.1 + specifier: 2.0.0-beta.2 + version: 2.0.0-beta.2 plugins/clipboard-manager: dependencies: '@tauri-apps/api': - specifier: 2.0.0-beta.1 - version: 2.0.0-beta.1 + specifier: 2.0.0-beta.2 + version: 2.0.0-beta.2 plugins/deep-link: dependencies: '@tauri-apps/api': - specifier: 2.0.0-beta.1 - version: 2.0.0-beta.1 + specifier: 2.0.0-beta.2 + version: 2.0.0-beta.2 plugins/deep-link/examples/app: dependencies: '@tauri-apps/api': - specifier: 2.0.0-beta.1 - version: 2.0.0-beta.1 + specifier: 2.0.0-beta.2 + version: 2.0.0-beta.2 '@tauri-apps/plugin-deep-link': specifier: 2.0.0-beta.0 version: link:../.. devDependencies: '@tauri-apps/cli': - specifier: 2.0.0-beta.2 - version: 2.0.0-beta.2 + specifier: 2.0.0-beta.3 + version: 2.0.0-beta.3 internal-ip: specifier: ^8.0.0 version: 8.0.0 @@ -211,38 +211,38 @@ importers: plugins/dialog: dependencies: '@tauri-apps/api': - specifier: 2.0.0-beta.1 - version: 2.0.0-beta.1 + specifier: 2.0.0-beta.2 + version: 2.0.0-beta.2 plugins/fs: dependencies: '@tauri-apps/api': - specifier: 2.0.0-beta.1 - version: 2.0.0-beta.1 + specifier: 2.0.0-beta.2 + version: 2.0.0-beta.2 plugins/global-shortcut: dependencies: '@tauri-apps/api': - specifier: 2.0.0-beta.1 - version: 2.0.0-beta.1 + specifier: 2.0.0-beta.2 + version: 2.0.0-beta.2 plugins/http: dependencies: '@tauri-apps/api': - specifier: 2.0.0-beta.1 - version: 2.0.0-beta.1 + specifier: 2.0.0-beta.2 + version: 2.0.0-beta.2 plugins/log: dependencies: '@tauri-apps/api': - specifier: 2.0.0-beta.1 - version: 2.0.0-beta.1 + specifier: 2.0.0-beta.2 + version: 2.0.0-beta.2 plugins/nfc: dependencies: '@tauri-apps/api': - specifier: 2.0.0-beta.1 - version: 2.0.0-beta.1 + specifier: 2.0.0-beta.2 + version: 2.0.0-beta.2 devDependencies: tslib: specifier: 2.6.0 @@ -251,74 +251,74 @@ importers: plugins/notification: dependencies: '@tauri-apps/api': - specifier: 2.0.0-beta.1 - version: 2.0.0-beta.1 + specifier: 2.0.0-beta.2 + version: 2.0.0-beta.2 plugins/os: dependencies: '@tauri-apps/api': - specifier: 2.0.0-beta.1 - version: 2.0.0-beta.1 + specifier: 2.0.0-beta.2 + version: 2.0.0-beta.2 plugins/positioner: dependencies: '@tauri-apps/api': - specifier: 2.0.0-beta.1 - version: 2.0.0-beta.1 + specifier: 2.0.0-beta.2 + version: 2.0.0-beta.2 plugins/process: dependencies: '@tauri-apps/api': - specifier: 2.0.0-beta.1 - version: 2.0.0-beta.1 + specifier: 2.0.0-beta.2 + version: 2.0.0-beta.2 plugins/shell: dependencies: '@tauri-apps/api': - specifier: 2.0.0-beta.1 - version: 2.0.0-beta.1 + specifier: 2.0.0-beta.2 + version: 2.0.0-beta.2 plugins/single-instance/examples/vanilla: devDependencies: '@tauri-apps/cli': - specifier: 2.0.0-beta.2 - version: 2.0.0-beta.2 + specifier: 2.0.0-beta.3 + version: 2.0.0-beta.3 plugins/sql: dependencies: '@tauri-apps/api': - specifier: 2.0.0-beta.1 - version: 2.0.0-beta.1 + specifier: 2.0.0-beta.2 + version: 2.0.0-beta.2 plugins/store: dependencies: '@tauri-apps/api': - specifier: 2.0.0-beta.1 - version: 2.0.0-beta.1 + specifier: 2.0.0-beta.2 + version: 2.0.0-beta.2 plugins/stronghold: dependencies: '@tauri-apps/api': - specifier: 2.0.0-beta.1 - version: 2.0.0-beta.1 + specifier: 2.0.0-beta.2 + version: 2.0.0-beta.2 plugins/updater: dependencies: '@tauri-apps/api': - specifier: 2.0.0-beta.1 - version: 2.0.0-beta.1 + specifier: 2.0.0-beta.2 + version: 2.0.0-beta.2 plugins/upload: dependencies: '@tauri-apps/api': - specifier: 2.0.0-beta.1 - version: 2.0.0-beta.1 + specifier: 2.0.0-beta.2 + version: 2.0.0-beta.2 plugins/websocket: dependencies: '@tauri-apps/api': - specifier: 2.0.0-beta.1 - version: 2.0.0-beta.1 + specifier: 2.0.0-beta.2 + version: 2.0.0-beta.2 plugins/websocket/examples/tauri-app: dependencies: @@ -327,8 +327,8 @@ importers: version: link:../.. devDependencies: '@tauri-apps/cli': - specifier: 2.0.0-beta.2 - version: 2.0.0-beta.2 + specifier: 2.0.0-beta.3 + version: 2.0.0-beta.3 typescript: specifier: ^5.3.3 version: 5.3.3 @@ -339,8 +339,8 @@ importers: plugins/window-state: dependencies: '@tauri-apps/api': - specifier: 2.0.0-beta.1 - version: 2.0.0-beta.1 + specifier: 2.0.0-beta.2 + version: 2.0.0-beta.2 packages: @@ -1476,13 +1476,13 @@ packages: - supports-color dev: true - /@tauri-apps/api@2.0.0-beta.1: - resolution: {integrity: sha512-Zok1HA5s38E951CD2Osg7qi1/NlT7K1zOK6/nf5t/SKkoRT8KPrPZlJ4zBOImLQpHdaLtEANjcjBfYcbM2noxQ==} + /@tauri-apps/api@2.0.0-beta.2: + resolution: {integrity: sha512-4r1r6kgttzIWxJ3HxkZQH+b7EiUtKhdUCPbi0KSalD+2T3j6klw+v8VyxhKwEdjM/eo60NE+J33v1E/Urq8puw==} engines: {node: '>= 18', npm: '>= 6.6.0', yarn: '>= 1.19.1'} dev: false - /@tauri-apps/cli-darwin-arm64@2.0.0-beta.2: - resolution: {integrity: sha512-bAchrSNhFlj1U1rBZ3WJYQU5urN9bpaHlSW8UnTEkkDK0bwcLQyf+AYtRFCy8mWHq6n1RhXxVa6nbTg4DZl7RA==} + /@tauri-apps/cli-darwin-arm64@2.0.0-beta.3: + resolution: {integrity: sha512-gHcn3jI/4MDXDIlK/4Zz0ftTosgN3OimWlKxEz777QrA1hldrQweYIhdZXkqE9KgoE+u6w80vWIcr0InHAf7Iw==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] @@ -1490,8 +1490,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-darwin-x64@2.0.0-beta.2: - resolution: {integrity: sha512-29Zn0GXIID1fQ8PjVBjQ/X1Ho3HcVF7a6BPYRBe1zEUfTKyrKFtHP/RD0tROw+iMh17dl3Li23aV9CCQuhfW5Q==} + /@tauri-apps/cli-darwin-x64@2.0.0-beta.3: + resolution: {integrity: sha512-kRCaukT2IAGMmNuAOUBhdZRlKujTy2lSsdNKmgGEMnzQLKJwWO9Gpq1NmPY7ZVqyXK/X8QnGHuasDEQsSO6B4w==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] @@ -1499,8 +1499,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-beta.2: - resolution: {integrity: sha512-o5esvaBOn7Wr/tQz9HY9CrjeIT7/3bGO3reJk9MUOU6VpwOElGlM7bl7U2I2z1EmZn7GUa7yG2E+p7CMDV9a3w==} + /@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-beta.3: + resolution: {integrity: sha512-cpNZOQDotNSdjoZT16s1JtZvnkM0wgLwU39AhKhRCco4KEH3/8G1ngKF9JKalWUN8zDTcuCigEAr37gEv4mLAA==} engines: {node: '>= 10'} cpu: [arm] os: [linux] @@ -1508,8 +1508,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-linux-arm64-gnu@2.0.0-beta.2: - resolution: {integrity: sha512-YIA9OZ9+Mf3LW1iQZveUeMySvM3jgf5b0a1MUawYCcuhUJ/FFGaDiia4Z6hOO+p1d8DsswEelzzKyvlBiBJYGA==} + /@tauri-apps/cli-linux-arm64-gnu@2.0.0-beta.3: + resolution: {integrity: sha512-8q86V6P9bkeoFcnvSsnvOwmKY6ijIN4ueRVXCj5cVpsw392VF9vud1Nq7/l+QDgn9OWbZNNVDl30iyoSuaykBA==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] @@ -1517,8 +1517,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-linux-arm64-musl@2.0.0-beta.2: - resolution: {integrity: sha512-UNminCTRybPkb9BNyAPo8v4bJ45q9anaIisw7PfGXeuDeHMc2W/fjLlQXipsijMvQ7lakUAjO3ttEM6ctOYJiQ==} + /@tauri-apps/cli-linux-arm64-musl@2.0.0-beta.3: + resolution: {integrity: sha512-L7fokh4aqyV6yDPoeKwFN3Yt0pCAuZMWeP5tOeSBiom1pU7ppKH+4KHeTekNEIecZG+Ah250DkVCdmWS+aRFTA==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] @@ -1526,8 +1526,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-linux-x64-gnu@2.0.0-beta.2: - resolution: {integrity: sha512-o0eStDWpKkPdEsbbn98kiA/lOo4vBXnjFrov16lq88h2OThJS7idhSUqBRgqYpsIENMrvjtPJLutBkF9fuTOsw==} + /@tauri-apps/cli-linux-x64-gnu@2.0.0-beta.3: + resolution: {integrity: sha512-/crp3K6PathqicVWPj8Kh1120NNVV7nagJ7oZW9OFch7nBS1tmDnSB5k5LgA4yYu+lDKNUREnATMWHL6i0gNeg==} engines: {node: '>= 10'} cpu: [x64] os: [linux] @@ -1535,8 +1535,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-linux-x64-musl@2.0.0-beta.2: - resolution: {integrity: sha512-zUhyeIBqIQJ9oy04kNffz7QxxXw32/0l+EEPCwFfhhCQq7y6k34G/br/yjHXXYdNytNn4kYcjwjzXnohUYTu3w==} + /@tauri-apps/cli-linux-x64-musl@2.0.0-beta.3: + resolution: {integrity: sha512-jX1ZT0UQwdBGbpCwlpv2bsLDO7KFMeDJQ/ZZVMfWyjuYrGBG5zhJ2NXwTMkHVnxfvE6BVmnybWcykeSqTATeOw==} engines: {node: '>= 10'} cpu: [x64] os: [linux] @@ -1544,8 +1544,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-win32-arm64-msvc@2.0.0-beta.2: - resolution: {integrity: sha512-YIq7LsgSeUgSbwVDbwZBHzM9/gxWlcIxwMTgmwfSCszZmrzFfxP7JgzVG0VnK1N8UYymunWd9WIX9uUT3XhetQ==} + /@tauri-apps/cli-win32-arm64-msvc@2.0.0-beta.3: + resolution: {integrity: sha512-UCEZNKocENLX3HYKid4FEbrCMjCX9e58klBIvJKxT8HTjvpgFYDoKccswDNfszLhmineKMlkUvm7j7U0sMh8MQ==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] @@ -1553,8 +1553,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-win32-ia32-msvc@2.0.0-beta.2: - resolution: {integrity: sha512-i2p7OS4R9Tq0EQbjU8VldWNLPXuzbWCsDJe78/pCU0nV1OTjjxXv0tzR8d5R2VElC8eOMGnfZr7mRMrKGcZoHQ==} + /@tauri-apps/cli-win32-ia32-msvc@2.0.0-beta.3: + resolution: {integrity: sha512-O8syGXDHyKN/cv1ktD76dTcbkQ1nNEPhnT1Z+r0GKxNsw4/MyIVglzEcou3aPq0/1MQ0PEGVyG1x0JMaPw7oHQ==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] @@ -1562,8 +1562,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-win32-x64-msvc@2.0.0-beta.2: - resolution: {integrity: sha512-5FYOA/u4xyj1Q/NKvFEEywPsUwBeLEarN/08+5JIjk7xmEIPylaxYxFnfSH0QZiLBDZAFbGIAWt0MRi97eNN5A==} + /@tauri-apps/cli-win32-x64-msvc@2.0.0-beta.3: + resolution: {integrity: sha512-YDdF3XWaptjKtKz33sZhC+uNAZwp6QtAmZSRCQQlC1W7uJwLD00/3QF4vO/c6Qm+BGFsazVh1+YmBF1p0kV0rg==} engines: {node: '>= 10'} cpu: [x64] os: [win32] @@ -1571,21 +1571,21 @@ packages: dev: true optional: true - /@tauri-apps/cli@2.0.0-beta.2: - resolution: {integrity: sha512-sc5fz1MEqncn8trOaUGn9DeZy7ND3QnGEb3lCPgghjifzceN/UZe69fDUN1N24iJxOhKs5Y2UI1uYK5em8GOGQ==} + /@tauri-apps/cli@2.0.0-beta.3: + resolution: {integrity: sha512-xLAL2DNNUJWqHBKvanc3V9bG9kkwtFwc40X/DrfgEKnkajEm79wqnkaT8LUnmbe0WZ8bzBRO1fLIgKlOH6GiCA==} engines: {node: '>= 10'} hasBin: true optionalDependencies: - '@tauri-apps/cli-darwin-arm64': 2.0.0-beta.2 - '@tauri-apps/cli-darwin-x64': 2.0.0-beta.2 - '@tauri-apps/cli-linux-arm-gnueabihf': 2.0.0-beta.2 - '@tauri-apps/cli-linux-arm64-gnu': 2.0.0-beta.2 - '@tauri-apps/cli-linux-arm64-musl': 2.0.0-beta.2 - '@tauri-apps/cli-linux-x64-gnu': 2.0.0-beta.2 - '@tauri-apps/cli-linux-x64-musl': 2.0.0-beta.2 - '@tauri-apps/cli-win32-arm64-msvc': 2.0.0-beta.2 - '@tauri-apps/cli-win32-ia32-msvc': 2.0.0-beta.2 - '@tauri-apps/cli-win32-x64-msvc': 2.0.0-beta.2 + '@tauri-apps/cli-darwin-arm64': 2.0.0-beta.3 + '@tauri-apps/cli-darwin-x64': 2.0.0-beta.3 + '@tauri-apps/cli-linux-arm-gnueabihf': 2.0.0-beta.3 + '@tauri-apps/cli-linux-arm64-gnu': 2.0.0-beta.3 + '@tauri-apps/cli-linux-arm64-musl': 2.0.0-beta.3 + '@tauri-apps/cli-linux-x64-gnu': 2.0.0-beta.3 + '@tauri-apps/cli-linux-x64-musl': 2.0.0-beta.3 + '@tauri-apps/cli-win32-arm64-msvc': 2.0.0-beta.3 + '@tauri-apps/cli-win32-ia32-msvc': 2.0.0-beta.3 + '@tauri-apps/cli-win32-x64-msvc': 2.0.0-beta.3 dev: true /@tauri-apps/toml@2.2.4: diff --git a/shared/template/package.json b/shared/template/package.json index ddcd00032..60cf5e267 100644 --- a/shared/template/package.json +++ b/shared/template/package.json @@ -23,6 +23,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "2.0.0-beta.1" + "@tauri-apps/api": "2.0.0-beta.2" } }