Skip to content
Merged
Show file tree
Hide file tree
Changes from 14 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: 5 additions & 0 deletions .changes/workspace-deps.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"tauri": "patch:enhance"
---

Better use of workspace dependency management
13 changes: 12 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,18 @@ license = "Apache-2.0 OR MIT"
edition = "2021"
rust-version = "1.90"

[workspace.dependencies]
tauri = { version = "2.11.5", path = "./crates/tauri", default-features = false }
tauri-runtime = { version = "2.11.3", path = "./crates/tauri-runtime" }
tauri-runtime-wry = { version = "2.11.4", path = "./crates/tauri-runtime-wry", default-features = false }
tauri-build = { version = "2.6.3", path = "./crates/tauri-build", default-features = false }
tauri-macros = { version = "2.6.3", path = "./crates/tauri-macros" }
tauri-codegen = { version = "2.6.3", path = "./crates/tauri-codegen" }
tauri-utils = { version = "2.9.3", path = "./crates/tauri-utils" }
tauri-plugin = { version = "2.6.3", path = "./crates/tauri-plugin", default-features = false }
tauri-bundler = { version = "2.9.4", path = "./crates/tauri-bundler", default-features = false }
tauri-macos-sign = { version = "2.3.4", path = "./crates/tauri-macos-sign" }

Comment thread
sftse marked this conversation as resolved.
Resolved
# default to small, optimized workspace release binaries
[profile.release]
panic = "abort"
Expand All @@ -71,4 +83,3 @@ opt-level = "s"
schemars_derive = { git = 'https://github.com/tauri-apps/schemars.git', branch = 'feat/preserve-description-newlines' }
tauri = { path = "./crates/tauri" }
tauri-plugin = { path = "./crates/tauri-plugin" }
tauri-utils = { path = "./crates/tauri-utils" }
4 changes: 2 additions & 2 deletions bench/tests/cpu_intensive/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ edition = "2021"
rust-version = "1.90"

[build-dependencies]
tauri-build = { path = "../../../../crates/tauri-build", features = [
tauri-build = { workspace = true, default-features = true, features = [
"codegen",
] }

[dependencies]
serde_json = "1"
serde = { version = "1", features = ["derive"] }
tauri = { path = "../../../../crates/tauri", features = [] }
tauri = { workspace = true, default-features = true }
4 changes: 2 additions & 2 deletions bench/tests/files_transfer/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ edition = "2021"
rust-version = "1.90"

[build-dependencies]
tauri-build = { path = "../../../../crates/tauri-build", features = [
tauri-build = { workspace = true, default-features = true, features = [
"codegen",
] }

[dependencies]
serde_json = "1"
serde = { version = "1", features = ["derive"] }
tauri = { path = "../../../../crates/tauri", features = [] }
tauri = { workspace = true, default-features = true }
4 changes: 2 additions & 2 deletions bench/tests/helloworld/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ edition = "2021"
rust-version = "1.90"

[build-dependencies]
tauri-build = { path = "../../../../crates/tauri-build", features = [
tauri-build = { workspace = true, default-features = true, features = [
"codegen",
] }

[dependencies]
serde_json = "1"
serde = { version = "1", features = ["derive"] }
tauri = { path = "../../../../crates/tauri", features = [] }
tauri = { workspace = true, default-features = true }
7 changes: 2 additions & 5 deletions crates/tauri-build/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,8 @@ targets = [
[dependencies]
anyhow = "1"
quote = { version = "1", optional = true }
tauri-codegen = { version = "2.6.3", path = "../tauri-codegen", optional = true }
tauri-utils = { version = "2.9.3", path = "../tauri-utils", features = [
"build-2",
"resources",
] }
tauri-codegen = { workspace = true, optional = true }
tauri-utils = { workspace = true, features = ["build-2", "resources"] }
cargo_toml = "1.0"
serde = "1"
serde_json = "1"
Expand Down
6 changes: 2 additions & 4 deletions crates/tauri-bundler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ rust-version = "1.90"
exclude = ["CHANGELOG.md", "/target", "rustfmt.toml"]

[dependencies]
tauri-utils = { version = "2.9.3", path = "../tauri-utils", features = [
"resources",
] }
tauri-utils = { workspace = true, features = ["resources"] }
image = "0.25"
flate2 = "1"
thiserror = "2"
Expand Down Expand Up @@ -58,7 +56,7 @@ features = ["Win32_System_SystemInformation", "Win32_System_Diagnostics_Debug"]
[target."cfg(target_os = \"macos\")".dependencies]
icns = { package = "tauri-icns", version = "0.1" }
time = { version = "0.3", features = ["formatting"] }
tauri-macos-sign = { version = "2.3.4", path = "../tauri-macos-sign" }
tauri-macos-sign = { workspace = true }

[target."cfg(target_os = \"linux\")".dependencies]
heck = "0.5"
Expand Down
6 changes: 3 additions & 3 deletions crates/tauri-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ sublime_fuzzy = "0.7"
clap_complete = "4"
clap = { version = "4", features = ["derive", "env"] }
thiserror = "2"
tauri-bundler = { version = "2.9.4", default-features = false, path = "../tauri-bundler" }
tauri-bundler = { workspace = true }
Comment thread
sftse marked this conversation as resolved.
Resolved
colored = "3"
serde = { version = "1", features = ["derive"] }
serde_json = { version = "1", features = ["preserve_order"] }
Expand All @@ -59,7 +59,7 @@ shared_child = "1"
duct = "1.0"
toml_edit = { version = "0.25", features = ["serde"] }
json-patch = "4"
tauri-utils = { version = "2.9.3", path = "../tauri-utils", features = [
tauri-utils = { workspace = true, features = [
"isolation",
"schema",
"config-json5",
Expand Down Expand Up @@ -134,7 +134,7 @@ libc = "0.2"

[target."cfg(target_os = \"macos\")".dependencies]
plist = "1"
tauri-macos-sign = { version = "2.3.4", path = "../tauri-macos-sign" }
tauri-macos-sign = { workspace = true }
object = { version = "0.39", default-features = false, features = [
"macho",
"read_core",
Expand Down
4 changes: 1 addition & 3 deletions crates/tauri-codegen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ quote = "1"
syn = "2"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
tauri-utils = { version = "2.9.3", path = "../tauri-utils", features = [
"build-2",
] }
tauri-utils = { workspace = true, features = ["build-2"] }
thiserror = "2"
walkdir = "2"
brotli = { version = "8", optional = true, default-features = false, features = [
Expand Down
4 changes: 2 additions & 2 deletions crates/tauri-macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ proc-macro2 = { version = "1", features = ["span-locations"] }
quote = "1"
syn = { version = "2", features = ["full"] }
heck = "0.5"
tauri-codegen = { version = "2.6.3", default-features = false, path = "../tauri-codegen" }
Comment thread
sftse marked this conversation as resolved.
Resolved
tauri-utils = { version = "2.9.3", path = "../tauri-utils" }
tauri-codegen = { workspace = true }
tauri-utils = { workspace = true }

[features]
custom-protocol = []
Expand Down
4 changes: 1 addition & 3 deletions crates/tauri-plugin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ runtime = []
[dependencies]
anyhow = { version = "1", optional = true }
serde = { version = "1", optional = true }
tauri-utils = { version = "2.9.3", default-features = false, features = [
"build-2",
], path = "../tauri-utils" }
tauri-utils = { workspace = true, features = ["build-2"] }
serde_json = { version = "1", optional = true }
glob = { version = "0.3", optional = true }
# Our code requires at least 0.8.21 so don't simplify this to 0.8
Expand Down
4 changes: 2 additions & 2 deletions crates/tauri-runtime-wry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ wry = { version = "0.56.0", default-features = false, features = [
"linux-body",
] }
tao = { version = "0.36.0", default-features = false, features = ["rwh_06"] }
tauri-runtime = { version = "2.11.3", path = "../tauri-runtime" }
tauri-utils = { version = "2.9.3", path = "../tauri-utils" }
tauri-runtime = { workspace = true }
tauri-utils = { workspace = true }
raw-window-handle = "0.6"
http = "1"
url = "2"
Expand Down
2 changes: 1 addition & 1 deletion crates/tauri-runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ targets = [
serde = { version = "1", features = ["derive"] }
serde_json = "1"
thiserror = "2"
tauri-utils = { version = "2.9.3", path = "../tauri-utils" }
tauri-utils = { workspace = true }
http = "1"
raw-window-handle = "0.6"
url = { version = "2" }
Expand Down
2 changes: 1 addition & 1 deletion crates/tauri-schema-generator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2021"
publish = false

[build-dependencies]
tauri-utils = { features = ["schema"], path = "../tauri-utils" }
tauri-utils = { workspace = true, features = ["schema"] }
schemars = { version = "0.8.21", features = ["url", "preserve_order"] }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
Expand Down
2 changes: 1 addition & 1 deletion crates/tauri-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ swift-rs = { version = "1", optional = true, features = ["build"] }
[dev-dependencies]
getrandom = { version = "0.3", features = ["std"] }
serial_test = "3.5"
tauri = { path = "../tauri" }
tauri = { workspace = true }
tempfile = "3.15.0"

[features]
Expand Down
18 changes: 7 additions & 11 deletions crates/tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,10 @@ uuid = { version = "1", features = ["v4"], optional = true }
url = "2"
anyhow = "1"
thiserror = "2"
tauri-runtime = { version = "2.11.3", path = "../tauri-runtime" }
tauri-macros = { version = "2.6.3", path = "../tauri-macros" }
tauri-utils = { version = "2.9.3", features = [
"resources",
], path = "../tauri-utils" }
tauri-runtime-wry = { version = "2.11.4", path = "../tauri-runtime-wry", default-features = false, optional = true }
tauri-runtime = { workspace = true }
tauri-macros = { workspace = true }
tauri-utils = { workspace = true, features = ["resources"] }
tauri-runtime-wry = { workspace = true, optional = true }
getrandom = "0.3"
serde_repr = "0.1"
http = "1"
Expand Down Expand Up @@ -169,18 +167,16 @@ objc2-ui-kit = { version = "0.3.2", default-features = false, features = [
[build-dependencies]
glob = "0.3"
heck = "0.5"
tauri-build = { path = "../tauri-build/", default-features = false, version = "2.6.3" }
tauri-utils = { path = "../tauri-utils/", version = "2.9.3", features = [
"build-2",
] }
tauri-build = { workspace = true }
tauri-utils = { workspace = true, features = ["build-2"] }

[dev-dependencies]
proptest = "1.6.0"
quickcheck = "1.0.3"
quickcheck_macros = "1.0.0"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
tauri = { path = ".", default-features = false, features = ["wry"] }
tauri = { path = ".", features = ["wry"] }
tokio = { version = "1", features = ["full"] }
cargo_toml = "1.0"
http-range = "0.1.5"
Expand Down
2 changes: 1 addition & 1 deletion crates/tests/acl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ rust-version.workspace = true
publish = false

[dev-dependencies]
tauri-utils = { path = "../../tauri-utils/", features = ["build-2"] }
tauri-utils = { workspace = true, features = ["build-2"] }
serde_json = "1"
insta = "1"
2 changes: 1 addition & 1 deletion crates/tests/restart/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ license = "Apache-2.0 OR MIT"
edition = "2021"

[dependencies.tauri]
path = "../../tauri"
workspace = true

[dev-dependencies]
tempfile = "3"
Expand Down
7 changes: 4 additions & 3 deletions examples/api/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ name = "api_lib"
crate-type = ["staticlib", "cdylib", "rlib"]

[build-dependencies]
tauri-build = { path = "../../../crates/tauri-build", features = [
tauri-build = { workspace = true, default-features = true, features = [
"codegen",
"isolation",
] }
Expand All @@ -24,7 +24,8 @@ tauri-plugin-sample = { path = "./tauri-plugin-sample/" }
tauri-plugin-log = "2"

[dependencies.tauri]
path = "../../../crates/tauri"
workspace = true
default-features = true
features = [
"protocol-asset",
"image-ico",
Expand All @@ -35,7 +36,7 @@ features = [
]

[dev-dependencies.tauri]
path = "../../../crates/tauri"
workspace = true
features = ["test"]

[features]
Expand Down
6 changes: 2 additions & 4 deletions examples/api/src-tauri/tauri-plugin-sample/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@ edition = "2021"
links = "tauri-plugin-sample"

[dependencies]
tauri = { path = "../../../../crates/tauri" }
tauri = { workspace = true }
Comment thread
Legend-Master marked this conversation as resolved.
Resolved
log = "0.4"
serde = "1"
thiserror = "2"

[build-dependencies]
tauri-plugin = { path = "../../../../crates/tauri-plugin", features = [
"build",
] }
tauri-plugin = { workspace = true, features = ["build"] }
8 changes: 6 additions & 2 deletions examples/file-associations/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@ edition = "2021"
rust-version = "1.90"

[build-dependencies]
tauri-build = { path = "../../../crates/tauri-build", features = ["codegen"] }
tauri-build = { workspace = true, default-features = true, features = [
"codegen",
] }

[dependencies]
serde_json = "1"
serde = { version = "1", features = ["derive"] }
tauri = { path = "../../../crates/tauri", features = ["protocol-asset"] }
tauri = { workspace = true, default-features = true, features = [
"protocol-asset",
] }
url = "2"
6 changes: 4 additions & 2 deletions examples/resources/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ edition = "2021"
rust-version = "1.90"

[build-dependencies]
tauri-build = { path = "../../../crates/tauri-build", features = ["codegen"] }
tauri-build = { workspace = true, default-features = true, features = [
"codegen",
] }

[dependencies]
serde_json = "1"
serde = { version = "1", features = ["derive"] }
tauri = { path = "../../../crates/tauri", features = [] }
tauri = { workspace = true, default-features = true }
Loading