Skip to content

Commit 9580df1

Browse files
chore(deps): upgrade gtk to 0.18 (#8084)
Co-authored-by: Lucas Nogueira <lucas@tauri.app>
1 parent a0f7b88 commit 9580df1

File tree

11 files changed

+143
-134
lines changed

11 files changed

+143
-134
lines changed

.changes/gtk018.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"tauri-runtime": 'minor:deps'
3+
"tauri-runtime-wry": 'minor:deps'
4+
"tauri": 'minor:deps'
5+
---
6+
7+
Upgrade `gtk` to 0.18.

.changes/wry-0.34.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"tauri": patch:deps
3+
"tauri-runtime-wry": patch:deps
4+
---
5+
6+
Updated to wry@0.34, removing the `dox` feature flag.

.github/workflows/lint-core.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,7 @@ jobs:
4949
matrix:
5050
clippy:
5151
- { args: '', key: 'empty' }
52-
- {
53-
args: '--features compression,wry,linux-ipc-protocol,isolation,custom-protocol,tray-icon,test',
54-
key: 'all'
55-
}
52+
- { args: '--all-features', key: 'all' }
5653
- { args: '--features custom-protocol', key: 'custom-protocol' }
5754

5855
steps:

.github/workflows/test-core.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,8 @@ jobs:
6767
command: 'build'
6868
}
6969
features:
70-
- {
71-
args: --no-default-features,
72-
key: no-default
73-
}
74-
- {
75-
args: --features compression,wry,linux-ipc-protocol,isolation,custom-protocol,tray-icon,test,
76-
key: all
77-
}
70+
- { args: --no-default-features, key: no-default }
71+
- { args: --all-features, key: all }
7872

7973
steps:
8074
- uses: actions/checkout@v4
@@ -91,7 +85,7 @@ jobs:
9185
if: contains(matrix.platform.target, 'unknown-linux')
9286
run: |
9387
sudo apt-get update
94-
sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev
88+
sudo apt-get install -y webkit2gtk-4.1 libxdo-dev libayatana-appindicator3-dev
9589
9690
- uses: Swatinem/rust-cache@v2
9791
with:

core/tauri-runtime-wry/Cargo.toml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,8 @@ license = { workspace = true }
1212
edition = { workspace = true }
1313
rust-version = { workspace = true }
1414

15-
[package.metadata.docs.rs]
16-
features = [ "dox" ]
17-
1815
[dependencies]
19-
wry = { version = "0.33", default-features = false, features = [ "tao", "file-drop", "protocol" ] }
16+
wry = { version = "0.34.1", default-features = false, features = [ "tao", "file-drop", "protocol" ] }
2017
tauri-runtime = { version = "1.0.0-alpha.3", path = "../tauri-runtime" }
2118
tauri-utils = { version = "2.0.0-alpha.9", path = "../tauri-utils" }
2219
raw-window-handle = "0.5"
@@ -30,8 +27,8 @@ webview2-com = "0.25"
3027
features = [ "Win32_Foundation" ]
3128

3229
[target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
33-
gtk = { version = "0.16", features = [ "v3_24" ] }
34-
webkit2gtk = { version = "1.1", features = [ "v2_38" ] }
30+
gtk = { version = "0.18", features = [ "v3_24" ] }
31+
webkit2gtk = { version = "=2.0", features = [ "v2_38" ] }
3532
percent-encoding = "2.1"
3633

3734
[target."cfg(any(target_os = \"ios\", target_os = \"macos\"))".dependencies]
@@ -41,7 +38,6 @@ cocoa = "0.24"
4138
jni = "0.21"
4239

4340
[features]
44-
dox = [ "wry/dox" ]
4541
devtools = [ "wry/devtools", "tauri-runtime/devtools" ]
4642
macos-private-api = [
4743
"wry/fullscreen",

core/tauri-runtime/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ version = "0.48"
3838
features = [ "Win32_Foundation" ]
3939

4040
[target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
41-
gtk = { version = "0.16", features = [ "v3_24" ] }
41+
gtk = { version = "0.18", features = [ "v3_24" ] }
4242

4343
[target."cfg(target_os = \"android\")".dependencies]
4444
jni = "0.21"

core/tauri/Cargo.toml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ features = [
2323
"icon-png",
2424
"protocol-asset",
2525
"test",
26-
"dox"
2726
]
2827
rustdoc-args = [ "--cfg", "doc_cfg" ]
2928
default-target = "x86_64-unknown-linux-gnu"
@@ -73,13 +72,12 @@ ico = { version = "0.3.0", optional = true }
7372
http-range = { version = "0.1.4", optional = true }
7473

7574
[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]
76-
muda = { version = "0.8", default-features = false }
77-
tray-icon = { version = "0.8", default-features = false, optional = true }
75+
muda = { version = "0.10", default-features = false }
76+
tray-icon = { version = "0.10", default-features = false, optional = true }
7877

7978
[target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
80-
gtk = { version = "0.16", features = [ "v3_24" ] }
81-
glib = "0.16"
82-
webkit2gtk = { version = "1.1", features = [ "v2_38" ] }
79+
gtk = { version = "0.18", features = [ "v3_24" ] }
80+
webkit2gtk = { version = "=2.0", features = [ "v2_38" ] }
8381

8482
[target."cfg(target_os = \"macos\")".dependencies]
8583
embed_plist = "1.2"
@@ -145,7 +143,6 @@ native-tls = [ "reqwest/native-tls" ]
145143
native-tls-vendored = [ "reqwest/native-tls-vendored" ]
146144
rustls-tls = [ "reqwest/rustls-tls" ]
147145
devtools = [ "tauri-runtime/devtools", "tauri-runtime-wry/devtools" ]
148-
dox = [ "tauri-runtime-wry/dox" ]
149146
process-relaunch-dangerous-allow-symlink-macos = [ "tauri-utils/process-relaunch-dangerous-allow-symlink-macos" ]
150147
macos-private-api = [
151148
"tauri-runtime/macos-private-api",

core/tauri/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
//!
1515
//! - **wry** *(enabled by default)*: Enables the [wry](https://github.com/tauri-apps/wry) runtime. Only disable it if you want a custom runtime.
1616
//! - **test**: Enables the [`test`] module exposing unit test helpers.
17-
//! - **dox**: Internal feature to generate Rust documentation without linking on Linux.
1817
//! - **objc-exception**: Wrap each msg_send! in a @try/@catch and panics if an exception is caught, preventing Objective-C from unwinding into Rust.
1918
//! - **linux-ipc-protocol**: Use custom protocol for faster IPC on Linux. Requires webkit2gtk v2.40 or above.
2019
//! - **linux-libxdo**: Enables linking to libxdo which enables Cut, Copy, Paste and SelectAll menu items to work on Linux.

core/tauri/src/test/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
//! }
2828
//!
2929
//! fn main() {
30-
//! let app = create_app(tauri::Builder::default());
30+
//! // let app = create_app(tauri::Builder::default());
3131
//! // app.run(|_handle, _event| {});
3232
//! }
3333
//!
@@ -190,7 +190,7 @@ pub fn mock_app() -> App<MockRuntime> {
190190
/// }
191191
///
192192
/// fn main() {
193-
/// let app = create_app(tauri::Builder::default());
193+
/// // let app = create_app(tauri::Builder::default());
194194
/// // app.run(|_handle, _event| {});}
195195
/// }
196196
///

core/tauri/src/window/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1160,9 +1160,9 @@ impl<R: Runtime> Window<R> {
11601160
/// main_window.with_webview(|webview| {
11611161
/// #[cfg(target_os = "linux")]
11621162
/// {
1163-
/// // see https://docs.rs/webkit2gtk/0.18.2/webkit2gtk/struct.WebView.html
1164-
/// // and https://docs.rs/webkit2gtk/0.18.2/webkit2gtk/trait.WebViewExt.html
1165-
/// use webkit2gtk::traits::WebViewExt;
1163+
/// // see https://docs.rs/webkit2gtk/2.0.0/webkit2gtk/struct.WebView.html
1164+
/// // and https://docs.rs/webkit2gtk/2.0.0/webkit2gtk/trait.WebViewExt.html
1165+
/// use webkit2gtk::WebViewExt;
11661166
/// webview.inner().set_zoom_level(4.);
11671167
/// }
11681168
///

0 commit comments

Comments
 (0)