Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply Version Updates From Current Changes (v1) #9013

Merged
merged 1 commit into from
Feb 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .changes/clipboard-wayland.md

This file was deleted.

6 changes: 6 additions & 0 deletions core/tauri-runtime-wry/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
43 changes: 20 additions & 23 deletions core/tauri-runtime-wry/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 }
Expand All @@ -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" ]
6 changes: 6 additions & 0 deletions core/tauri/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## \[1.6.1]

### Dependencies

- Upgraded to `[email protected]`

## \[1.6.0]

### New Features
Expand Down
Loading
Loading