Skip to content

Commit

Permalink
fix(deps): use no default features on tauri (tauri-apps#1402)
Browse files Browse the repository at this point in the history
* Use no default feature on tauri

* Add change file

* typo

* Revert lock file conflict

* Use wry on iOS
  • Loading branch information
Legend-Master authored and Sir-Thom committed Oct 22, 2024
1 parent 5f2f578 commit 894a6fe
Show file tree
Hide file tree
Showing 8 changed files with 48 additions and 11 deletions.
32 changes: 32 additions & 0 deletions .changes/no-default-tauri-features.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
"authenticator": patch
"autostart": patch
"barcode-scanner": patch
"biometric": patch
"cli": patch
"clipboard-manager": patch
"deep-link": patch
"dialog": patch
"fs": patch
"global-shortcut": patch
"http": patch
"localhost": patch
"log-plugin": patch
"nfc": patch
"notification": patch
"os": patch
"persisted-scope": patch
"positioner": patch
"process": patch
"shell": patch
"single-instance": patch
"sql": patch
"store": patch
"stronghold": patch
"updater": patch
"upload": patch
"websocket": patch
"window-state": patch
---

Use no default features on tauri for all plugins so that consumers can use `default-features = false` on tauri, note that this will still enable wry feature on iOS
10 changes: 0 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ resolver = "2"
[workspace.dependencies]
serde = { version = "1", features = ["derive"] }
log = "0.4"
tauri = "2.0.0-beta.25"
tauri = { version = "2.0.0-beta.25", default-features = false }
tauri-build = "2.0.0-beta.19"
tauri-plugin = "2.0.0-beta.19"
tauri-utils = "2.0.0-beta.19"
Expand Down
3 changes: 3 additions & 0 deletions plugins/clipboard-manager/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ tauri = { workspace = true }
log = { workspace = true }
thiserror = { workspace = true }

[target.'cfg(target_os = "ios")'.dependencies]
tauri = { workspace = true, features = ["wry"] }

[target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
arboard = "3"
image = "0.24"
3 changes: 3 additions & 0 deletions plugins/dialog/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ thiserror = { workspace = true }
dunce = { workspace = true }
tauri-plugin-fs = { path = "../fs", version = "2.0.0-beta.11" }

[target.'cfg(target_os = "ios")'.dependencies]
tauri = { workspace = true, features = ["wry"] }

[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.14", default-features = false, features = [ "tokio", "gtk3", "common-controls-v6" ] }
raw-window-handle = "0.6"
3 changes: 3 additions & 0 deletions plugins/notification/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ time = { version = "0.3", features = [ "serde", "parsing", "formatting" ] }
url = { version = "2", features = [ "serde" ] }
serde_repr = "0.1"

[target.'cfg(target_os = "ios")'.dependencies]
tauri = { workspace = true, features = ["wry"] }

[target."cfg(windows)".dependencies]
win7-notifications = { version = "0.4.4", optional = true }
windows-version = { version = "0.1", optional = true }
Expand Down
3 changes: 3 additions & 0 deletions plugins/shell/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,6 @@ regex = "1"
open = { version = "5", features = [ "shellexecute-on-windows" ] }
encoding_rs = "0.8"
os_pipe = "1"

[target.'cfg(target_os = "ios")'.dependencies]
tauri = { workspace = true, features = ["wry"] }
3 changes: 3 additions & 0 deletions plugins/store/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,6 @@ tauri = { workspace = true }
log = { workspace = true }
thiserror = { workspace = true }
dunce = { workspace = true }

[target.'cfg(target_os = "ios")'.dependencies]
tauri = { workspace = true, features = ["wry"] }

0 comments on commit 894a6fe

Please sign in to comment.