From b0ddee8992ac3c7d47e2cfc9714f5725fadca7cf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 2 Jan 2025 01:01:31 +0100 Subject: [PATCH] chore(deps): update rust crate wry to 0.48 (dev) (#12101) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: FabianLars --- .changes/webview2-com-034.md | 5 + Cargo.lock | 276 +++++++----------- bench/Cargo.toml | 8 +- .../tests/cpu_intensive/src-tauri/Cargo.toml | 4 +- .../tests/files_transfer/src-tauri/Cargo.toml | 4 +- bench/tests/helloworld/src-tauri/Cargo.toml | 4 +- crates/tauri-build/Cargo.toml | 3 +- crates/tauri-bundler/Cargo.toml | 28 +- crates/tauri-cli/Cargo.toml | 46 +-- crates/tauri-codegen/Cargo.toml | 2 +- crates/tauri-macos-sign/Cargo.toml | 2 +- crates/tauri-plugin/Cargo.toml | 1 + crates/tauri-runtime-wry/Cargo.toml | 16 +- crates/tauri-runtime-wry/src/lib.rs | 2 +- crates/tauri-runtime/Cargo.toml | 6 +- crates/tauri-schema-generator/Cargo.toml | 8 +- crates/tauri-schema-worker/Cargo.toml | 6 +- crates/tauri-utils/Cargo.toml | 7 +- crates/tauri/Cargo.toml | 32 +- crates/tauri/src/webview/mod.rs | 3 + crates/tauri/src/webview/webview_window.rs | 3 + examples/api/src-tauri/Cargo.toml | 8 +- .../file-associations/src-tauri/Cargo.toml | 4 +- examples/resources/src-tauri/Cargo.toml | 4 +- 24 files changed, 212 insertions(+), 270 deletions(-) create mode 100644 .changes/webview2-com-034.md diff --git a/.changes/webview2-com-034.md b/.changes/webview2-com-034.md new file mode 100644 index 000000000..9eadea3f6 --- /dev/null +++ b/.changes/webview2-com-034.md @@ -0,0 +1,5 @@ +--- +"tauri": "minor:enhance" +--- + +**Breaking change:** Updated `webview2-com` to `0.34`. This may be a breaking change if you use the `with_webview` method. diff --git a/Cargo.lock b/Cargo.lock index b0794ec58..a44e72ae3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1126,7 +1126,16 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" dependencies = [ - "bit-vec", + "bit-vec 0.6.3", +] + +[[package]] +name = "bit-set" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" +dependencies = [ + "bit-vec 0.8.0", ] [[package]] @@ -1135,6 +1144,12 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +[[package]] +name = "bit-vec" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" + [[package]] name = "bit_field" version = "0.10.2" @@ -1726,22 +1741,6 @@ dependencies = [ "digest", ] -[[package]] -name = "cocoa" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation 0.1.2", - "core-foundation 0.9.4", - "core-graphics 0.23.2", - "foreign-types 0.5.0", - "libc", - "objc", -] - [[package]] name = "cocoa" version = "0.26.0" @@ -1750,28 +1749,14 @@ checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2" dependencies = [ "bitflags 2.6.0", "block", - "cocoa-foundation 0.2.0", + "cocoa-foundation", "core-foundation 0.10.0", - "core-graphics 0.24.0", + "core-graphics", "foreign-types 0.5.0", "libc", "objc", ] -[[package]] -name = "cocoa-foundation" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" -dependencies = [ - "bitflags 1.3.2", - "block", - "core-foundation 0.9.4", - "core-graphics-types 0.1.3", - "libc", - "objc", -] - [[package]] name = "cocoa-foundation" version = "0.2.0" @@ -1781,7 +1766,7 @@ dependencies = [ "bitflags 2.6.0", "block", "core-foundation 0.10.0", - "core-graphics-types 0.2.0", + "core-graphics-types", "libc", "objc", ] @@ -1933,19 +1918,6 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" -[[package]] -name = "core-graphics" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.4", - "core-graphics-types 0.1.3", - "foreign-types 0.5.0", - "libc", -] - [[package]] name = "core-graphics" version = "0.24.0" @@ -1954,22 +1926,11 @@ checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" dependencies = [ "bitflags 2.6.0", "core-foundation 0.10.0", - "core-graphics-types 0.2.0", + "core-graphics-types", "foreign-types 0.5.0", "libc", ] -[[package]] -name = "core-graphics-types" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.4", - "libc", -] - [[package]] name = "core-graphics-types" version = "0.2.0" @@ -2888,7 +2849,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2" dependencies = [ - "bit-set", + "bit-set 0.5.3", "regex-automata", "regex-syntax", ] @@ -2910,9 +2871,9 @@ dependencies = [ [[package]] name = "fern" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee" +checksum = "4316185f709b23713e41e3195f90edef7fb00c3ed4adc79769cf09cc762a3b29" dependencies = [ "log", ] @@ -3001,15 +2962,6 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -[[package]] -name = "fluent-uri" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17c704e9dbe1ddd863da1e6ff3567795087b1eb201ce80d8fa81162e1516500d" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "flume" version = "0.11.0" @@ -4519,25 +4471,13 @@ dependencies = [ "thiserror 1.0.68", ] -[[package]] -name = "json-patch" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b1fb8864823fad91877e6caea0baca82e49e8db50f8e5c9f9a453e27d3330fc" -dependencies = [ - "jsonptr 0.4.7", - "serde", - "serde_json", - "thiserror 1.0.68", -] - [[package]] name = "json-patch" version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "863726d7afb6bc2590eeff7135d923545e5e964f004c2ccf8716c25e70a86f08" dependencies = [ - "jsonptr 0.6.3", + "jsonptr", "serde", "serde_json", "thiserror 1.0.68", @@ -4554,17 +4494,6 @@ dependencies = [ "serde", ] -[[package]] -name = "jsonptr" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c6e529149475ca0b2820835d3dce8fcc41c6b943ca608d32f35b449255e4627" -dependencies = [ - "fluent-uri", - "serde", - "serde_json", -] - [[package]] name = "jsonptr" version = "0.6.3" @@ -4905,7 +4834,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -6882,12 +6811,12 @@ dependencies = [ [[package]] name = "proptest" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" +checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50" dependencies = [ - "bit-set", - "bit-vec", + "bit-set 0.8.0", + "bit-vec 0.8.0", "bitflags 2.6.0", "lazy_static", "num-traits", @@ -8242,9 +8171,9 @@ dependencies = [ [[package]] name = "serial_test" -version = "3.1.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b4b487fe2acf240a021cf57c6b2b4903b1e78ca0ecd862a71b71d2a51fed77d" +checksum = "1b258109f244e1d6891bf1053a55d63a5cd4f8f4c30cf9a1280989f80e7a1fa9" dependencies = [ "futures", "log", @@ -8256,9 +8185,9 @@ dependencies = [ [[package]] name = "serial_test_derive" -version = "3.1.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" +checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef" dependencies = [ "proc-macro2", "quote", @@ -8566,7 +8495,7 @@ checksum = "18051cdd562e792cad055119e0cdb2cfc137e44e3987532e0f9659a77931bb08" dependencies = [ "bytemuck", "cfg_aliases", - "core-graphics 0.24.0", + "core-graphics", "foreign-types 0.5.0", "js-sys", "log", @@ -9000,9 +8929,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc6b53216f32e60efc27dfa111268481e4dfba53e553e4cdebcaed9db36c11bb" dependencies = [ "bitflags 2.6.0", - "cocoa 0.26.0", + "cocoa", "core-foundation 0.10.0", - "core-graphics 0.24.0", + "core-graphics", "crossbeam-channel", "dispatch", "dlopen2", @@ -9378,23 +9307,6 @@ dependencies = [ "tauri-utils 2.1.0", ] -[[package]] -name = "tauri-plugin" -version = "2.0.0-rc.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6de7ffe64afa61c4cc13d450d64643b8db6cbb177a802beb88bf595594505ddf" -dependencies = [ - "anyhow", - "glob", - "plist", - "schemars", - "serde", - "serde_json", - "tauri-utils 2.0.0-rc.13", - "toml 0.8.19", - "walkdir", -] - [[package]] name = "tauri-plugin" version = "2.0.3" @@ -9411,14 +9323,31 @@ dependencies = [ ] [[package]] -name = "tauri-plugin-log" -version = "2.0.0-rc.2" +name = "tauri-plugin" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b57e4666c4a5d81f81b7bb8eacf51ae32c4e69c35071aabb480ad20a80836e4e" +checksum = "e753f2a30933a9bbf0a202fa47d7cc4a3401f06e8d6dcc53b79aa62954828c79" +dependencies = [ + "anyhow", + "glob", + "plist", + "schemars", + "serde", + "serde_json", + "tauri-utils 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "toml 0.8.19", + "walkdir", +] + +[[package]] +name = "tauri-plugin-log" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eddd784c138c08a43954bc3e735402e6b2b2ee8d8c254a7391f4e77c01273dd5" dependencies = [ "android_logger", "byte-unit", - "cocoa 0.25.0", + "cocoa", "fern", "log", "objc", @@ -9427,8 +9356,8 @@ dependencies = [ "serde_repr", "swift-rs", "tauri", - "tauri-plugin 2.0.0-rc.13", - "thiserror 1.0.68", + "tauri-plugin 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 2.0.9", "time", ] @@ -9541,40 +9470,6 @@ dependencies = [ "windows-version", ] -[[package]] -name = "tauri-utils" -version = "2.0.0-rc.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a271545e4c25b36b922d98cf7e0c1755f64e92355705f656893e352aef0331e3" -dependencies = [ - "cargo_metadata", - "ctor", - "dunce", - "glob", - "html5ever", - "infer 0.16.0", - "json-patch 2.0.0", - "kuchikiki", - "log", - "memchr", - "phf 0.11.2", - "proc-macro2", - "quote", - "regex", - "schemars", - "semver", - "serde", - "serde-untagged", - "serde_json", - "serde_with", - "swift-rs", - "thiserror 1.0.68", - "toml 0.8.19", - "url", - "urlpattern", - "uuid", -] - [[package]] name = "tauri-utils" version = "2.1.0" @@ -9615,6 +9510,41 @@ dependencies = [ "walkdir", ] +[[package]] +name = "tauri-utils" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9271a88f99b4adea0dc71d0baca4505475a0bbd139fb135f62958721aaa8fe54" +dependencies = [ + "cargo_metadata", + "ctor", + "dunce", + "glob", + "html5ever", + "http 1.1.0", + "infer 0.16.0", + "json-patch 3.0.1", + "kuchikiki", + "log", + "memchr", + "phf 0.11.2", + "proc-macro2", + "quote", + "regex", + "schemars", + "semver", + "serde", + "serde-untagged", + "serde_json", + "serde_with", + "swift-rs", + "thiserror 2.0.9", + "toml 0.8.19", + "url", + "urlpattern", + "uuid", +] + [[package]] name = "tauri-winres" version = "0.1.1" @@ -10095,7 +10025,7 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "533fc2d4105e0e3d96ce1c71f2d308c9fbbe2ef9c587cab63dd627ab5bde218f" dependencies = [ - "core-graphics 0.24.0", + "core-graphics", "crossbeam-channel", "dirs", "libappindicator", @@ -10780,9 +10710,9 @@ dependencies = [ [[package]] name = "webview2-com" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61ff3d9d0ee4efcb461b14eb3acfda2702d10dc329f339303fc3e57215ae2c" +checksum = "823e7ebcfaea51e78f72c87fc3b65a1e602c321f407a0b36dbb327d7bb7cd921" dependencies = [ "webview2-com-macros", "webview2-com-sys", @@ -10805,9 +10735,9 @@ dependencies = [ [[package]] name = "webview2-com-sys" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3a3e2eeb58f82361c93f9777014668eb3d07e7d174ee4c819575a9208011886" +checksum = "7a82bce72db6e5ee83c68b5de1e2cd6ea195b9fbff91cb37df5884cbe3222df4" dependencies = [ "thiserror 1.0.68", "windows", @@ -10872,7 +10802,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -11355,9 +11285,9 @@ checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" [[package]] name = "wry" -version = "0.47.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "553ca1ce149982123962fac2506aa75b8b76288779a77e72b12fa2fc34938647" +checksum = "1e644bf458e27b11b0ecafc9e5633d1304fdae82baca1d42185669752fe6ca4f" dependencies = [ "base64 0.22.1", "block2", @@ -11385,7 +11315,7 @@ dependencies = [ "sha2", "soup3", "tao-macros", - "thiserror 1.0.68", + "thiserror 2.0.9", "tracing", "url", "webkit2gtk", diff --git a/bench/Cargo.toml b/bench/Cargo.toml index 7b9b36e33..2a2b92886 100644 --- a/bench/Cargo.toml +++ b/bench/Cargo.toml @@ -9,11 +9,11 @@ description = "Cross-platform WebView rendering library" repository = "https://github.com/tauri-apps/wry" [dependencies] -anyhow = "1.0.40" +anyhow = "1" time = { version = "0.3", features = ["formatting"] } -tempfile = "3.2.0" -serde_json = "1.0" -serde = { version = "1.0", features = ["derive"] } +tempfile = "3" +serde_json = "1" +serde = { version = "1", features = ["derive"] } [[bin]] name = "run_benchmark" diff --git a/bench/tests/cpu_intensive/src-tauri/Cargo.toml b/bench/tests/cpu_intensive/src-tauri/Cargo.toml index e4471b07a..f88b05619 100644 --- a/bench/tests/cpu_intensive/src-tauri/Cargo.toml +++ b/bench/tests/cpu_intensive/src-tauri/Cargo.toml @@ -11,6 +11,6 @@ tauri-build = { path = "../../../../crates/tauri-build", features = [ ] } [dependencies] -serde_json = "1.0" -serde = { version = "1.0", features = ["derive"] } +serde_json = "1" +serde = { version = "1", features = ["derive"] } tauri = { path = "../../../../crates/tauri", features = [] } diff --git a/bench/tests/files_transfer/src-tauri/Cargo.toml b/bench/tests/files_transfer/src-tauri/Cargo.toml index 247a671e3..39b309e70 100644 --- a/bench/tests/files_transfer/src-tauri/Cargo.toml +++ b/bench/tests/files_transfer/src-tauri/Cargo.toml @@ -11,6 +11,6 @@ tauri-build = { path = "../../../../crates/tauri-build", features = [ ] } [dependencies] -serde_json = "1.0" -serde = { version = "1.0", features = ["derive"] } +serde_json = "1" +serde = { version = "1", features = ["derive"] } tauri = { path = "../../../../crates/tauri", features = [] } diff --git a/bench/tests/helloworld/src-tauri/Cargo.toml b/bench/tests/helloworld/src-tauri/Cargo.toml index e8d1ad8d9..825b0c2d7 100644 --- a/bench/tests/helloworld/src-tauri/Cargo.toml +++ b/bench/tests/helloworld/src-tauri/Cargo.toml @@ -11,6 +11,6 @@ tauri-build = { path = "../../../../crates/tauri-build", features = [ ] } [dependencies] -serde_json = "1.0" -serde = { version = "1.0", features = ["derive"] } +serde_json = "1" +serde = { version = "1", features = ["derive"] } tauri = { path = "../../../../crates/tauri", features = [] } diff --git a/crates/tauri-build/Cargo.toml b/crates/tauri-build/Cargo.toml index 858e500f1..e95397d7f 100644 --- a/crates/tauri-build/Cargo.toml +++ b/crates/tauri-build/Cargo.toml @@ -37,13 +37,14 @@ cargo_toml = "0.17" serde = "1" serde_json = "1" heck = "0.5" -json-patch = "3.0" +json-patch = "3" walkdir = "2" tauri-winres = "0.1" semver = "1" dirs = "5" glob = "0.3" toml = "0.8" +# Our code requires at least 0.8.18 so don't simplify this to 0.8 schemars = { version = "0.8.18", features = ["preserve_order"] } [features] diff --git a/crates/tauri-bundler/Cargo.toml b/crates/tauri-bundler/Cargo.toml index 006023ec1..cad586ede 100644 --- a/crates/tauri-bundler/Cargo.toml +++ b/crates/tauri-bundler/Cargo.toml @@ -19,28 +19,26 @@ tauri-utils = { version = "2.1.0", path = "../tauri-utils", features = [ "resources", ] } image = "0.25.0" -flate2 = "1.0" -anyhow = "1.0" +flate2 = "1" +anyhow = "1" thiserror = "2" -serde_json = "1.0" -serde = { version = "1.0", features = ["derive"] } -strsim = "0.11.0" -tar = "0.4.40" +serde_json = "1" +serde = { version = "1", features = ["derive"] } +strsim = "0.11" +tar = "0.4" walkdir = "2" handlebars = "6" -tempfile = "3.10.1" +tempfile = "3" log = { version = "0.4.21", features = ["kv"] } dirs = "5" os_pipe = "1" -ureq = { version = "2.9.6", default-features = false, features = [ - "socks-proxy", -] } +ureq = { version = "2", default-features = false, features = ["socks-proxy"] } native-tls = { version = "0.2", optional = true } hex = "0.4" semver = "1" sha1 = "0.10" sha2 = "0.10" -zip = { version = "2.0", default-features = false, features = ["deflate"] } +zip = { version = "2", default-features = false, features = ["deflate"] } dunce = "1" url = "2" uuid = { version = "1", features = ["v4", "v5"] } @@ -48,7 +46,7 @@ regex = "1" [target."cfg(target_os = \"windows\")".dependencies] bitness = "0.4" -windows-registry = "0.3.0" +windows-registry = "0.3" glob = "0.3" [target."cfg(target_os = \"windows\")".dependencies.windows-sys] @@ -63,9 +61,9 @@ tauri-macos-sign = { version = "2.0.1", path = "../tauri-macos-sign" } [target."cfg(target_os = \"linux\")".dependencies] heck = "0.5" -ar = "0.9.0" -md5 = "0.7.0" -rpm = { version = "0.16.0", features = ["bzip2-compression"] } +ar = "0.9" +md5 = "0.7" +rpm = { version = "0.16", features = ["bzip2-compression"] } [lib] name = "tauri_bundler" diff --git a/crates/tauri-cli/Cargo.toml b/crates/tauri-cli/Cargo.toml index e0756d299..34c49a287 100644 --- a/crates/tauri-cli/Cargo.toml +++ b/crates/tauri-cli/Cargo.toml @@ -36,27 +36,27 @@ name = "cargo-tauri" path = "src/main.rs" [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] -cargo-mobile2 = { version = "0.17.3", default-features = false } +cargo-mobile2 = { version = "0.17", default-features = false } [dependencies] -jsonrpsee = { version = "0.24.5", features = ["server"] } -jsonrpsee-core = "0.24.5" -jsonrpsee-client-transport = { version = "0.24.5", features = ["ws"] } -jsonrpsee-ws-client = { version = "0.24.5", default-features = false } +jsonrpsee = { version = "0.24", features = ["server"] } +jsonrpsee-core = "0.24" +jsonrpsee-client-transport = { version = "0.24", features = ["ws"] } +jsonrpsee-ws-client = { version = "0.24", default-features = false } sublime_fuzzy = "0.7" clap_complete = "4" -clap = { version = "4.5", features = ["derive", "env"] } -anyhow = "1.0" +clap = { version = "4", features = ["derive", "env"] } +anyhow = "1" tauri-bundler = { version = "2.1.0", default-features = false, path = "../tauri-bundler" } -colored = "2.1" -serde = { version = "1.0", features = ["derive"] } -serde_json = { version = "1.0", features = ["preserve_order"] } -notify = "6.1" +colored = "2" +serde = { version = "1", features = ["derive"] } +serde_json = { version = "1", features = ["preserve_order"] } +notify = "6" notify-debouncer-mini = "0.4" -shared_child = "1.0" +shared_child = "1" duct = "0.13" toml_edit = { version = "0.22", features = ["serde"] } -json-patch = "3.0" +json-patch = "3" tauri-utils = { version = "2.1.0", path = "../tauri-utils", features = [ "isolation", "schema", @@ -71,30 +71,30 @@ tauri-utils-v1 = { version = "1", package = "tauri-utils", features = [ ] } toml = "0.8" jsonschema = "0.18" -handlebars = "6.0" +handlebars = "6" include_dir = "0.7" minisign = "=0.7.3" -base64 = "0.22.0" -ureq = { version = "2.9.6", default-features = false, features = ["gzip"] } +base64 = "0.22" +ureq = { version = "2", default-features = false, features = ["gzip"] } os_info = "3" -semver = "1.0" -regex = "1.10.3" +semver = "1" +regex = "1" heck = "0.5" dialoguer = "0.11" -url = { version = "2.5", features = ["serde"] } +url = { version = "2", features = ["serde"] } os_pipe = "1" ignore = "0.4" -ctrlc = "3.4" +ctrlc = "3" log = { version = "0.4.21", features = ["kv", "kv_std"] } -env_logger = "0.11.5" +env_logger = "0.11" icns = { package = "tauri-icns", version = "0.1" } image = { version = "0.25", default-features = false, features = ["ico"] } -axum = { version = "0.7.4", features = ["ws"] } +axum = { version = "0.7", features = ["ws"] } html5ever = "0.26" kuchiki = { package = "kuchikiki", version = "0.8" } tokio = { version = "1", features = ["macros", "sync"] } common-path = "1" -serde-value = "0.7.0" +serde-value = "0.7" itertools = "0.13" local-ip-address = "0.6" css-color = "0.2" diff --git a/crates/tauri-codegen/Cargo.toml b/crates/tauri-codegen/Cargo.toml index 90f0df627..f85403d7c 100644 --- a/crates/tauri-codegen/Cargo.toml +++ b/crates/tauri-codegen/Cargo.toml @@ -33,7 +33,7 @@ uuid = { version = "1", features = ["v4"] } semver = "1" ico = "0.3" png = "0.17" -json-patch = "3.0" +json-patch = "3" url = "2" [target."cfg(target_os = \"macos\")".dependencies] diff --git a/crates/tauri-macos-sign/Cargo.toml b/crates/tauri-macos-sign/Cargo.toml index 8fd331728..fb824c681 100644 --- a/crates/tauri-macos-sign/Cargo.toml +++ b/crates/tauri-macos-sign/Cargo.toml @@ -22,5 +22,5 @@ rand = "0.8" dirs-next = "2" log = { version = "0.4.21", features = ["kv"] } apple-codesign = "0.27" -chrono = "0.4.38" +chrono = "0.4" p12 = "0.6" diff --git a/crates/tauri-plugin/Cargo.toml b/crates/tauri-plugin/Cargo.toml index b572e55ff..fde4e9f14 100644 --- a/crates/tauri-plugin/Cargo.toml +++ b/crates/tauri-plugin/Cargo.toml @@ -36,6 +36,7 @@ tauri-utils = { version = "2.1.0", default-features = false, features = [ serde_json = { version = "1", optional = true } glob = { version = "0.3", optional = true } toml = { version = "0.8", optional = true } +# Our code requires at least 0.8.18 so don't simplify this to 0.8 schemars = { version = "0.8.18", features = ["preserve_order"] } walkdir = { version = "2", optional = true } diff --git a/crates/tauri-runtime-wry/Cargo.toml b/crates/tauri-runtime-wry/Cargo.toml index 2ac2bf60c..6e504817b 100644 --- a/crates/tauri-runtime-wry/Cargo.toml +++ b/crates/tauri-runtime-wry/Cargo.toml @@ -17,7 +17,7 @@ rustc-args = ["--cfg", "docsrs"] rustdoc-args = ["--cfg", "docsrs"] [dependencies] -wry = { version = "0.47", default-features = false, features = [ +wry = { version = "0.48", default-features = false, features = [ "drag-drop", "protocol", "os-webview", @@ -27,13 +27,13 @@ tao = { version = "0.31.0", default-features = false, features = ["rwh_06"] } tauri-runtime = { version = "2.2.0", path = "../tauri-runtime" } tauri-utils = { version = "2.1.0", path = "../tauri-utils" } raw-window-handle = "0.6" -http = "1.1" +http = "1" url = "2" tracing = { version = "0.1", optional = true } -log = "0.4" +log = "0.4.21" [target."cfg(windows)".dependencies] -webview2-com = "0.33" +webview2-com = "0.34" softbuffer = { version = "0.4", default-features = false } [target."cfg(windows)".dependencies.windows] @@ -43,14 +43,14 @@ features = ["Win32_Foundation", "Win32_Graphics_Dwm"] [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies] gtk = { version = "0.18", features = ["v3_24"] } webkit2gtk = { version = "=2.0", features = ["v2_40"] } -percent-encoding = "2.1" +percent-encoding = "2" [target.'cfg(target_vendor = "apple")'.dependencies] -objc2 = "0.5.2" +objc2 = "0.5" [target.'cfg(target_os = "macos")'.dependencies] -objc2-foundation = { version = "0.2.2", features = [] } -objc2-app-kit = { version = "0.2.2", features = [ +objc2-foundation = { version = "0.2", features = [] } +objc2-app-kit = { version = "0.2", features = [ "block2", "NSApplication", "NSResponder", diff --git a/crates/tauri-runtime-wry/src/lib.rs b/crates/tauri-runtime-wry/src/lib.rs index 82a93edf3..82d636dd2 100644 --- a/crates/tauri-runtime-wry/src/lib.rs +++ b/crates/tauri-runtime-wry/src/lib.rs @@ -4349,7 +4349,7 @@ fn create_webview( ))] { if let Some(path) = &webview_attributes.extensions_path { - webview_builder = webview_builder.with_extension_path(path); + webview_builder = webview_builder.with_extensions_path(path); } } diff --git a/crates/tauri-runtime/Cargo.toml b/crates/tauri-runtime/Cargo.toml index 6a2110af0..d33fa217b 100644 --- a/crates/tauri-runtime/Cargo.toml +++ b/crates/tauri-runtime/Cargo.toml @@ -26,11 +26,11 @@ targets = [ ] [dependencies] -serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0" +serde = { version = "1", features = ["derive"] } +serde_json = "1" thiserror = "2" tauri-utils = { version = "2.1.0", path = "../tauri-utils" } -http = "1.1" +http = "1" raw-window-handle = "0.6" url = { version = "2" } dpi = { version = "0.1", features = ["serde"] } diff --git a/crates/tauri-schema-generator/Cargo.toml b/crates/tauri-schema-generator/Cargo.toml index a2b42c3c2..06e3cd7c2 100644 --- a/crates/tauri-schema-generator/Cargo.toml +++ b/crates/tauri-schema-generator/Cargo.toml @@ -6,7 +6,7 @@ publish = false [build-dependencies] tauri-utils = { features = ["schema"], path = "../tauri-utils" } -schemars = { version = "0.8", features = ["url", "preserve_order"] } -serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0" -url = { version = "2.3", features = ["serde"] } +schemars = { version = "0.8.18", features = ["url", "preserve_order"] } +serde = { version = "1", features = ["derive"] } +serde_json = "1" +url = { version = "2", features = ["serde"] } diff --git a/crates/tauri-schema-worker/Cargo.toml b/crates/tauri-schema-worker/Cargo.toml index 3af5a33e7..8a94c55c3 100644 --- a/crates/tauri-schema-worker/Cargo.toml +++ b/crates/tauri-schema-worker/Cargo.toml @@ -13,6 +13,6 @@ worker-macros = { version = "0.3", features = ['http'] } console_error_panic_hook = { version = "0.1" } axum = { version = "0.7", default-features = false } tower-service = "0.3" -semver = { version = "1.0", features = ["serde"] } -serde = { version = "1.0", features = ["derive"] } -anyhow = "1.0" +semver = { version = "1", features = ["serde"] } +serde = { version = "1", features = ["derive"] } +anyhow = "1" diff --git a/crates/tauri-utils/Cargo.toml b/crates/tauri-utils/Cargo.toml index 27a44f5e6..ed54d64ad 100644 --- a/crates/tauri-utils/Cargo.toml +++ b/crates/tauri-utils/Cargo.toml @@ -25,6 +25,7 @@ html5ever = "0.26" kuchiki = { package = "kuchikiki", version = "0.8" } proc-macro2 = { version = "1", optional = true } quote = { version = "1", optional = true } +# Our code requires at least 0.8.18 so don't change this to 0.8 schemars = { version = "0.8.18", features = ["url", "uuid1"], optional = true } serde_with = "3" aes-gcm = { version = "0.10", optional = true } @@ -46,14 +47,14 @@ log = "0.4.21" cargo_metadata = { version = "0.18", optional = true } serde-untagged = "0.1" uuid = { version = "1", features = ["serde"] } -http = "1.1.0" +http = "1" [target."cfg(target_os = \"macos\")".dependencies] -swift-rs = { version = "1.0.7", optional = true, features = ["build"] } +swift-rs = { version = "1", optional = true, features = ["build"] } [dev-dependencies] getrandom = { version = "0.2", features = ["std"] } -serial_test = "3.1" +serial_test = "3.2" [features] build = ["proc-macro2", "quote", "cargo_metadata", "schema", "swift-rs"] diff --git a/crates/tauri/Cargo.toml b/crates/tauri/Cargo.toml index a4f62dd65..379c45f6c 100644 --- a/crates/tauri/Cargo.toml +++ b/crates/tauri/Cargo.toml @@ -43,8 +43,8 @@ build = ["tauri-build"] development = ["quickcheck_macros"] [dependencies] -serde_json = { version = "1.0", features = ["raw_value"] } -serde = { version = "1.0", features = ["derive", "rc"] } +serde_json = { version = "1", features = ["raw_value"] } +serde = { version = "1", features = ["derive", "rc"] } tokio = { version = "1", features = [ "rt", "rt-multi-thread", @@ -55,7 +55,7 @@ tokio = { version = "1", features = [ futures-util = "0.3" uuid = { version = "1", features = ["v4"], optional = true } url = "2" -anyhow = "1.0" +anyhow = "1" thiserror = "2" tauri-runtime = { version = "2.2.0", path = "../tauri-runtime" } tauri-macros = { version = "2.0.3", path = "../tauri-macros" } @@ -65,9 +65,9 @@ tauri-utils = { version = "2.1.0", features = [ tauri-runtime-wry = { version = "2.2.0", path = "../tauri-runtime-wry", optional = true } getrandom = "0.2" serde_repr = "0.1" -http = "1.1" +http = "1" dirs = "5" -percent-encoding = "2.3" +percent-encoding = "2" reqwest = { version = "0.12", default-features = false, features = [ "json", "stream", @@ -80,10 +80,10 @@ mime = "0.3" data-url = { version = "0.3", optional = true } serialize-to-javascript = "=0.1.1" image = { version = "0.25", default-features = false, optional = true } -http-range = { version = "0.1.5", optional = true } +http-range = { version = "0.1", optional = true } tracing = { version = "0.1", optional = true } heck = "0.5" -log = "0.4" +log = "0.4.21" dunce = "1" specta = { version = "^2.0.0-rc.20", optional = true, default-features = false, features = [ "function", @@ -107,9 +107,9 @@ webkit2gtk = { version = "=2.0.1", features = ["v2_40"] } [target.'cfg(target_os = "macos")'.dependencies] embed_plist = "1.2" plist = "1" -objc2 = "0.5.2" -objc2-foundation = { version = "0.2.2", features = ["NSData", "NSThread"] } -objc2-app-kit = { version = "0.2.2", features = [ +objc2 = "0.5" +objc2-foundation = { version = "0.2", features = ["NSData", "NSThread"] } +objc2-app-kit = { version = "0.2", features = [ "NSApplication", "NSColor", "NSResponder", @@ -120,7 +120,7 @@ objc2-app-kit = { version = "0.2.2", features = [ window-vibrancy = "0.5" [target."cfg(windows)".dependencies] -webview2-com = "0.33" +webview2-com = "0.34" window-vibrancy = "0.5" [target."cfg(windows)".dependencies.windows] @@ -133,7 +133,7 @@ jni = "0.21" # UIKit, i.e. iOS/tvOS/watchOS/visionOS [target.'cfg(all(target_vendor = "apple", not(target_os = "macos")))'.dependencies] libc = "0.2" -swift-rs = "1.0.7" +swift-rs = "1" [build-dependencies] heck = "0.5" @@ -143,11 +143,11 @@ tauri-utils = { path = "../tauri-utils/", version = "2.1.0", features = [ ] } [dev-dependencies] -proptest = "1.4.0" +proptest = "1.6.0" quickcheck = "1.0.3" quickcheck_macros = "1.0.0" -serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0" +serde = { version = "1", features = ["derive"] } +serde_json = "1" tauri = { path = ".", default-features = false, features = ["wry"] } tokio = { version = "1", features = ["full"] } cargo_toml = "0.17" @@ -155,7 +155,7 @@ http-range = "0.1.5" # macOS [target.'cfg(target_os = "macos")'.dev-dependencies] -objc2-web-kit = { version = "0.2.2", features = [ +objc2-web-kit = { version = "0.2", features = [ "objc2-app-kit", "WKWebView", "WKUserContentController", diff --git a/crates/tauri/src/webview/mod.rs b/crates/tauri/src/webview/mod.rs index fbbb539b9..cd27e2eb2 100644 --- a/crates/tauri/src/webview/mod.rs +++ b/crates/tauri/src/webview/mod.rs @@ -1185,6 +1185,9 @@ impl Webview { /// /// The closure is executed on the main thread. /// + /// Note that `webview2-com`, `webkit2gtk`, `objc2_web_kit` and similar crates may be updated in minor releases of Tauri. + /// Therefore it's recommended to pin Tauri to at least a minor version when you're using `with_webview`. + /// /// # Examples /// #[cfg_attr( diff --git a/crates/tauri/src/webview/webview_window.rs b/crates/tauri/src/webview/webview_window.rs index 47ca3d418..901ffb1d9 100644 --- a/crates/tauri/src/webview/webview_window.rs +++ b/crates/tauri/src/webview/webview_window.rs @@ -1797,6 +1797,9 @@ impl WebviewWindow { /// /// The closure is executed on the main thread. /// + /// Note that `webview2-com`, `webkit2gtk`, `objc2_web_kit` and similar crates may be updated in minor releases of Tauri. + /// Therefore it's recommended to pin Tauri to at least a minor version when you're using `with_webview`. + /// /// # Examples /// /// ```rust,no_run diff --git a/examples/api/src-tauri/Cargo.toml b/examples/api/src-tauri/Cargo.toml index a0d8fadc7..2e6243190 100644 --- a/examples/api/src-tauri/Cargo.toml +++ b/examples/api/src-tauri/Cargo.toml @@ -17,12 +17,12 @@ tauri-build = { path = "../../../crates/tauri-build", features = [ ] } [dependencies] -serde_json = "1.0" -serde = { version = "1.0", features = ["derive"] } +serde_json = "1" +serde = { version = "1", features = ["derive"] } tiny_http = "0.11" -log = "0.4" +log = "0.4.21" tauri-plugin-sample = { path = "./tauri-plugin-sample/" } -tauri-plugin-log = "2.0.0-rc" +tauri-plugin-log = "2" [dependencies.tauri] path = "../../../crates/tauri" diff --git a/examples/file-associations/src-tauri/Cargo.toml b/examples/file-associations/src-tauri/Cargo.toml index 6f5c6f2f5..a67d0a1bb 100644 --- a/examples/file-associations/src-tauri/Cargo.toml +++ b/examples/file-associations/src-tauri/Cargo.toml @@ -9,7 +9,7 @@ rust-version = "1.77.2" tauri-build = { path = "../../../crates/tauri-build", features = ["codegen"] } [dependencies] -serde_json = "1.0" -serde = { version = "1.0", features = ["derive"] } +serde_json = "1" +serde = { version = "1", features = ["derive"] } tauri = { path = "../../../crates/tauri", features = [] } url = "2" diff --git a/examples/resources/src-tauri/Cargo.toml b/examples/resources/src-tauri/Cargo.toml index 5078ed736..dfd0c261e 100644 --- a/examples/resources/src-tauri/Cargo.toml +++ b/examples/resources/src-tauri/Cargo.toml @@ -9,6 +9,6 @@ rust-version = "1.77.2" tauri-build = { path = "../../../crates/tauri-build", features = ["codegen"] } [dependencies] -serde_json = "1.0" -serde = { version = "1.0", features = ["derive"] } +serde_json = "1" +serde = { version = "1", features = ["derive"] } tauri = { path = "../../../crates/tauri", features = [] }