diff --git a/.changes/alpha.20.md b/.changes/alpha.20.md new file mode 100644 index 00000000..b796cc17 --- /dev/null +++ b/.changes/alpha.20.md @@ -0,0 +1,30 @@ +--- +"authenticator": patch +"autostart": patch +"barcode-scanner": patch +"cli": patch +"clipboard-manager": patch +"deep-link": patch +"dialog": patch +"fs": patch +"global-shortcut": patch +"http": patch +"localhost": patch +"log-plugin": patch +"notification": patch +"os": patch +"persisted-scope": patch +"positioner": patch +"process": patch +"shell": patch +"single-instance": patch +"sql": patch +"store": patch +"stronghold": patch +"updater": patch +"upload": patch +"websocket": patch +"window-state": patch +--- + +Update to tauri@alpha.20. diff --git a/.changes/api-alpha.12.md b/.changes/api-alpha.12.md new file mode 100644 index 00000000..00a71b70 --- /dev/null +++ b/.changes/api-alpha.12.md @@ -0,0 +1,27 @@ +--- +"authenticator-js": patch +"autostart-js": patch +"barcode-scanner-js": patch +"cli-js": patch +"clipboard-manager-js": patch +"deep-link-js": patch +"dialog-js": patch +"fs-js": patch +"global-shortcut-js": patch +"http-js": patch +"log-js": patch +"notification-js": patch +"os-js": patch +"positioner-js": patch +"process-js": patch +"shell-js": patch +"sql-js": patch +"store-js": patch +"stronghold-js": patch +"updater-js": patch +"upload-js": patch +"websocket-js": patch +"window-state-js": patch +--- + +Update to @tauri-apps/api v2.0.0-alpha.12. diff --git a/.changes/api-alpha.13.md b/.changes/api-alpha.13.md index 00a71b70..dfffc7e7 100644 --- a/.changes/api-alpha.13.md +++ b/.changes/api-alpha.13.md @@ -24,4 +24,4 @@ "window-state-js": patch --- -Update to @tauri-apps/api v2.0.0-alpha.12. +Update to @tauri-apps/api v2.0.0-alpha.13. diff --git a/.changes/pre.json b/.changes/pre.json index 72511dc2..452c5e62 100644 --- a/.changes/pre.json +++ b/.changes/pre.json @@ -5,7 +5,7 @@ ".changes/alpha.17.md", ".changes/alpha.18.md", ".changes/api-alpha.11.md", - ".changes/api-alpha.13.md", + ".changes/api-alpha.12.md", ".changes/api-alpha.9.md", ".changes/deep-link-initial-release.md", ".changes/dialog-async-message-dialog.md", diff --git a/Cargo.lock b/Cargo.lock index 2882567d..a94cb076 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -864,6 +864,12 @@ 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 = "chacha20" version = "0.8.2" @@ -2044,6 +2050,20 @@ dependencies = [ "system-deps", ] +[[package]] +name = "gdkx11" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2ea8a4909d530f79921290389cbd7c34cb9d623bfe970eaae65ca5f9cd9cce" +dependencies = [ + "gdk", + "gdkx11-sys", + "gio", + "glib 0.18.3", + "libc", + "x11", +] + [[package]] name = "gdkx11-sys" version = "0.18.0" @@ -2633,7 +2653,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.51.1", ] [[package]] @@ -5663,26 +5683,19 @@ dependencies = [ [[package]] name = "tao" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f130523fee9820ad78141d443e6cef75043acade79107bc483872bc183928c0f" +checksum = "3c0dff18fed076d29cb5779e918ef4b8a5dbb756204e4a027794f0bce233d949" dependencies = [ "bitflags 1.3.2", - "cairo-rs", "cc", - "cocoa 0.24.1", + "cocoa 0.25.0", "core-foundation", - "core-graphics 0.22.3", + "core-graphics 0.23.1", "crossbeam-channel", "dispatch", - "gdk", - "gdk-pixbuf", - "gdk-sys", "gdkwayland-sys", "gdkx11-sys", - "gio", - "glib 0.18.3", - "glib-sys 0.18.1", "gtk", "image", "instant", @@ -5699,13 +5712,12 @@ dependencies = [ "png", "raw-window-handle", "scopeguard", - "serde", "tao-macros", "unicode-segmentation", "url", - "uuid", - "windows 0.51.1", + "windows 0.52.0", "windows-implement", + "windows-version", "x11-dl", "zbus", ] @@ -5740,9 +5752,9 @@ checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" [[package]] name = "tauri" -version = "2.0.0-alpha.18" +version = "2.0.0-alpha.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dc6ec8c246fa16092a3e650de2f10f3af3362915b7caab1aeed364a60829fcc" +checksum = "05fb63873c39d3fd5ddad995d395e7b7394ece0b69aeacb31e91d24af48f3de1" dependencies = [ "anyhow", "bytes 1.5.0", @@ -5764,7 +5776,6 @@ dependencies = [ "mime", "muda", "objc", - "once_cell", "percent-encoding", "png", "raw-window-handle", @@ -5788,14 +5799,14 @@ dependencies = [ "webkit2gtk", "webview2-com", "window-vibrancy", - "windows 0.51.1", + "windows 0.52.0", ] [[package]] name = "tauri-build" -version = "2.0.0-alpha.12" +version = "2.0.0-alpha.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0997a36aa2a1431500ef6ef92e7076521ae3258a8f73914b49ba876361ba2fe" +checksum = "a7a2582ffb43e5c28932c43ffc40c295a9196a9a33ffb1163269c6baed84834a" dependencies = [ "anyhow", "cargo_toml", @@ -5816,9 +5827,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.0.0-alpha.11" +version = "2.0.0-alpha.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71c36db748f557c1f89f075e37ab22ad77e8798fb9432367cf4013ea364811de" +checksum = "b06976ec7b704d6b842169ffd4ce596e9ce45917a0ab462cb96a119fa2829be9" dependencies = [ "base64 0.21.5", "brotli", @@ -5842,9 +5853,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.0-alpha.11" +version = "2.0.0-alpha.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c895e684477cfb07aeeb0fdb11076bee98219806b68d1f3ddf99d893038a93" +checksum = "ff509be5a5ac34ec2e60d9029af1032c0a33e421f3e823bc92695192e2871c17" dependencies = [ "heck", "proc-macro2", @@ -6265,9 +6276,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "1.0.0-alpha.5" +version = "1.0.0-alpha.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16cc441e5bcb3332a0af069b7580083104aacf09b66e27938b47517790d7b384" +checksum = "64a989e58af6e554dbac798a0a8d112faafc1509bcfab626466181e0724f09c5" dependencies = [ "gtk", "http", @@ -6278,34 +6289,35 @@ dependencies = [ "tauri-utils", "thiserror", "url", - "windows 0.51.1", + "windows 0.52.0", ] [[package]] name = "tauri-runtime-wry" -version = "1.0.0-alpha.6" +version = "1.0.0-alpha.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c9229a7caf9c63eeaf4389789e1c983757135f4ece3355d0ae647c492682f61" +checksum = "5a9f181a6f5f982204ae293c19f37ba90116b8ec0bfd0a08c7a7ba67200cd9e3" dependencies = [ - "cocoa 0.24.1", + "cocoa 0.25.0", "gtk", "http", "jni", "percent-encoding", "raw-window-handle", + "tao", "tauri-runtime", "tauri-utils", "webkit2gtk", "webview2-com", - "windows 0.51.1", + "windows 0.52.0", "wry", ] [[package]] name = "tauri-utils" -version = "2.0.0-alpha.11" +version = "2.0.0-alpha.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce0dbf67341adad8d48255d605b45b25bf1c7445116355e61ed6219d204e94e0" +checksum = "f4858f99fc9f28b72008ef51d04d18b7e3646845c2bc18ee340045fed6ed5095" dependencies = [ "aes-gcm 0.10.3", "brotli", @@ -6331,7 +6343,6 @@ dependencies = [ "thiserror", "url", "walkdir", - "windows-version", ] [[package]] @@ -7238,14 +7249,14 @@ dependencies = [ [[package]] name = "webview2-com" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd15556ff1d1d6bc850dbb362762bae86069773dd30177c90d3bfa917080dc73" +checksum = "e0ae9c7e420783826cf769d2c06ac9ba462f450eca5893bb8c6c6529a4e5dd33" dependencies = [ "webview2-com-macros", "webview2-com-sys", - "windows 0.51.1", - "windows-core", + "windows 0.52.0", + "windows-core 0.52.0", "windows-implement", "windows-interface", ] @@ -7263,13 +7274,13 @@ dependencies = [ [[package]] name = "webview2-com-sys" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3775bb005c3170497ec411b36005708b57ad486bfa3d23864c92f5973858ce8d" +checksum = "d6ad85fceee6c42fa3d61239eba5a11401bf38407a849ed5ea1b407df08cca72" dependencies = [ "thiserror", - "windows 0.51.1", - "windows-core", + "windows 0.52.0", + "windows-core 0.52.0", ] [[package]] @@ -7392,10 +7403,20 @@ version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" dependencies = [ - "windows-core", + "windows-core 0.51.1", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core 0.52.0", "windows-implement", "windows-interface", - "windows-targets 0.48.5", + "windows-targets 0.52.0", ] [[package]] @@ -7407,11 +7428,20 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", +] + [[package]] name = "windows-implement" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb2b158efec5af20d8846836622f50a87e6556b9153a42772fa047f773c0e555" +checksum = "12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946" dependencies = [ "proc-macro2", "quote", @@ -7420,9 +7450,9 @@ dependencies = [ [[package]] name = "windows-interface" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0546e63e1ce64c04403d2311fa0e3ab5ae3a367bd524b4a38d8d8d18c70cfa76" +checksum = "9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1" dependencies = [ "proc-macro2", "quote", @@ -7719,38 +7749,47 @@ dependencies = [ [[package]] name = "wry" -version = "0.34.2" +version = "0.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f1e29660f22d8eec141f41f59b7fef231e4113c370c89b90ae3a0db8dec1927" +checksum = "a2ad1bc1d6925e0cde1bd01830b0073cd0448e21357e843b9ede33b6d81c7423" dependencies = [ "base64 0.21.5", "block", + "cfg_aliases", "cocoa 0.25.0", "core-graphics 0.23.1", "crossbeam-channel", "dunce", + "gdkx11", "gtk", "html5ever", "http", "javascriptcore-rs", + "jni", "kuchikiki", "libc", "log", + "ndk", + "ndk-context", + "ndk-sys", "objc", "objc_id", "once_cell", + "raw-window-handle", "serde", "serde_json", "sha2 0.10.8", "soup3", - "tao", + "tao-macros", "thiserror", "url", "webkit2gtk", "webkit2gtk-sys", "webview2-com", - "windows 0.51.1", + "windows 0.52.0", "windows-implement", + "windows-version", + "x11-dl", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 70671f01..f63e4890 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,8 +5,8 @@ resolver = "2" [workspace.dependencies] serde = { version = "1", features = ["derive"] } log = "0.4" -tauri = "2.0.0-alpha.18" -tauri-build = "2.0.0-alpha.12" +tauri = "2.0.0-alpha.20" +tauri-build = "2.0.0-alpha.13" serde_json = "1" thiserror = "1" diff --git a/examples/api/package.json b/examples/api/package.json index a968360f..e976eb6c 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-alpha.12", + "@tauri-apps/api": "2.0.0-alpha.13", "@tauri-apps/plugin-barcode-scanner": "2.0.0-alpha.3", "@tauri-apps/plugin-biometric": "1.0.0", "@tauri-apps/plugin-cli": "2.0.0-alpha.4", @@ -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-alpha.18", + "@tauri-apps/cli": "2.0.0-alpha.20", "@unocss/extractor-svelte": "^0.58.0", "internal-ip": "^8.0.0", "svelte": "^4.2.8", diff --git a/examples/api/src/views/Communication.svelte b/examples/api/src/views/Communication.svelte index d795a114..a9f4826f 100644 --- a/examples/api/src/views/Communication.svelte +++ b/examples/api/src/views/Communication.svelte @@ -1,6 +1,6 @@