Skip to content

Commit

Permalink
refactor: move Linux custom protocol headers support behind feature f…
Browse files Browse the repository at this point in the history
…lag (#5683)
  • Loading branch information
lucasfernog committed Nov 24, 2022
1 parent 15ebeb1 commit d710946
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 3 deletions.
5 changes: 5 additions & 0 deletions .changes/linux-headers.md
@@ -0,0 +1,5 @@
---
"tauri": patch
---

Moved the custom protocol headers support on Linux behind the `linux-protocol-headers` Cargo feature to enhance compatibility with older Linux distributions.
2 changes: 1 addition & 1 deletion .github/workflows/lint-fmt-core.yml
Expand Up @@ -50,7 +50,7 @@ jobs:
clippy:
- { args: '', key: 'empty' }
- {
args: '--features compression,wry,isolation,custom-protocol,api-all,cli,updater,system-tray,windows7-compat,http-multipart',
args: '--features compression,wry,linux-protocol-headers,isolation,custom-protocol,api-all,cli,updater,system-tray,windows7-compat,http-multipart',
key: 'all'
}
- { args: '--features custom-protocol', key: 'custom-protocol' }
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-core.yml
Expand Up @@ -56,7 +56,7 @@ jobs:
key: api-all
}
- {
args: --features compression,wry,isolation,custom-protocol,api-all,cli,updater,system-tray,windows7-compat,http-multipart,
args: --features compression,wry,linux-protocol-headers,isolation,custom-protocol,api-all,cli,updater,system-tray,windows7-compat,http-multipart,
key: all
}

Expand Down
3 changes: 2 additions & 1 deletion core/tauri-runtime-wry/Cargo.toml
Expand Up @@ -13,7 +13,7 @@ exclude = [ "CHANGELOG.md", "/target" ]
readme = "README.md"

[dependencies]
wry = { version = "0.22", default-features = false, features = [ "file-drop", "protocol" ] }
wry = { version = "0.22.4", default-features = false, features = [ "file-drop", "protocol" ] }
tauri-runtime = { version = "0.12.0", path = "../tauri-runtime" }
tauri-utils = { version = "1.2.0", path = "../tauri-utils" }
uuid = { version = "1", features = [ "v4" ] }
Expand Down Expand Up @@ -47,3 +47,4 @@ macos-private-api = [
objc-exception = [ "wry/objc-exception" ]
global-shortcut = [ "tauri-runtime/global-shortcut" ]
clipboard = [ "tauri-runtime/clipboard" ]
linux-headers = ["wry/linux-headers"]
1 change: 1 addition & 0 deletions core/tauri/Cargo.toml
Expand Up @@ -129,6 +129,7 @@ default = [ "wry", "compression", "objc-exception" ]
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" ]
isolation = [ "tauri-utils/isolation", "tauri-macros/isolation" ]
custom-protocol = [ "tauri-macros/custom-protocol" ]
updater = [
Expand Down
1 change: 1 addition & 0 deletions core/tauri/src/lib.rs
Expand Up @@ -13,6 +13,7 @@
//! - **wry** *(enabled by default)*: Enables the [wry](https://github.com/tauri-apps/wry) runtime. Only disable it if you want a custom runtime.
//! - **dox**: Internal feature to generate Rust documentation without linking on Linux.
//! - **objc-exception**: Wrap each msg_send! in a @try/@catch and panics if an exception is caught, preventing Objective-C from unwinding into Rust.
//! - **linux-protocol-headers**: Enables headers support for custom protocol requests on Linux. Requires webkit2gtk v2.36 or above.
//! - **isolation**: Enables the isolation pattern. Enabled by default if the `tauri > pattern > use` config option is set to `isolation` on the `tauri.conf.json` file.
//! - **custom-protocol**: Feature managed by the Tauri CLI. When enabled, Tauri assumes a production environment instead of a development one.
//! - **updater**: Enables the application auto updater. Enabled by default if the `updater` config is defined on the `tauri.conf.json` file.
Expand Down

0 comments on commit d710946

Please sign in to comment.