From e342473618167f611cb0148f61d13e3be795c8e9 Mon Sep 17 00:00:00 2001 From: lucasfernog Date: Wed, 28 Feb 2024 02:33:54 +0000 Subject: [PATCH] apply version updates --- .changes/clipboard-wayland.md | 5 - core/tauri-runtime-wry/CHANGELOG.md | 6 + core/tauri-runtime-wry/Cargo.toml | 43 ++-- core/tauri/CHANGELOG.md | 6 + core/tauri/Cargo.toml | 302 +++++++++++++--------------- tooling/cli/metadata.json | 2 +- 6 files changed, 176 insertions(+), 188 deletions(-) delete mode 100644 .changes/clipboard-wayland.md diff --git a/.changes/clipboard-wayland.md b/.changes/clipboard-wayland.md deleted file mode 100644 index 7b02c539f326..000000000000 --- a/.changes/clipboard-wayland.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'tauri-runtime-wry': 'patch' ---- - -Fix panic during intialization on wayland when using `clipboard` feature, instead propagate the error during API usage. diff --git a/core/tauri-runtime-wry/CHANGELOG.md b/core/tauri-runtime-wry/CHANGELOG.md index 7ca0af1718e6..42be6b839696 100644 --- a/core/tauri-runtime-wry/CHANGELOG.md +++ b/core/tauri-runtime-wry/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[0.14.5] + +### What's Changed + +- [`d42668ce`](https://www.github.com/tauri-apps/tauri/commit/d42668ce17494ab778f436aaa9b216d6db3f0b31)([#9003](https://www.github.com/tauri-apps/tauri/pull/9003)) Fix panic during intialization on wayland when using `clipboard` feature, instead propagate the error during API usage. + ## \[0.14.4] ### Bug Fixes diff --git a/core/tauri-runtime-wry/Cargo.toml b/core/tauri-runtime-wry/Cargo.toml index 59f1758e56bc..a8b0be0a679b 100644 --- a/core/tauri-runtime-wry/Cargo.toml +++ b/core/tauri-runtime-wry/Cargo.toml @@ -1,25 +1,22 @@ [package] name = "tauri-runtime-wry" -version = "0.14.4" -authors = ["Tauri Programme within The Commons Conservancy"] -categories = ["gui", "web-programming"] +version = "0.14.5" +authors = [ "Tauri Programme within The Commons Conservancy" ] +categories = [ "gui", "web-programming" ] license = "Apache-2.0 OR MIT" homepage = "https://tauri.app" repository = "https://github.com/tauri-apps/tauri" description = "Wry bindings to the Tauri runtime" edition = "2021" rust-version = "1.60" -exclude = ["CHANGELOG.md", "/target"] +exclude = [ "CHANGELOG.md", "/target" ] readme = "README.md" [dependencies] -wry = { version = "0.24.6", default-features = false, features = [ - "file-drop", - "protocol", -] } +wry = { version = "0.24.6", default-features = false, features = [ "file-drop", "protocol" ] } tauri-runtime = { version = "0.14.2", path = "../tauri-runtime" } tauri-utils = { version = "1.5.3", path = "../tauri-utils" } -uuid = { version = "1", features = ["v4"] } +uuid = { version = "1", features = [ "v4" ] } rand = "0.8" raw-window-handle = "0.5" tracing = { version = "0.1", optional = true } @@ -28,29 +25,29 @@ arboard = { version = "3", optional = true } [target."cfg(windows)".dependencies] webview2-com = "0.19.1" -[target."cfg(windows)".dependencies.windows] -version = "0.39.0" -features = ["Win32_Foundation"] + [target."cfg(windows)".dependencies.windows] + version = "0.39.0" + 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.15", features = ["v3_20"] } -webkit2gtk = { version = "0.18.2", features = ["v2_22"] } +gtk = { version = "0.15", features = [ "v3_20" ] } +webkit2gtk = { version = "0.18.2", features = [ "v2_22" ] } percent-encoding = "2.1" [target."cfg(any(target_os = \"ios\", target_os = \"macos\"))".dependencies] cocoa = "0.24" [features] -dox = ["wry/dox"] -devtools = ["wry/devtools", "tauri-runtime/devtools"] -system-tray = ["tauri-runtime/system-tray", "wry/tray"] +dox = [ "wry/dox" ] +devtools = [ "wry/devtools", "tauri-runtime/devtools" ] +system-tray = [ "tauri-runtime/system-tray", "wry/tray" ] macos-private-api = [ "wry/fullscreen", "wry/transparent", - "tauri-runtime/macos-private-api", + "tauri-runtime/macos-private-api" ] -objc-exception = ["wry/objc-exception"] -global-shortcut = ["tauri-runtime/global-shortcut"] -clipboard = ["tauri-runtime/clipboard", "arboard/wayland-data-control"] -linux-headers = ["wry/linux-headers", "webkit2gtk/v2_36"] -tracing = ["dep:tracing", "wry/tracing"] +objc-exception = [ "wry/objc-exception" ] +global-shortcut = [ "tauri-runtime/global-shortcut" ] +clipboard = [ "tauri-runtime/clipboard", "arboard/wayland-data-control" ] +linux-headers = [ "wry/linux-headers", "webkit2gtk/v2_36" ] +tracing = [ "dep:tracing", "wry/tracing" ] diff --git a/core/tauri/CHANGELOG.md b/core/tauri/CHANGELOG.md index aa865b03e870..0847727d1cf9 100644 --- a/core/tauri/CHANGELOG.md +++ b/core/tauri/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[1.6.1] + +### Dependencies + +- Upgraded to `tauri-runtime-wry@0.14.5` + ## \[1.6.0] ### New Features diff --git a/core/tauri/Cargo.toml b/core/tauri/Cargo.toml index 83c8a4116939..dfe0c032515a 100644 --- a/core/tauri/Cargo.toml +++ b/core/tauri/Cargo.toml @@ -1,16 +1,16 @@ [package] -authors = ["Tauri Programme within The Commons Conservancy"] -categories = ["gui", "web-programming"] +authors = [ "Tauri Programme within The Commons Conservancy" ] +categories = [ "gui", "web-programming" ] description = "Make tiny, secure apps for all desktop platforms with Tauri" edition = "2021" rust-version = "1.60" -exclude = ["/test", "/.scripts", "CHANGELOG.md", "/target"] +exclude = [ "/test", "/.scripts", "CHANGELOG.md", "/target" ] homepage = "https://tauri.app" license = "Apache-2.0 OR MIT" name = "tauri" readme = "README.md" repository = "https://github.com/tauri-apps/tauri" -version = "1.6.0" +version = "1.6.1" [package.metadata.docs.rs] no-default-features = true @@ -35,43 +35,35 @@ features = [ "process-exit", "protocol-asset", "process-command-api", - "shell-open", + "shell-open" ] -rustdoc-args = ["--cfg", "doc_cfg"] +rustdoc-args = [ "--cfg", "doc_cfg" ] default-target = "x86_64-unknown-linux-gnu" targets = [ "x86_64-pc-windows-msvc", "x86_64-unknown-linux-gnu", - "x86_64-apple-darwin", + "x86_64-apple-darwin" ] [package.metadata.cargo-udeps.ignore] -normal = ["reqwest", "nix"] +normal = [ "reqwest", "nix" ] [dependencies] -serde_json = { version = "1.0", features = ["raw_value", "preserve_order"] } -serde = { version = "1.0", features = ["derive"] } -tokio = { version = "1", features = [ - "rt", - "rt-multi-thread", - "sync", - "fs", - "io-util", -] } +serde_json = { version = "1.0", features = [ "raw_value", "preserve_order" ] } +serde = { version = "1.0", features = [ "derive" ] } +tokio = { version = "1", features = [ "rt", "rt-multi-thread", "sync", "fs", "io-util" ] } futures-util = "0.3" -uuid = { version = "1", features = ["v4"] } +uuid = { version = "1", features = [ "v4" ] } url = { version = "2.3" } anyhow = "1.0" thiserror = "1.0" once_cell = "1" tauri-runtime = { version = "0.14.2", path = "../tauri-runtime" } tauri-macros = { version = "1.4.3", path = "../tauri-macros" } -tauri-utils = { version = "1.5.3", features = [ - "resources", -], path = "../tauri-utils" } -tauri-runtime-wry = { version = "0.14.4", path = "../tauri-runtime-wry", optional = true } +tauri-utils = { version = "1.5.3", features = [ "resources" ], path = "../tauri-utils" } +tauri-runtime-wry = { version = "0.14.5", path = "../tauri-runtime-wry", optional = true } rand = "0.8" -semver = { version = "1.0", features = ["serde"] } +semver = { version = "1.0", features = [ "serde" ] } serde_repr = "0.1" state = "0.5" tar = "0.4.38" @@ -84,17 +76,14 @@ dirs-next = "2.0" percent-encoding = "2.2" base64 = { version = "0.21", optional = true } clap = { version = "3", optional = true } -reqwest = { version = "0.11", features = ["json", "stream"], optional = true } -bytes = { version = "1", features = ["serde"], optional = true } +reqwest = { version = "0.11", features = [ "json", "stream" ], optional = true } +bytes = { version = "1", features = [ "serde" ], optional = true } open = { version = "3.2", optional = true } shared_child = { version = "1.0", optional = true } os_pipe = { version = "1.0", optional = true } raw-window-handle = "0.5" minisign-verify = { version = "0.2", optional = true } -time = { version = "0.3", features = [ - "parsing", - "formatting", -], optional = true } +time = { version = "0.3", features = [ "parsing", "formatting" ], optional = true } os_info = { version = "3", optional = true } regex = { version = "1", optional = true } glob = "0.3" @@ -106,24 +95,17 @@ ico = { version = "0.2.0", optional = true } encoding_rs = "0.8.31" sys-locale = { version = "0.2.3", optional = true } tracing = { version = "0.1", optional = true } -indexmap = { version = "1", features = ["std", "serde"], optional = true } +indexmap = { version = "1", features = [ "std", "serde" ], optional = true } [target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies] -rfd = { version = "0.10", optional = true, features = [ - "gtk3", - "common-controls-v6", -] } +rfd = { version = "0.10", optional = true, features = [ "gtk3", "common-controls-v6" ] } notify-rust = { version = "4.5", optional = true } [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies] -gtk = { version = "0.15", features = ["v3_20"] } +gtk = { version = "0.15", features = [ "v3_20" ] } glib = "0.15" -webkit2gtk = { version = "0.18.2", features = ["v2_22"] } -nix = { version = "0.26.0", default-features = false, features = [ - "user", - "socket", - "uio", -], optional = true } +webkit2gtk = { version = "0.18.2", features = [ "v2_22" ] } +nix = { version = "0.26.0", default-features = false, features = [ "user", "socket", "uio" ], optional = true } [target."cfg(target_os = \"macos\")".dependencies] embed_plist = "1.2" @@ -135,9 +117,9 @@ dunce = "1" webview2-com = "0.19.1" win7-notifications = { version = "0.4", optional = true } -[target."cfg(windows)".dependencies.windows] -version = "0.39.0" -features = ["Win32_Foundation"] + [target."cfg(windows)".dependencies.windows] + version = "0.39.0" + features = [ "Win32_Foundation" ] [build-dependencies] heck = "0.4" @@ -148,57 +130,61 @@ mockito = "0.31" proptest = "1.0.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"] } +tauri = { path = ".", default-features = false, features = [ "wry" ] } tokio-test = "0.4.2" -tokio = { version = "1", features = ["full"] } +tokio = { version = "1", features = [ "full" ] } cargo_toml = "0.11" [features] -default = ["wry", "compression", "objc-exception"] -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-protocol-headers = ["tauri-runtime-wry/linux-headers", "webkit2gtk/v2_36"] -isolation = ["tauri-utils/isolation", "tauri-macros/isolation"] -custom-protocol = ["tauri-macros/custom-protocol"] +default = [ "wry", "compression", "objc-exception" ] +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-protocol-headers = [ "tauri-runtime-wry/linux-headers", "webkit2gtk/v2_36" ] +isolation = [ "tauri-utils/isolation", "tauri-macros/isolation" ] +custom-protocol = [ "tauri-macros/custom-protocol" ] updater = [ "minisign-verify", "time", "base64", "http-api", "dialog-ask", - "fs-extract-api", + "fs-extract-api" ] -http-api = ["reqwest", "bytes", "indexmap"] -http-multipart = ["reqwest/multipart"] -os-api = ["sys-locale"] -shell-open-api = ["open", "regex", "tauri-macros/shell-scope"] -fs-extract-api = ["zip"] -reqwest-client = ["http-api"] -reqwest-native-tls-vendored = ["native-tls-vendored"] -native-tls-vendored = ["reqwest/native-tls-vendored"] -process-command-api = ["shared_child", "os_pipe"] +http-api = [ "reqwest", "bytes", "indexmap" ] +http-multipart = [ "reqwest/multipart" ] +os-api = [ "sys-locale" ] +shell-open-api = [ "open", "regex", "tauri-macros/shell-scope" ] +fs-extract-api = [ "zip" ] +reqwest-client = [ "http-api" ] +reqwest-native-tls-vendored = [ "native-tls-vendored" ] +native-tls-vendored = [ "reqwest/native-tls-vendored" ] +process-command-api = [ "shared_child", "os_pipe" ] global-shortcut = [ "tauri-runtime/global-shortcut", - "tauri-runtime-wry/global-shortcut", + "tauri-runtime-wry/global-shortcut" ] -clipboard = ["tauri-runtime/clipboard", "tauri-runtime-wry/clipboard"] -dialog = ["rfd"] -notification = ["notify-rust", "nix"] -cli = ["clap"] -system-tray = ["tauri-runtime/system-tray", "tauri-runtime-wry/system-tray"] -devtools = ["tauri-runtime/devtools", "tauri-runtime-wry/devtools"] -dox = ["tauri-runtime-wry/dox"] +clipboard = [ "tauri-runtime/clipboard", "tauri-runtime-wry/clipboard" ] +dialog = [ "rfd" ] +notification = [ "notify-rust", "nix" ] +cli = [ "clap" ] +system-tray = [ "tauri-runtime/system-tray", "tauri-runtime-wry/system-tray" ] +devtools = [ "tauri-runtime/devtools", "tauri-runtime-wry/devtools" ] +dox = [ "tauri-runtime-wry/dox" ] macos-private-api = [ "tauri-runtime/macos-private-api", - "tauri-runtime-wry/macos-private-api", + "tauri-runtime-wry/macos-private-api" ] -windows7-compat = ["win7-notifications"] -window-data-url = ["data-url"] +windows7-compat = [ "win7-notifications" ] +window-data-url = [ "data-url" ] api-all = [ "clipboard-all", "dialog-all", @@ -212,17 +198,17 @@ api-all = [ "protocol-all", "shell-all", "window-all", - "app-all", + "app-all" ] -clipboard-all = ["clipboard-write-text", "clipboard-read-text"] -clipboard-read-text = ["clipboard"] -clipboard-write-text = ["clipboard"] -dialog-all = ["dialog-open", "dialog-save", "dialog-message", "dialog-ask"] -dialog-ask = ["dialog"] -dialog-confirm = ["dialog"] -dialog-message = ["dialog"] -dialog-open = ["dialog"] -dialog-save = ["dialog"] +clipboard-all = [ "clipboard-write-text", "clipboard-read-text" ] +clipboard-read-text = [ "clipboard" ] +clipboard-write-text = [ "clipboard" ] +dialog-all = [ "dialog-open", "dialog-save", "dialog-message", "dialog-ask" ] +dialog-ask = [ "dialog" ] +dialog-confirm = [ "dialog" ] +dialog-message = [ "dialog" ] +dialog-open = [ "dialog" ] +dialog-save = [ "dialog" ] fs-all = [ "fs-copy-file", "fs-create-dir", @@ -232,35 +218,33 @@ fs-all = [ "fs-remove-dir", "fs-remove-file", "fs-rename-file", - "fs-write-file", -] -fs-copy-file = [] -fs-create-dir = [] -fs-exists = [] -fs-read-file = [] -fs-read-dir = [] -fs-remove-dir = [] -fs-remove-file = [] -fs-rename-file = [] -fs-write-file = [] -global-shortcut-all = ["global-shortcut"] -http-all = ["http-request"] -http-request = ["http-api"] -notification-all = ["notification", "dialog-ask"] -os-all = ["os_info", "os-api"] -path-all = [] -process-all = ["process-relaunch", "process-exit"] -process-exit = [] -process-relaunch = [] -process-relaunch-dangerous-allow-symlink-macos = [ - "tauri-utils/process-relaunch-dangerous-allow-symlink-macos", + "fs-write-file" ] -protocol-all = ["protocol-asset"] -protocol-asset = [] -shell-all = ["shell-execute", "shell-sidecar", "shell-open"] -shell-execute = ["process-command-api", "regex", "tauri-macros/shell-scope"] -shell-sidecar = ["process-command-api", "regex", "tauri-macros/shell-scope"] -shell-open = ["shell-open-api"] +fs-copy-file = [ ] +fs-create-dir = [ ] +fs-exists = [ ] +fs-read-file = [ ] +fs-read-dir = [ ] +fs-remove-dir = [ ] +fs-remove-file = [ ] +fs-rename-file = [ ] +fs-write-file = [ ] +global-shortcut-all = [ "global-shortcut" ] +http-all = [ "http-request" ] +http-request = [ "http-api" ] +notification-all = [ "notification", "dialog-ask" ] +os-all = [ "os_info", "os-api" ] +path-all = [ ] +process-all = [ "process-relaunch", "process-exit" ] +process-exit = [ ] +process-relaunch = [ ] +process-relaunch-dangerous-allow-symlink-macos = [ "tauri-utils/process-relaunch-dangerous-allow-symlink-macos" ] +protocol-all = [ "protocol-asset" ] +protocol-asset = [ ] +shell-all = [ "shell-execute", "shell-sidecar", "shell-open" ] +shell-execute = [ "process-command-api", "regex", "tauri-macros/shell-scope" ] +shell-sidecar = [ "process-command-api", "regex", "tauri-macros/shell-scope" ] +shell-open = [ "shell-open-api" ] window-all = [ "window-create", "window-center", @@ -294,48 +278,48 @@ window-all = [ "window-set-cursor-position", "window-set-ignore-cursor-events", "window-start-dragging", - "window-print", + "window-print" ] -window-create = [] -window-center = [] -window-request-user-attention = [] -window-set-resizable = [] -window-set-maximizable = [] -window-set-minimizable = [] -window-set-closable = [] -window-set-title = [] -window-maximize = [] -window-unmaximize = [] -window-minimize = [] -window-unminimize = [] -window-show = [] -window-hide = [] -window-close = [] -window-set-decorations = [] -window-set-always-on-top = [] -window-set-content-protected = [] -window-set-size = [] -window-set-min-size = [] -window-set-max-size = [] -window-set-position = [] -window-set-fullscreen = [] -window-set-focus = [] -window-set-icon = [] -window-set-skip-taskbar = [] -window-set-cursor-grab = [] -window-set-cursor-visible = [] -window-set-cursor-icon = [] -window-set-cursor-position = [] -window-set-ignore-cursor-events = [] -window-start-dragging = [] -window-print = [] -app-all = ["app-show", "app-hide"] -app-show = [] -app-hide = [] -config-json5 = ["tauri-macros/config-json5"] -config-toml = ["tauri-macros/config-toml"] -icon-ico = ["infer", "ico"] -icon-png = ["infer", "png"] +window-create = [ ] +window-center = [ ] +window-request-user-attention = [ ] +window-set-resizable = [ ] +window-set-maximizable = [ ] +window-set-minimizable = [ ] +window-set-closable = [ ] +window-set-title = [ ] +window-maximize = [ ] +window-unmaximize = [ ] +window-minimize = [ ] +window-unminimize = [ ] +window-show = [ ] +window-hide = [ ] +window-close = [ ] +window-set-decorations = [ ] +window-set-always-on-top = [ ] +window-set-content-protected = [ ] +window-set-size = [ ] +window-set-min-size = [ ] +window-set-max-size = [ ] +window-set-position = [ ] +window-set-fullscreen = [ ] +window-set-focus = [ ] +window-set-icon = [ ] +window-set-skip-taskbar = [ ] +window-set-cursor-grab = [ ] +window-set-cursor-visible = [ ] +window-set-cursor-icon = [ ] +window-set-cursor-position = [ ] +window-set-ignore-cursor-events = [ ] +window-start-dragging = [ ] +window-print = [ ] +app-all = [ "app-show", "app-hide" ] +app-show = [ ] +app-hide = [ ] +config-json5 = [ "tauri-macros/config-json5" ] +config-toml = [ "tauri-macros/config-toml" ] +icon-ico = [ "infer", "ico" ] +icon-png = [ "infer", "png" ] [[example]] name = "commands" @@ -348,7 +332,7 @@ path = "../../examples/helloworld/main.rs" [[example]] name = "multiwindow" path = "../../examples/multiwindow/main.rs" -required-features = ["window-create"] +required-features = [ "window-create" ] [[example]] name = "parent-window" @@ -357,7 +341,7 @@ path = "../../examples/parent-window/main.rs" [[example]] name = "navigation" path = "../../examples/navigation/main.rs" -required-features = ["window-create"] +required-features = [ "window-create" ] [[example]] name = "splashscreen" @@ -374,4 +358,4 @@ path = "../../examples/streaming/main.rs" [[example]] name = "isolation" path = "../../examples/isolation/main.rs" -required-features = ["isolation"] +required-features = [ "isolation" ] diff --git a/tooling/cli/metadata.json b/tooling/cli/metadata.json index 604a96d1168c..1f749a43ff2e 100644 --- a/tooling/cli/metadata.json +++ b/tooling/cli/metadata.json @@ -3,6 +3,6 @@ "version": "1.5.10", "node": ">= 10.0.0" }, - "tauri": "1.6.0", + "tauri": "1.6.1", "tauri-build": "1.5.1" }