diff --git a/.changes/gtk018.md b/.changes/gtk018.md new file mode 100644 index 000000000000..90ac1404c81b --- /dev/null +++ b/.changes/gtk018.md @@ -0,0 +1,7 @@ +--- +"tauri-runtime": 'minor:deps' +"tauri-runtime-wry": 'minor:deps' +"tauri": 'minor:deps' +--- + +Upgrade `gtk` to 0.18. diff --git a/.changes/wry-0.34.md b/.changes/wry-0.34.md new file mode 100644 index 000000000000..49bc4b68653a --- /dev/null +++ b/.changes/wry-0.34.md @@ -0,0 +1,6 @@ +--- +"tauri": patch:deps +"tauri-runtime-wry": patch:deps +--- + +Updated to wry@0.34, removing the `dox` feature flag. diff --git a/.github/workflows/lint-core.yml b/.github/workflows/lint-core.yml index 97f8f1397966..bb3bde3d6091 100644 --- a/.github/workflows/lint-core.yml +++ b/.github/workflows/lint-core.yml @@ -49,10 +49,7 @@ jobs: matrix: clippy: - { args: '', key: 'empty' } - - { - args: '--features compression,wry,linux-ipc-protocol,isolation,custom-protocol,tray-icon,test', - key: 'all' - } + - { args: '--all-features', key: 'all' } - { args: '--features custom-protocol', key: 'custom-protocol' } steps: diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml index c1ef4816d6b7..e199af69c3fe 100644 --- a/.github/workflows/test-core.yml +++ b/.github/workflows/test-core.yml @@ -67,14 +67,8 @@ jobs: command: 'build' } features: - - { - args: --no-default-features, - key: no-default - } - - { - args: --features compression,wry,linux-ipc-protocol,isolation,custom-protocol,tray-icon,test, - key: all - } + - { args: --no-default-features, key: no-default } + - { args: --all-features, key: all } steps: - uses: actions/checkout@v4 @@ -91,7 +85,7 @@ jobs: if: contains(matrix.platform.target, 'unknown-linux') run: | sudo apt-get update - sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev + sudo apt-get install -y webkit2gtk-4.1 libxdo-dev libayatana-appindicator3-dev - uses: Swatinem/rust-cache@v2 with: diff --git a/core/tauri-runtime-wry/Cargo.toml b/core/tauri-runtime-wry/Cargo.toml index 78a77ba4d48a..c8afa4c4a882 100644 --- a/core/tauri-runtime-wry/Cargo.toml +++ b/core/tauri-runtime-wry/Cargo.toml @@ -12,11 +12,8 @@ license = { workspace = true } edition = { workspace = true } rust-version = { workspace = true } -[package.metadata.docs.rs] -features = [ "dox" ] - [dependencies] -wry = { version = "0.33", default-features = false, features = [ "tao", "file-drop", "protocol" ] } +wry = { version = "0.34.1", default-features = false, features = [ "tao", "file-drop", "protocol" ] } tauri-runtime = { version = "1.0.0-alpha.3", path = "../tauri-runtime" } tauri-utils = { version = "2.0.0-alpha.9", path = "../tauri-utils" } raw-window-handle = "0.5" @@ -30,8 +27,8 @@ webview2-com = "0.25" features = [ "Win32_Foundation" ] [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies] -gtk = { version = "0.16", features = [ "v3_24" ] } -webkit2gtk = { version = "1.1", features = [ "v2_38" ] } +gtk = { version = "0.18", features = [ "v3_24" ] } +webkit2gtk = { version = "=2.0", features = [ "v2_38" ] } percent-encoding = "2.1" [target."cfg(any(target_os = \"ios\", target_os = \"macos\"))".dependencies] @@ -41,7 +38,6 @@ cocoa = "0.24" jni = "0.21" [features] -dox = [ "wry/dox" ] devtools = [ "wry/devtools", "tauri-runtime/devtools" ] macos-private-api = [ "wry/fullscreen", diff --git a/core/tauri-runtime/Cargo.toml b/core/tauri-runtime/Cargo.toml index e9aac20ea36f..aa8f0c430e89 100644 --- a/core/tauri-runtime/Cargo.toml +++ b/core/tauri-runtime/Cargo.toml @@ -38,7 +38,7 @@ version = "0.48" features = [ "Win32_Foundation" ] [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies] -gtk = { version = "0.16", features = [ "v3_24" ] } +gtk = { version = "0.18", features = [ "v3_24" ] } [target."cfg(target_os = \"android\")".dependencies] jni = "0.21" diff --git a/core/tauri/Cargo.toml b/core/tauri/Cargo.toml index 6bee84a33fe6..f726e8172756 100644 --- a/core/tauri/Cargo.toml +++ b/core/tauri/Cargo.toml @@ -23,7 +23,6 @@ features = [ "icon-png", "protocol-asset", "test", - "dox" ] rustdoc-args = [ "--cfg", "doc_cfg" ] default-target = "x86_64-unknown-linux-gnu" @@ -73,13 +72,12 @@ ico = { version = "0.3.0", optional = true } http-range = { version = "0.1.4", optional = true } [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\", target_os = \"windows\", target_os = \"macos\"))".dependencies] -muda = { version = "0.8", default-features = false } -tray-icon = { version = "0.8", default-features = false, optional = true } +muda = { version = "0.10", default-features = false } +tray-icon = { version = "0.10", default-features = false, optional = true } [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies] -gtk = { version = "0.16", features = [ "v3_24" ] } -glib = "0.16" -webkit2gtk = { version = "1.1", features = [ "v2_38" ] } +gtk = { version = "0.18", features = [ "v3_24" ] } +webkit2gtk = { version = "=2.0", features = [ "v2_38" ] } [target."cfg(target_os = \"macos\")".dependencies] embed_plist = "1.2" @@ -145,7 +143,6 @@ native-tls = [ "reqwest/native-tls" ] native-tls-vendored = [ "reqwest/native-tls-vendored" ] rustls-tls = [ "reqwest/rustls-tls" ] devtools = [ "tauri-runtime/devtools", "tauri-runtime-wry/devtools" ] -dox = [ "tauri-runtime-wry/dox" ] process-relaunch-dangerous-allow-symlink-macos = [ "tauri-utils/process-relaunch-dangerous-allow-symlink-macos" ] macos-private-api = [ "tauri-runtime/macos-private-api", diff --git a/core/tauri/src/lib.rs b/core/tauri/src/lib.rs index fb56aa01e0ea..a3838444a18d 100644 --- a/core/tauri/src/lib.rs +++ b/core/tauri/src/lib.rs @@ -14,7 +14,6 @@ //! //! - **wry** *(enabled by default)*: Enables the [wry](https://github.com/tauri-apps/wry) runtime. Only disable it if you want a custom runtime. //! - **test**: Enables the [`test`] module exposing unit test helpers. -//! - **dox**: Internal feature to generate Rust documentation without linking on Linux. //! - **objc-exception**: Wrap each msg_send! in a @try/@catch and panics if an exception is caught, preventing Objective-C from unwinding into Rust. //! - **linux-ipc-protocol**: Use custom protocol for faster IPC on Linux. Requires webkit2gtk v2.40 or above. //! - **linux-libxdo**: Enables linking to libxdo which enables Cut, Copy, Paste and SelectAll menu items to work on Linux. diff --git a/core/tauri/src/test/mod.rs b/core/tauri/src/test/mod.rs index ff163eb2a3fc..62c1c5281106 100644 --- a/core/tauri/src/test/mod.rs +++ b/core/tauri/src/test/mod.rs @@ -27,7 +27,7 @@ //! } //! //! fn main() { -//! let app = create_app(tauri::Builder::default()); +//! // let app = create_app(tauri::Builder::default()); //! // app.run(|_handle, _event| {}); //! } //! @@ -190,7 +190,7 @@ pub fn mock_app() -> App { /// } /// /// fn main() { -/// let app = create_app(tauri::Builder::default()); +/// // let app = create_app(tauri::Builder::default()); /// // app.run(|_handle, _event| {});} /// } /// diff --git a/core/tauri/src/window/mod.rs b/core/tauri/src/window/mod.rs index 52802f797582..aa3122338265 100644 --- a/core/tauri/src/window/mod.rs +++ b/core/tauri/src/window/mod.rs @@ -1160,9 +1160,9 @@ impl Window { /// main_window.with_webview(|webview| { /// #[cfg(target_os = "linux")] /// { - /// // see https://docs.rs/webkit2gtk/0.18.2/webkit2gtk/struct.WebView.html - /// // and https://docs.rs/webkit2gtk/0.18.2/webkit2gtk/trait.WebViewExt.html - /// use webkit2gtk::traits::WebViewExt; + /// // see https://docs.rs/webkit2gtk/2.0.0/webkit2gtk/struct.WebView.html + /// // and https://docs.rs/webkit2gtk/2.0.0/webkit2gtk/trait.WebViewExt.html + /// use webkit2gtk::WebViewExt; /// webview.inner().set_zoom_level(4.); /// } /// diff --git a/examples/api/src-tauri/Cargo.lock b/examples/api/src-tauri/Cargo.lock index 37336a610d2b..5f37c4b02315 100644 --- a/examples/api/src-tauri/Cargo.lock +++ b/examples/api/src-tauri/Cargo.lock @@ -307,21 +307,20 @@ dependencies = [ [[package]] name = "atk" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39991bc421ddf72f70159011b323ff49b0f783cc676a7287c59453da2e2531cf" +checksum = "b4af014b17dd80e8af9fa689b2d4a211ddba6eb583c1622f35d0cb543f6b17e4" dependencies = [ "atk-sys", - "bitflags 1.3.2", "glib", "libc", ] [[package]] name = "atk-sys" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11ad703eb64dc058024f0e57ccfa069e15a413b98dbd50a1a950e743b7f11148" +checksum = "251e0b7d90e33e0ba930891a505a9a35ece37b2dd37a14f3ffc306c13b980009" dependencies = [ "glib-sys", "gobject-sys", @@ -373,6 +372,9 @@ name = "bitflags" version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +dependencies = [ + "serde", +] [[package]] name = "block" @@ -455,11 +457,11 @@ dependencies = [ [[package]] name = "cairo-rs" -version = "0.16.7" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3125b15ec28b84c238f6f476c6034016a5f6cc0221cb514ca46c532139fc97d" +checksum = "1c0466dfa8c0ee78deef390c274ad756801e0a6dbb86c5ef0924a298c5761c4d" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "cairo-sys-rs", "glib", "libc", @@ -469,9 +471,9 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.16.3" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48f4af05fabdcfa9658178e1326efa061853f040ce7d72e33af6885196f421" +checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" dependencies = [ "glib-sys", "libc", @@ -1234,11 +1236,10 @@ dependencies = [ [[package]] name = "gdk" -version = "0.16.2" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9cb33da481c6c040404a11f8212d193889e9b435db2c14fd86987f630d3ce1" +checksum = "f5ba081bdef3b75ebcdbfc953699ed2d7417d6bd853347a42a37d76406a33646" dependencies = [ - "bitflags 1.3.2", "cairo-rs", "gdk-pixbuf", "gdk-sys", @@ -1250,22 +1251,22 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.16.7" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3578c60dee9d029ad86593ed88cb40f35c1b83360e12498d055022385dd9a05" +checksum = "bbc9c2ed73a81d556b65d08879ba4ee58808a6b1927ce915262185d6d547c6f3" dependencies = [ - "bitflags 1.3.2", "gdk-pixbuf-sys", "gio", "glib", "libc", + "once_cell", ] [[package]] name = "gdk-pixbuf-sys" -version = "0.16.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3092cf797a5f1210479ea38070d9ae8a5b8e9f8f1be9f32f4643c529c7d70016" +checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" dependencies = [ "gio-sys", "glib-sys", @@ -1276,9 +1277,9 @@ dependencies = [ [[package]] name = "gdk-sys" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76354f97a913e55b984759a997b693aa7dc71068c9e98bcce51aa167a0a5c5a" +checksum = "31ff856cb3386dae1703a920f803abafcc580e9b5f711ca62ed1620c25b51ff2" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1293,9 +1294,9 @@ dependencies = [ [[package]] name = "gdkwayland-sys" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4511710212ed3020b61a8622a37aa6f0dd2a84516575da92e9b96928dcbe83ba" +checksum = "a90fbf5c033c65d93792192a49a8efb5bb1e640c419682a58bb96f5ae77f3d4a" dependencies = [ "gdk-sys", "glib-sys", @@ -1307,9 +1308,9 @@ dependencies = [ [[package]] name = "gdkx11-sys" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa2bf8b5b8c414bc5d05e48b271896d0fd3ddb57464a3108438082da61de6af" +checksum = "fee8f00f4ee46cad2939b8990f5c70c94ff882c3028f3cc5abf950fa4ab53043" dependencies = [ "gdk-sys", "glib-sys", @@ -1381,11 +1382,10 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "gio" -version = "0.16.7" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a1c84b4534a290a29160ef5c6eff2a9c95833111472e824fc5cb78b513dd092" +checksum = "57052f84e8e5999b258e8adf8f5f2af0ac69033864936b8b6838321db2f759b1" dependencies = [ - "bitflags 1.3.2", "futures-channel", "futures-core", "futures-io", @@ -1401,9 +1401,9 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.16.3" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9b693b8e39d042a95547fc258a7b07349b1f0b48f4b2fa3108ba3c51c0b5229" +checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" dependencies = [ "glib-sys", "gobject-sys", @@ -1414,11 +1414,11 @@ dependencies = [ [[package]] name = "glib" -version = "0.16.9" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16aa2475c9debed5a32832cb5ff2af5a3f9e1ab9e69df58eaadc1ab2004d6eba" +checksum = "1c316afb01ce8067c5eaab1fc4f2cd47dc21ce7b6296358605e2ffab23ccbd19" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "futures-channel", "futures-core", "futures-executor", @@ -1429,6 +1429,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", + "memchr", "once_cell", "smallvec", "thiserror", @@ -1436,24 +1437,23 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.16.8" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1a9325847aa46f1e96ffea37611b9d51fc4827e67f79e7de502a297560a67b" +checksum = "f8da903822b136d42360518653fcf154455defc437d3e7a81475bf9a95ff1e47" dependencies = [ - "anyhow", "heck", "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "glib-sys" -version = "0.16.3" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61a4f46316d06bfa33a7ac22df6f0524c8be58e3db2d9ca99ccb1f357b62a65" +checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" dependencies = [ "libc", "system-deps", @@ -1467,9 +1467,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gobject-sys" -version = "0.16.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3520bb9c07ae2a12c7f2fbb24d4efc11231c8146a86956413fb1a79bb760a0f1" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" dependencies = [ "glib-sys", "libc", @@ -1478,12 +1478,11 @@ dependencies = [ [[package]] name = "gtk" -version = "0.16.2" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4d3507d43908c866c805f74c9dd593c0ce7ba5c38e576e41846639cdcd4bee6" +checksum = "93c4f5e0e20b60e10631a5f06da7fe3dda744b05ad0ea71fee2f47adf865890c" dependencies = [ "atk", - "bitflags 1.3.2", "cairo-rs", "field-offset", "futures-channel", @@ -1494,16 +1493,15 @@ dependencies = [ "gtk-sys", "gtk3-macros", "libc", - "once_cell", "pango", "pkg-config", ] [[package]] name = "gtk-sys" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b5f8946685d5fe44497007786600c2f368ff6b1e61a16251c89f72a97520a3" +checksum = "771437bf1de2c1c0b496c11505bdf748e26066bbe942dfc8f614c9460f6d7722" dependencies = [ "atk-sys", "cairo-sys-rs", @@ -1519,16 +1517,15 @@ dependencies = [ [[package]] name = "gtk3-macros" -version = "0.16.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "096eb63c6fedf03bafe65e5924595785eaf1bcb7200dac0f2cbe9c9738f05ad8" +checksum = "c6063efb63db582968fb7df72e1ae68aa6360dcfb0a75143f34fc7d616bad75e" dependencies = [ - "anyhow", "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] @@ -1800,9 +1797,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "javascriptcore-rs" -version = "1.0.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cfcc681b896b083864a4a3c3b3ea196f14ff66b8641a68fde209c6d84434056" +checksum = "c3e411dbc2288d2e66373abb4ebe35e198af770c1c61f795b8fa25a398c24006" dependencies = [ "bitflags 1.3.2", "glib", @@ -1811,9 +1808,9 @@ dependencies = [ [[package]] name = "javascriptcore-rs-sys" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0983ba5b3ab9a0c0918de02c42dc71f795d6de08092f88a98ce9fdfdee4ba91" +checksum = "f3e2b173d4e1f4653dec2ffaf83c7d92842b04573bf04af0e75a086219e45298" dependencies = [ "glib-sys", "gobject-sys", @@ -1866,11 +1863,11 @@ dependencies = [ [[package]] name = "keyboard-types" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7668b7cff6a51fe61cdde64cd27c8a220786f399501b57ebe36f7d8112fd68" +checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "serde", "unicode-segmentation", ] @@ -1896,9 +1893,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libappindicator" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89e1edfdc9b0853358306c6dfb4b77c79c779174256fe93d80c0b5ebca451a2f" +checksum = "03589b9607c868cc7ae54c0b2a22c8dc03dd41692d48f2d7df73615c6a95dc0a" dependencies = [ "glib", "gtk", @@ -1909,9 +1906,9 @@ dependencies = [ [[package]] name = "libappindicator-sys" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08fcb2bea89cee9613982501ec83eaa2d09256b24540ae463c52a28906163918" +checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf" dependencies = [ "gtk-sys", "libloading", @@ -2083,14 +2080,12 @@ dependencies = [ [[package]] name = "muda" -version = "0.8.7" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fe753ec4d3e8137a1d3ecb1aee1192b8f7661fe1247641968f5bf5f2e6ebbe" +checksum = "9767ce3b12d2928f17ff4f91b29e7e872a8594033d82bf00e56017cc23bb8410" dependencies = [ "cocoa 0.25.0", "crossbeam-channel", - "gdk", - "gdk-pixbuf", "gtk", "keyboard-types", "objc", @@ -2291,11 +2286,10 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pango" -version = "0.16.5" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdff66b271861037b89d028656184059e03b0b6ccb36003820be19f7200b1e94" +checksum = "06a9e54b831d033206160096b825f2070cf5fda7e35167b1c01e9e774f9202d1" dependencies = [ - "bitflags 1.3.2", "gio", "glib", "libc", @@ -2305,9 +2299,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.16.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e134909a9a293e04d2cc31928aa95679c5e4df954d0b85483159bd20d8f047f" +checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" dependencies = [ "glib-sys", "gobject-sys", @@ -3179,24 +3173,22 @@ dependencies = [ [[package]] name = "soup3" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82bc46048125fefd69d30b32b9d263d6556c9ffe82a7a7df181a86d912da5616" +checksum = "471f924a40f31251afc77450e781cb26d55c0b650842efafc9c6cbd2f7cc4f9f" dependencies = [ - "bitflags 1.3.2", "futures-channel", "gio", "glib", "libc", - "once_cell", "soup3-sys", ] [[package]] name = "soup3-sys" -version = "0.3.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "014bbeb1c4cdb30739dc181e8d98b7908f124d9555843afa89b5570aaf4ec62b" +checksum = "7ebe8950a680a12f24f15ebe1bf70db7af98ad242d9db43596ad3108aab86c27" dependencies = [ "gio-sys", "glib-sys", @@ -3333,9 +3325,9 @@ dependencies = [ [[package]] name = "tao" -version = "0.22.3" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d30690a6746dfbb26d4f41522757da1ebfd277514b58e27a80b7e55e511e52" +checksum = "f130523fee9820ad78141d443e6cef75043acade79107bc483872bc183928c0f" dependencies = [ "bitflags 1.3.2", "cairo-rs", @@ -3374,8 +3366,8 @@ dependencies = [ "unicode-segmentation", "url", "uuid", - "windows 0.48.0", - "windows-implement 0.48.0", + "windows 0.51.1", + "windows-implement 0.51.1", "x11-dl", "zbus", ] @@ -3408,7 +3400,6 @@ dependencies = [ "embed_plist", "futures-util", "getrandom 0.2.10", - "glib", "glob", "gtk", "heck", @@ -3444,7 +3435,7 @@ dependencies = [ "url", "uuid", "webkit2gtk", - "webview2-com", + "webview2-com 0.25.0", "window-vibrancy", "windows 0.48.0", ] @@ -3559,7 +3550,7 @@ dependencies = [ "tauri-runtime", "tauri-utils", "webkit2gtk", - "webview2-com", + "webview2-com 0.25.0", "windows 0.48.0", "wry", ] @@ -3880,9 +3871,9 @@ dependencies = [ [[package]] name = "tray-icon" -version = "0.8.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b164327e17101c78ba3dfdf879b977027ef1bd7855668ac30063de21fc02447" +checksum = "1a7dce8a4b6d7a566ca78fa43f37efc7a3ec427480828d35fe3474c4f0c75396" dependencies = [ "cocoa 0.25.0", "core-graphics 0.23.1", @@ -4164,9 +4155,9 @@ dependencies = [ [[package]] name = "webkit2gtk" -version = "1.1.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f8db2963d7f1bd4ac2a208ab925881b4779dd20fee853b09a0bbf69289827c2" +checksum = "6acc7a3245bac463799553012b372602aa8ffe9a6a9ce0e71e97a9a47ef8a6b3" dependencies = [ "bitflags 1.3.2", "cairo-rs", @@ -4188,9 +4179,9 @@ dependencies = [ [[package]] name = "webkit2gtk-sys" -version = "1.1.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864ebc9a39649baf49e46c713cd8b741cca14dd59d24cd77bc611ba9419fa18d" +checksum = "cef00972aada3b33d7ca262219a57bf64eac88731e02e3f5380178816e796f2e" dependencies = [ "bitflags 1.3.2", "cairo-sys-rs", @@ -4213,12 +4204,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79e563ffe8e84d42e43ffacbace8780c0244fc8910346f334613559d92e203ad" dependencies = [ "webview2-com-macros", - "webview2-com-sys", + "webview2-com-sys 0.25.0", "windows 0.48.0", "windows-implement 0.48.0", "windows-interface 0.48.0", ] +[[package]] +name = "webview2-com" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd15556ff1d1d6bc850dbb362762bae86069773dd30177c90d3bfa917080dc73" +dependencies = [ + "webview2-com-macros", + "webview2-com-sys 0.27.0", + "windows 0.51.1", + "windows-core", + "windows-implement 0.51.1", + "windows-interface 0.51.1", +] + [[package]] name = "webview2-com-macros" version = "0.7.0" @@ -4245,6 +4250,17 @@ dependencies = [ "windows-metadata", ] +[[package]] +name = "webview2-com-sys" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3775bb005c3170497ec411b36005708b57ad486bfa3d23864c92f5973858ce8d" +dependencies = [ + "thiserror", + "windows 0.51.1", + "windows-core", +] + [[package]] name = "winapi" version = "0.3.9" @@ -4561,19 +4577,16 @@ dependencies = [ [[package]] name = "wry" -version = "0.33.1" +version = "0.34.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb3bc6ed7e3d905a5a963a3e4e9ee5ede76408e50de42d68e523ee75ab1c78a" +checksum = "91ad4935cc1cbd02e7cfcf41baa44e35f134c108389be3949d8b369eb69e741b" dependencies = [ "base64", "block", - "cocoa 0.24.1", - "core-graphics 0.22.3", + "cocoa 0.25.0", + "core-graphics 0.23.1", "crossbeam-channel", "dunce", - "gdk", - "gio", - "glib", "gtk", "html5ever", "http", @@ -4593,9 +4606,9 @@ dependencies = [ "url", "webkit2gtk", "webkit2gtk-sys", - "webview2-com", - "windows 0.48.0", - "windows-implement 0.48.0", + "webview2-com 0.27.0", + "windows 0.51.1", + "windows-implement 0.51.1", ] [[package]]