From f0e590181435f06ea344db6821efbf6a03e22a25 Mon Sep 17 00:00:00 2001 From: amrbashir Date: Wed, 12 Jun 2024 19:59:07 +0300 Subject: [PATCH 1/3] fix(deps): update rust crate windows to 0.57 and webview2-com to 0.31 --- .changes/windows-rs-0.57.md | 7 ++ Cargo.lock | 93 ++++++++++++++++--- core/tauri-runtime-wry/Cargo.toml | 36 ++++---- core/tauri-runtime/Cargo.toml | 2 +- core/tauri/Cargo.toml | 143 +++++++++++++++++------------- 5 files changed, 191 insertions(+), 90 deletions(-) create mode 100644 .changes/windows-rs-0.57.md diff --git a/.changes/windows-rs-0.57.md b/.changes/windows-rs-0.57.md new file mode 100644 index 000000000000..ba4898092ecd --- /dev/null +++ b/.changes/windows-rs-0.57.md @@ -0,0 +1,7 @@ +--- +'tauri': 'patch:deps' +'tauri-runtime': 'patch:deps' +'tauri-runtime-wry': 'patch:deps' +--- + +Update `windows` crate to version `0.57` and `webview2-com` crate to version `0.31` diff --git a/Cargo.lock b/Cargo.lock index b0b54e022b40..410232691243 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1765,7 +1765,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -3584,9 +3584,9 @@ dependencies = [ "urlpattern", "uuid", "webkit2gtk", - "webview2-com", + "webview2-com 0.31.0", "window-vibrancy", - "windows 0.56.0", + "windows 0.57.0", ] [[package]] @@ -3700,7 +3700,7 @@ dependencies = [ "tauri-utils", "thiserror", "url", - "windows 0.56.0", + "windows 0.57.0", ] [[package]] @@ -3721,8 +3721,8 @@ dependencies = [ "tracing", "url", "webkit2gtk", - "webview2-com", - "windows 0.56.0", + "webview2-com 0.31.0", + "windows 0.57.0", "wry", ] @@ -4512,11 +4512,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c914dd492a52f0377bef56fd1b6e74a79090f9ee631d625d5b505a00e4538b6" dependencies = [ "webview2-com-macros", - "webview2-com-sys", + "webview2-com-sys 0.30.0", "windows 0.56.0", "windows-core 0.56.0", - "windows-implement", - "windows-interface", + "windows-implement 0.56.0", + "windows-interface 0.56.0", +] + +[[package]] +name = "webview2-com" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6516cfa64c6b3212686080eeec378e662c2af54bb2a5b2a22749673f5cb2226f" +dependencies = [ + "webview2-com-macros", + "webview2-com-sys 0.31.0", + "windows 0.57.0", + "windows-core 0.57.0", + "windows-implement 0.57.0", + "windows-interface 0.57.0", ] [[package]] @@ -4541,6 +4555,17 @@ dependencies = [ "windows-core 0.56.0", ] +[[package]] +name = "webview2-com-sys" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c76d5b77320ff155660be1df3e6588bc85c75f1a9feef938cc4dc4dd60d1d7cf" +dependencies = [ + "thiserror", + "windows 0.57.0", + "windows-core 0.57.0", +] + [[package]] name = "winapi" version = "0.3.9" @@ -4604,6 +4629,16 @@ dependencies = [ "windows-targets 0.52.5", ] +[[package]] +name = "windows" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" +dependencies = [ + "windows-core 0.57.0", + "windows-targets 0.52.5", +] + [[package]] name = "windows-core" version = "0.52.0" @@ -4619,8 +4654,20 @@ version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" dependencies = [ - "windows-implement", - "windows-interface", + "windows-implement 0.56.0", + "windows-interface 0.56.0", + "windows-result", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-core" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" +dependencies = [ + "windows-implement 0.57.0", + "windows-interface 0.57.0", "windows-result", "windows-targets 0.52.5", ] @@ -4636,6 +4683,17 @@ dependencies = [ "syn 2.0.57", ] +[[package]] +name = "windows-implement" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.57", +] + [[package]] name = "windows-interface" version = "0.56.0" @@ -4647,6 +4705,17 @@ dependencies = [ "syn 2.0.57", ] +[[package]] +name = "windows-interface" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.57", +] + [[package]] name = "windows-result" version = "0.1.1" @@ -4935,7 +5004,7 @@ dependencies = [ "tracing", "webkit2gtk", "webkit2gtk-sys", - "webview2-com", + "webview2-com 0.30.0", "windows 0.56.0", "windows-core 0.56.0", "windows-version", diff --git a/core/tauri-runtime-wry/Cargo.toml b/core/tauri-runtime-wry/Cargo.toml index 1b8c8562f772..3abb514f9ed3 100644 --- a/core/tauri-runtime-wry/Cargo.toml +++ b/core/tauri-runtime-wry/Cargo.toml @@ -2,7 +2,7 @@ name = "tauri-runtime-wry" version = "2.0.0-beta.18" description = "Wry bindings to the Tauri runtime" -exclude = [ "CHANGELOG.md", "/target" ] +exclude = ["CHANGELOG.md", "/target"] readme = "README.md" authors = { workspace = true } homepage = { workspace = true } @@ -13,8 +13,12 @@ edition = { workspace = true } rust-version = { workspace = true } [dependencies] -wry = { version = "0.40", default-features = false, features = [ "drag-drop", "protocol", "os-webview" ] } -tao = { version = "0.28", default-features = false, features = [ "rwh_06" ] } +wry = { version = "0.40", default-features = false, features = [ + "drag-drop", + "protocol", + "os-webview", +] } +tao = { version = "0.28", default-features = false, features = ["rwh_06"] } tauri-runtime = { version = "2.0.0-beta.18", path = "../tauri-runtime" } tauri-utils = { version = "2.0.0-beta.17", path = "../tauri-utils" } raw-window-handle = "0.6" @@ -24,16 +28,16 @@ tracing = { version = "0.1", optional = true } log = "0.4" [target."cfg(windows)".dependencies] -webview2-com = "0.30" +webview2-com = "0.31" softbuffer = { version = "0.4", default-features = false } - [target."cfg(windows)".dependencies.windows] - version = "0.56" - features = [ "Win32_Foundation", "Win32_Graphics_Dwm" ] +[target."cfg(windows)".dependencies.windows] +version = "0.57" +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_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] @@ -43,14 +47,14 @@ cocoa = "0.25" jni = "0.21" [features] -devtools = [ "wry/devtools", "tauri-runtime/devtools" ] +devtools = ["wry/devtools", "tauri-runtime/devtools"] macos-private-api = [ "wry/fullscreen", "wry/transparent", - "tauri-runtime/macos-private-api" + "tauri-runtime/macos-private-api", ] -objc-exception = [ "wry/objc-exception" ] -linux-protocol-body = [ "wry/linux-body", "webkit2gtk/v2_40" ] -tracing = [ "dep:tracing", "wry/tracing" ] -macos-proxy = [ "wry/mac-proxy" ] -unstable = [ ] +objc-exception = ["wry/objc-exception"] +linux-protocol-body = ["wry/linux-body", "webkit2gtk/v2_40"] +tracing = ["dep:tracing", "wry/tracing"] +macos-proxy = ["wry/mac-proxy"] +unstable = [] diff --git a/core/tauri-runtime/Cargo.toml b/core/tauri-runtime/Cargo.toml index 91b2efaee747..8cd2163c3408 100644 --- a/core/tauri-runtime/Cargo.toml +++ b/core/tauri-runtime/Cargo.toml @@ -36,7 +36,7 @@ url = { version = "2" } dpi = { version = "0.1", features = [ "serde" ] } [target."cfg(windows)".dependencies.windows] -version = "0.56" +version = "0.57" features = [ "Win32_Foundation" ] [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies] diff --git a/core/tauri/Cargo.toml b/core/tauri/Cargo.toml index b8e560bb7d4e..658407f8e787 100644 --- a/core/tauri/Cargo.toml +++ b/core/tauri/Cargo.toml @@ -2,7 +2,7 @@ name = "tauri" version = "2.0.0-beta.22" description = "Make tiny, secure apps for all desktop platforms with Tauri" -exclude = [ "/test", "/.scripts", "CHANGELOG.md", "/target" ] +exclude = ["/test", "/.scripts", "CHANGELOG.md", "/target"] readme = "README.md" links = "Tauri" authors = { workspace = true } @@ -24,36 +24,44 @@ features = [ "image-png", "protocol-asset", "test", - "specta" + "specta", ] -rustc-args = [ "--cfg", "docsrs" ] -rustdoc-args = [ "--cfg", "docsrs" ] +rustc-args = ["--cfg", "docsrs"] +rustdoc-args = ["--cfg", "docsrs"] default-target = "x86_64-unknown-linux-gnu" targets = [ "x86_64-pc-windows-msvc", "x86_64-unknown-linux-gnu", "x86_64-apple-darwin", "x86_64-linux-android", - "x86_64-apple-ios" + "x86_64-apple-ios", ] [package.metadata.cargo-udeps.ignore] -normal = [ "reqwest" ] -build = [ "tauri-build" ] -development = [ "quickcheck_macros" ] +normal = ["reqwest"] +build = ["tauri-build"] +development = ["quickcheck_macros"] [dependencies] -serde_json = { version = "1.0", features = [ "raw_value" ] } -serde = { version = "1.0", features = [ "derive", "rc" ] } -tokio = { version = "1", features = [ "rt", "rt-multi-thread", "sync", "fs", "io-util" ] } +serde_json = { version = "1.0", features = ["raw_value"] } +serde = { version = "1.0", features = ["derive", "rc"] } +tokio = { version = "1", features = [ + "rt", + "rt-multi-thread", + "sync", + "fs", + "io-util", +] } futures-util = "0.3" -uuid = { version = "1", features = [ "v4" ], optional = true } +uuid = { version = "1", features = ["v4"], optional = true } url = "2" anyhow = "1.0" thiserror = "1.0" tauri-runtime = { version = "2.0.0-beta.18", path = "../tauri-runtime" } tauri-macros = { version = "2.0.0-beta.17", path = "../tauri-macros" } -tauri-utils = { version = "2.0.0-beta.17", features = [ "resources" ], path = "../tauri-utils" } +tauri-utils = { version = "2.0.0-beta.17", features = [ + "resources", +], path = "../tauri-utils" } tauri-runtime-wry = { version = "2.0.0-beta.18", path = "../tauri-runtime-wry", optional = true } getrandom = "0.2" serde_repr = "0.1" @@ -61,9 +69,12 @@ state = "0.6" http = "1.1" dirs = "5" percent-encoding = "2.3" -reqwest = { version = "0.12", default-features = false, features = [ "json", "stream" ] } -bytes = { version = "1", features = [ "serde" ] } -raw-window-handle = { version = "0.6", features = [ "std" ]} +reqwest = { version = "0.12", default-features = false, features = [ + "json", + "stream", +] } +bytes = { version = "1", features = ["serde"] } +raw-window-handle = { version = "0.6", features = ["std"] } glob = "0.3" urlpattern = "0.2" mime = "0.3" @@ -75,15 +86,19 @@ tracing = { version = "0.1", optional = true } heck = "0.5" log = "0.4" dunce = "1" -specta = { version = "^2.0.0-rc.9", optional = true, default-features = false, features = [ "function" ] } +specta = { version = "^2.0.0-rc.9", optional = true, default-features = false, features = [ + "function", +] } [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.13.4", default-features = false, features = [ "serde" ] } -tray-icon = { version = "0.14", default-features = false, features = [ "serde" ], optional = true } +muda = { version = "0.13.4", default-features = false, features = ["serde"] } +tray-icon = { version = "0.14", default-features = false, features = [ + "serde", +], optional = true } [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.1", features = [ "v2_38" ] } +gtk = { version = "0.18", features = ["v3_24"] } +webkit2gtk = { version = "=2.0.1", features = ["v2_38"] } [target."cfg(target_os = \"macos\")".dependencies] embed_plist = "1.2" @@ -92,12 +107,12 @@ objc = "0.2" window-vibrancy = "0.5" [target."cfg(windows)".dependencies] -webview2-com = "0.30" +webview2-com = "0.31" window-vibrancy = "0.5" - [target."cfg(windows)".dependencies.windows] - version = "0.56" - features = [ "Win32_Foundation" ] +[target."cfg(windows)".dependencies.windows] +version = "0.57" +features = ["Win32_Foundation"] [target."cfg(target_os = \"android\")".dependencies] jni = "0.21" @@ -111,54 +126,60 @@ swift-rs = "1.0.6" [build-dependencies] heck = "0.5" tauri-build = { path = "../tauri-build/", default-features = false, version = "2.0.0-beta.17" } -tauri-utils = { path = "../tauri-utils/", version = "2.0.0-beta.17", features = [ "build" ] } +tauri-utils = { path = "../tauri-utils/", version = "2.0.0-beta.17", features = [ + "build", +] } [dev-dependencies] proptest = "1.4.0" quickcheck = "1.0.3" quickcheck_macros = "1.0.0" -serde = { version = "1.0", features = [ "derive" ] } +serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -tauri = { path = ".", default-features = false, features = [ "wry" ] } -tokio = { version = "1", features = [ "full" ] } +tauri = { path = ".", default-features = false, features = ["wry"] } +tokio = { version = "1", features = ["full"] } cargo_toml = "0.17" http-range = "0.1.5" [features] -default = [ "wry", "compression", "objc-exception", "common-controls-v6" ] -unstable = [ "tauri-runtime-wry/unstable" ] -common-controls-v6 = [ "tray-icon?/common-controls-v6", "muda/common-controls-v6" ] -tray-icon = [ "dep:tray-icon" ] -tracing = [ - "dep:tracing", - "tauri-macros/tracing", - "tauri-runtime-wry/tracing" +default = ["wry", "compression", "objc-exception", "common-controls-v6"] +unstable = ["tauri-runtime-wry/unstable"] +common-controls-v6 = [ + "tray-icon?/common-controls-v6", + "muda/common-controls-v6", +] +tray-icon = ["dep:tray-icon"] +tracing = ["dep:tracing", "tauri-macros/tracing", "tauri-runtime-wry/tracing"] +test = [] +compression = ["tauri-macros/compression", "tauri-utils/compression"] +wry = ["tauri-runtime-wry"] +objc-exception = ["tauri-runtime-wry/objc-exception"] +linux-ipc-protocol = [ + "tauri-runtime-wry/linux-protocol-body", + "webkit2gtk/v2_40", +] +linux-libxdo = ["tray-icon/libxdo", "muda/libxdo"] +isolation = ["tauri-utils/isolation", "tauri-macros/isolation", "uuid"] +custom-protocol = ["tauri-macros/custom-protocol"] +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"] +process-relaunch-dangerous-allow-symlink-macos = [ + "tauri-utils/process-relaunch-dangerous-allow-symlink-macos", ] -test = [ ] -compression = [ "tauri-macros/compression", "tauri-utils/compression" ] -wry = [ "tauri-runtime-wry" ] -objc-exception = [ "tauri-runtime-wry/objc-exception" ] -linux-ipc-protocol = [ "tauri-runtime-wry/linux-protocol-body", "webkit2gtk/v2_40" ] -linux-libxdo = [ "tray-icon/libxdo", "muda/libxdo" ] -isolation = [ "tauri-utils/isolation", "tauri-macros/isolation", "uuid" ] -custom-protocol = [ "tauri-macros/custom-protocol" ] -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" ] -process-relaunch-dangerous-allow-symlink-macos = [ "tauri-utils/process-relaunch-dangerous-allow-symlink-macos" ] macos-private-api = [ "tauri-runtime/macos-private-api", - "tauri-runtime-wry/macos-private-api" + "tauri-runtime-wry/macos-private-api", ] -webview-data-url = [ "data-url" ] -protocol-asset = [ "http-range" ] -config-json5 = [ "tauri-macros/config-json5" ] -config-toml = [ "tauri-macros/config-toml" ] -image-ico = [ "image/ico" ] -image-png = [ "image/png" ] -macos-proxy = [ "tauri-runtime-wry/macos-proxy" ] -specta = [ "dep:specta" ] +webview-data-url = ["data-url"] +protocol-asset = ["http-range"] +config-json5 = ["tauri-macros/config-json5"] +config-toml = ["tauri-macros/config-toml"] +image-ico = ["image/ico"] +image-png = ["image/png"] +macos-proxy = ["tauri-runtime-wry/macos-proxy"] +specta = ["dep:specta"] [[example]] name = "commands" @@ -171,7 +192,7 @@ path = "../../examples/helloworld/main.rs" [[example]] name = "multiwebview" path = "../../examples/multiwebview/main.rs" -required-features = [ "unstable" ] +required-features = ["unstable"] [[example]] name = "multiwindow" @@ -200,7 +221,7 @@ path = "../../examples/streaming/main.rs" [[example]] name = "isolation" path = "../../examples/isolation/main.rs" -required-features = [ "isolation" ] +required-features = ["isolation"] [[example]] name = "run-iteration" From 7a2fc555ffaaca68776027d170079dfafc0e9dd7 Mon Sep 17 00:00:00 2001 From: amrbashir Date: Wed, 12 Jun 2024 20:28:13 +0300 Subject: [PATCH 2/3] revert fmt --- core/tauri-runtime-wry/Cargo.toml | 34 ++++--- core/tauri/Cargo.toml | 141 +++++++++++++----------------- 2 files changed, 75 insertions(+), 100 deletions(-) diff --git a/core/tauri-runtime-wry/Cargo.toml b/core/tauri-runtime-wry/Cargo.toml index 3abb514f9ed3..f650df98b6cf 100644 --- a/core/tauri-runtime-wry/Cargo.toml +++ b/core/tauri-runtime-wry/Cargo.toml @@ -2,7 +2,7 @@ name = "tauri-runtime-wry" version = "2.0.0-beta.18" description = "Wry bindings to the Tauri runtime" -exclude = ["CHANGELOG.md", "/target"] +exclude = [ "CHANGELOG.md", "/target" ] readme = "README.md" authors = { workspace = true } homepage = { workspace = true } @@ -13,12 +13,8 @@ edition = { workspace = true } rust-version = { workspace = true } [dependencies] -wry = { version = "0.40", default-features = false, features = [ - "drag-drop", - "protocol", - "os-webview", -] } -tao = { version = "0.28", default-features = false, features = ["rwh_06"] } +wry = { version = "0.40", default-features = false, features = [ "drag-drop", "protocol", "os-webview" ] } +tao = { version = "0.28", default-features = false, features = [ "rwh_06" ] } tauri-runtime = { version = "2.0.0-beta.18", path = "../tauri-runtime" } tauri-utils = { version = "2.0.0-beta.17", path = "../tauri-utils" } raw-window-handle = "0.6" @@ -31,13 +27,13 @@ log = "0.4" webview2-com = "0.31" softbuffer = { version = "0.4", default-features = false } -[target."cfg(windows)".dependencies.windows] -version = "0.57" -features = ["Win32_Foundation", "Win32_Graphics_Dwm"] + [target."cfg(windows)".dependencies.windows] + version = "0.57" + 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_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] @@ -47,14 +43,14 @@ cocoa = "0.25" jni = "0.21" [features] -devtools = ["wry/devtools", "tauri-runtime/devtools"] +devtools = [ "wry/devtools", "tauri-runtime/devtools" ] macos-private-api = [ "wry/fullscreen", "wry/transparent", - "tauri-runtime/macos-private-api", + "tauri-runtime/macos-private-api" ] -objc-exception = ["wry/objc-exception"] -linux-protocol-body = ["wry/linux-body", "webkit2gtk/v2_40"] -tracing = ["dep:tracing", "wry/tracing"] -macos-proxy = ["wry/mac-proxy"] -unstable = [] +objc-exception = [ "wry/objc-exception" ] +linux-protocol-body = [ "wry/linux-body", "webkit2gtk/v2_40" ] +tracing = [ "dep:tracing", "wry/tracing" ] +macos-proxy = [ "wry/mac-proxy" ] +unstable = [ ] \ No newline at end of file diff --git a/core/tauri/Cargo.toml b/core/tauri/Cargo.toml index 658407f8e787..f8ab5215a89f 100644 --- a/core/tauri/Cargo.toml +++ b/core/tauri/Cargo.toml @@ -2,7 +2,7 @@ name = "tauri" version = "2.0.0-beta.22" description = "Make tiny, secure apps for all desktop platforms with Tauri" -exclude = ["/test", "/.scripts", "CHANGELOG.md", "/target"] +exclude = [ "/test", "/.scripts", "CHANGELOG.md", "/target" ] readme = "README.md" links = "Tauri" authors = { workspace = true } @@ -24,44 +24,36 @@ features = [ "image-png", "protocol-asset", "test", - "specta", + "specta" ] -rustc-args = ["--cfg", "docsrs"] -rustdoc-args = ["--cfg", "docsrs"] +rustc-args = [ "--cfg", "docsrs" ] +rustdoc-args = [ "--cfg", "docsrs" ] default-target = "x86_64-unknown-linux-gnu" targets = [ "x86_64-pc-windows-msvc", "x86_64-unknown-linux-gnu", "x86_64-apple-darwin", "x86_64-linux-android", - "x86_64-apple-ios", + "x86_64-apple-ios" ] [package.metadata.cargo-udeps.ignore] -normal = ["reqwest"] -build = ["tauri-build"] -development = ["quickcheck_macros"] +normal = [ "reqwest" ] +build = [ "tauri-build" ] +development = [ "quickcheck_macros" ] [dependencies] -serde_json = { version = "1.0", features = ["raw_value"] } -serde = { version = "1.0", features = ["derive", "rc"] } -tokio = { version = "1", features = [ - "rt", - "rt-multi-thread", - "sync", - "fs", - "io-util", -] } +serde_json = { version = "1.0", features = [ "raw_value" ] } +serde = { version = "1.0", features = [ "derive", "rc" ] } +tokio = { version = "1", features = [ "rt", "rt-multi-thread", "sync", "fs", "io-util" ] } futures-util = "0.3" -uuid = { version = "1", features = ["v4"], optional = true } +uuid = { version = "1", features = [ "v4" ], optional = true } url = "2" anyhow = "1.0" thiserror = "1.0" tauri-runtime = { version = "2.0.0-beta.18", path = "../tauri-runtime" } tauri-macros = { version = "2.0.0-beta.17", path = "../tauri-macros" } -tauri-utils = { version = "2.0.0-beta.17", features = [ - "resources", -], path = "../tauri-utils" } +tauri-utils = { version = "2.0.0-beta.17", features = [ "resources" ], path = "../tauri-utils" } tauri-runtime-wry = { version = "2.0.0-beta.18", path = "../tauri-runtime-wry", optional = true } getrandom = "0.2" serde_repr = "0.1" @@ -69,12 +61,9 @@ state = "0.6" http = "1.1" dirs = "5" percent-encoding = "2.3" -reqwest = { version = "0.12", default-features = false, features = [ - "json", - "stream", -] } -bytes = { version = "1", features = ["serde"] } -raw-window-handle = { version = "0.6", features = ["std"] } +reqwest = { version = "0.12", default-features = false, features = [ "json", "stream" ] } +bytes = { version = "1", features = [ "serde" ] } +raw-window-handle = { version = "0.6", features = [ "std" ]} glob = "0.3" urlpattern = "0.2" mime = "0.3" @@ -86,19 +75,15 @@ tracing = { version = "0.1", optional = true } heck = "0.5" log = "0.4" dunce = "1" -specta = { version = "^2.0.0-rc.9", optional = true, default-features = false, features = [ - "function", -] } +specta = { version = "^2.0.0-rc.9", optional = true, default-features = false, features = [ "function" ] } [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.13.4", default-features = false, features = ["serde"] } -tray-icon = { version = "0.14", default-features = false, features = [ - "serde", -], optional = true } +muda = { version = "0.13.4", default-features = false, features = [ "serde" ] } +tray-icon = { version = "0.14", default-features = false, features = [ "serde" ], optional = true } [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.1", features = ["v2_38"] } +gtk = { version = "0.18", features = [ "v3_24" ] } +webkit2gtk = { version = "=2.0.1", features = [ "v2_38" ] } [target."cfg(target_os = \"macos\")".dependencies] embed_plist = "1.2" @@ -110,9 +95,9 @@ window-vibrancy = "0.5" webview2-com = "0.31" window-vibrancy = "0.5" -[target."cfg(windows)".dependencies.windows] -version = "0.57" -features = ["Win32_Foundation"] + [target."cfg(windows)".dependencies.windows] + version = "0.57" + features = ["Win32_Foundation"] [target."cfg(target_os = \"android\")".dependencies] jni = "0.21" @@ -126,60 +111,54 @@ swift-rs = "1.0.6" [build-dependencies] heck = "0.5" tauri-build = { path = "../tauri-build/", default-features = false, version = "2.0.0-beta.17" } -tauri-utils = { path = "../tauri-utils/", version = "2.0.0-beta.17", features = [ - "build", -] } +tauri-utils = { path = "../tauri-utils/", version = "2.0.0-beta.17", features = [ "build" ] } [dev-dependencies] proptest = "1.4.0" quickcheck = "1.0.3" quickcheck_macros = "1.0.0" -serde = { version = "1.0", features = ["derive"] } +serde = { version = "1.0", features = [ "derive" ] } serde_json = "1.0" -tauri = { path = ".", default-features = false, features = ["wry"] } -tokio = { version = "1", features = ["full"] } +tauri = { path = ".", default-features = false, features = [ "wry" ] } +tokio = { version = "1", features = [ "full" ] } cargo_toml = "0.17" http-range = "0.1.5" [features] -default = ["wry", "compression", "objc-exception", "common-controls-v6"] -unstable = ["tauri-runtime-wry/unstable"] -common-controls-v6 = [ - "tray-icon?/common-controls-v6", - "muda/common-controls-v6", -] -tray-icon = ["dep:tray-icon"] -tracing = ["dep:tracing", "tauri-macros/tracing", "tauri-runtime-wry/tracing"] -test = [] -compression = ["tauri-macros/compression", "tauri-utils/compression"] -wry = ["tauri-runtime-wry"] -objc-exception = ["tauri-runtime-wry/objc-exception"] -linux-ipc-protocol = [ - "tauri-runtime-wry/linux-protocol-body", - "webkit2gtk/v2_40", -] -linux-libxdo = ["tray-icon/libxdo", "muda/libxdo"] -isolation = ["tauri-utils/isolation", "tauri-macros/isolation", "uuid"] -custom-protocol = ["tauri-macros/custom-protocol"] -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"] -process-relaunch-dangerous-allow-symlink-macos = [ - "tauri-utils/process-relaunch-dangerous-allow-symlink-macos", +default = [ "wry", "compression", "objc-exception", "common-controls-v6" ] +unstable = [ "tauri-runtime-wry/unstable" ] +common-controls-v6 = [ "tray-icon?/common-controls-v6", "muda/common-controls-v6" ] +tray-icon = [ "dep:tray-icon" ] +tracing = [ + "dep:tracing", + "tauri-macros/tracing", + "tauri-runtime-wry/tracing" ] +test = [ ] +compression = [ "tauri-macros/compression", "tauri-utils/compression" ] +wry = [ "tauri-runtime-wry" ] +objc-exception = [ "tauri-runtime-wry/objc-exception" ] +linux-ipc-protocol = [ "tauri-runtime-wry/linux-protocol-body", "webkit2gtk/v2_40" ] +linux-libxdo = [ "tray-icon/libxdo", "muda/libxdo" ] +isolation = [ "tauri-utils/isolation", "tauri-macros/isolation", "uuid" ] +custom-protocol = [ "tauri-macros/custom-protocol" ] +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" ] +process-relaunch-dangerous-allow-symlink-macos = [ "tauri-utils/process-relaunch-dangerous-allow-symlink-macos" ] macos-private-api = [ "tauri-runtime/macos-private-api", - "tauri-runtime-wry/macos-private-api", + "tauri-runtime-wry/macos-private-api" ] -webview-data-url = ["data-url"] -protocol-asset = ["http-range"] -config-json5 = ["tauri-macros/config-json5"] -config-toml = ["tauri-macros/config-toml"] -image-ico = ["image/ico"] -image-png = ["image/png"] -macos-proxy = ["tauri-runtime-wry/macos-proxy"] -specta = ["dep:specta"] +webview-data-url = [ "data-url" ] +protocol-asset = [ "http-range" ] +config-json5 = [ "tauri-macros/config-json5" ] +config-toml = [ "tauri-macros/config-toml" ] +image-ico = [ "image/ico" ] +image-png = [ "image/png" ] +macos-proxy = [ "tauri-runtime-wry/macos-proxy" ] +specta = [ "dep:specta" ] [[example]] name = "commands" @@ -192,7 +171,7 @@ path = "../../examples/helloworld/main.rs" [[example]] name = "multiwebview" path = "../../examples/multiwebview/main.rs" -required-features = ["unstable"] +required-features = [ "unstable" ] [[example]] name = "multiwindow" @@ -221,7 +200,7 @@ path = "../../examples/streaming/main.rs" [[example]] name = "isolation" path = "../../examples/isolation/main.rs" -required-features = ["isolation"] +required-features = [ "isolation" ] [[example]] name = "run-iteration" From b8412f85cbd232ffac58f6d1d53a706e592e621e Mon Sep 17 00:00:00 2001 From: amrbashir Date: Wed, 12 Jun 2024 21:27:46 +0300 Subject: [PATCH 3/3] wry@0.41 --- Cargo.lock | 43 +++++++------------------------ core/tauri-runtime-wry/Cargo.toml | 4 +-- 2 files changed, 11 insertions(+), 36 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 410232691243..e9d724976f3b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1765,7 +1765,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.48.5", ] [[package]] @@ -3584,7 +3584,7 @@ dependencies = [ "urlpattern", "uuid", "webkit2gtk", - "webview2-com 0.31.0", + "webview2-com", "window-vibrancy", "windows 0.57.0", ] @@ -3721,7 +3721,7 @@ dependencies = [ "tracing", "url", "webkit2gtk", - "webview2-com 0.31.0", + "webview2-com", "windows 0.57.0", "wry", ] @@ -4505,20 +4505,6 @@ dependencies = [ "rustls-pki-types", ] -[[package]] -name = "webview2-com" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c914dd492a52f0377bef56fd1b6e74a79090f9ee631d625d5b505a00e4538b6" -dependencies = [ - "webview2-com-macros", - "webview2-com-sys 0.30.0", - "windows 0.56.0", - "windows-core 0.56.0", - "windows-implement 0.56.0", - "windows-interface 0.56.0", -] - [[package]] name = "webview2-com" version = "0.31.0" @@ -4526,7 +4512,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6516cfa64c6b3212686080eeec378e662c2af54bb2a5b2a22749673f5cb2226f" dependencies = [ "webview2-com-macros", - "webview2-com-sys 0.31.0", + "webview2-com-sys", "windows 0.57.0", "windows-core 0.57.0", "windows-implement 0.57.0", @@ -4544,17 +4530,6 @@ dependencies = [ "syn 2.0.57", ] -[[package]] -name = "webview2-com-sys" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a46bcf03482ec28eeb764ca788f67998cde4213adfbbfa90462622058530f5e" -dependencies = [ - "thiserror", - "windows 0.56.0", - "windows-core 0.56.0", -] - [[package]] name = "webview2-com-sys" version = "0.31.0" @@ -4970,9 +4945,9 @@ dependencies = [ [[package]] name = "wry" -version = "0.40.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd42682bad8d1efd0e0d0593770c602c13b8922bb1ca705cb845967de81bbc4" +checksum = "68b00c945786b02d7805d09a969fa36d0eee4e0bd4fb3ec2a79d2bf45a1b44cd" dependencies = [ "base64 0.22.0", "block", @@ -5004,9 +4979,9 @@ dependencies = [ "tracing", "webkit2gtk", "webkit2gtk-sys", - "webview2-com 0.30.0", - "windows 0.56.0", - "windows-core 0.56.0", + "webview2-com", + "windows 0.57.0", + "windows-core 0.57.0", "windows-version", "x11-dl", ] diff --git a/core/tauri-runtime-wry/Cargo.toml b/core/tauri-runtime-wry/Cargo.toml index f650df98b6cf..cce8c51d14c0 100644 --- a/core/tauri-runtime-wry/Cargo.toml +++ b/core/tauri-runtime-wry/Cargo.toml @@ -13,7 +13,7 @@ edition = { workspace = true } rust-version = { workspace = true } [dependencies] -wry = { version = "0.40", default-features = false, features = [ "drag-drop", "protocol", "os-webview" ] } +wry = { version = "0.41", default-features = false, features = [ "drag-drop", "protocol", "os-webview" ] } tao = { version = "0.28", default-features = false, features = [ "rwh_06" ] } tauri-runtime = { version = "2.0.0-beta.18", path = "../tauri-runtime" } tauri-utils = { version = "2.0.0-beta.17", path = "../tauri-utils" } @@ -53,4 +53,4 @@ objc-exception = [ "wry/objc-exception" ] linux-protocol-body = [ "wry/linux-body", "webkit2gtk/v2_40" ] tracing = [ "dep:tracing", "wry/tracing" ] macos-proxy = [ "wry/mac-proxy" ] -unstable = [ ] \ No newline at end of file +unstable = [ ]