diff --git a/.changes/android-consumer-proguard.md b/.changes/android-consumer-proguard.md index fd9a7c16055b..b320eabc7139 100644 --- a/.changes/android-consumer-proguard.md +++ b/.changes/android-consumer-proguard.md @@ -1,7 +1,7 @@ --- tauri: minor:deps tauri-cli: minor:deps -"tauri-apps/cli": minor:deps +"@tauri-apps/cli": minor:deps --- On Android, fix missing `consumer-rules.pro` file in the template. diff --git a/.changes/android-gradle-9.md b/.changes/android-gradle-9.md index 037c33a7814e..0d38c059e1fd 100644 --- a/.changes/android-gradle-9.md +++ b/.changes/android-gradle-9.md @@ -2,7 +2,7 @@ tauri: minor:deps tauri-build: minor:deps tauri-cli: minor:deps -"tauri-apps/cli": minor:deps +"@tauri-apps/cli": minor:deps --- On Android, updated the template to use Gradle v9.6.1 (`com.android.tools.build:gradle` v9.3.1) and Kotlin v2.2. Use `tauri android init` to apply the change. diff --git a/Cargo.toml b/Cargo.toml index 3bf88a350845..f1779aff5572 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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" } + # default to small, optimized workspace release binaries [profile.release] panic = "abort" @@ -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" } diff --git a/bench/tests/cpu_intensive/src-tauri/Cargo.toml b/bench/tests/cpu_intensive/src-tauri/Cargo.toml index f6eba0a29fa7..d1e85ef61ad1 100644 --- a/bench/tests/cpu_intensive/src-tauri/Cargo.toml +++ b/bench/tests/cpu_intensive/src-tauri/Cargo.toml @@ -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 } diff --git a/bench/tests/files_transfer/src-tauri/Cargo.toml b/bench/tests/files_transfer/src-tauri/Cargo.toml index 10139f87e469..a238422386b9 100644 --- a/bench/tests/files_transfer/src-tauri/Cargo.toml +++ b/bench/tests/files_transfer/src-tauri/Cargo.toml @@ -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 } diff --git a/bench/tests/helloworld/src-tauri/Cargo.toml b/bench/tests/helloworld/src-tauri/Cargo.toml index d33cca7c5aec..9423cf62bce8 100644 --- a/bench/tests/helloworld/src-tauri/Cargo.toml +++ b/bench/tests/helloworld/src-tauri/Cargo.toml @@ -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 } diff --git a/crates/tauri-build/Cargo.toml b/crates/tauri-build/Cargo.toml index b73a7f070606..bf8ec3e150a7 100644 --- a/crates/tauri-build/Cargo.toml +++ b/crates/tauri-build/Cargo.toml @@ -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" diff --git a/crates/tauri-bundler/Cargo.toml b/crates/tauri-bundler/Cargo.toml index ae51b02d9c81..3fc33b0915f8 100644 --- a/crates/tauri-bundler/Cargo.toml +++ b/crates/tauri-bundler/Cargo.toml @@ -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" @@ -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" diff --git a/crates/tauri-cli/Cargo.toml b/crates/tauri-cli/Cargo.toml index c29140d4b643..91d519608149 100644 --- a/crates/tauri-cli/Cargo.toml +++ b/crates/tauri-cli/Cargo.toml @@ -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 } colored = "3" serde = { version = "1", features = ["derive"] } serde_json = { version = "1", features = ["preserve_order"] } @@ -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", @@ -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", diff --git a/crates/tauri-codegen/Cargo.toml b/crates/tauri-codegen/Cargo.toml index 2f3ae4febe2f..6a0cf17e260c 100644 --- a/crates/tauri-codegen/Cargo.toml +++ b/crates/tauri-codegen/Cargo.toml @@ -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 = [ diff --git a/crates/tauri-macros/Cargo.toml b/crates/tauri-macros/Cargo.toml index 860892a5b32b..9d45de093b50 100644 --- a/crates/tauri-macros/Cargo.toml +++ b/crates/tauri-macros/Cargo.toml @@ -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" } -tauri-utils = { version = "2.9.3", path = "../tauri-utils" } +tauri-codegen = { workspace = true } +tauri-utils = { workspace = true } [features] custom-protocol = [] diff --git a/crates/tauri-plugin/Cargo.toml b/crates/tauri-plugin/Cargo.toml index 9e048ce1eb24..dbcf20f58996 100644 --- a/crates/tauri-plugin/Cargo.toml +++ b/crates/tauri-plugin/Cargo.toml @@ -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 diff --git a/crates/tauri-runtime-wry/Cargo.toml b/crates/tauri-runtime-wry/Cargo.toml index e1873cee1b05..903a7a8d7c1c 100644 --- a/crates/tauri-runtime-wry/Cargo.toml +++ b/crates/tauri-runtime-wry/Cargo.toml @@ -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" diff --git a/crates/tauri-runtime/Cargo.toml b/crates/tauri-runtime/Cargo.toml index 3ecbdc5005b7..086d99c61506 100644 --- a/crates/tauri-runtime/Cargo.toml +++ b/crates/tauri-runtime/Cargo.toml @@ -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" } diff --git a/crates/tauri-schema-generator/Cargo.toml b/crates/tauri-schema-generator/Cargo.toml index d2e8801d43bf..31a151decb9d 100644 --- a/crates/tauri-schema-generator/Cargo.toml +++ b/crates/tauri-schema-generator/Cargo.toml @@ -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" diff --git a/crates/tauri-utils/Cargo.toml b/crates/tauri-utils/Cargo.toml index 1b7425c67807..e783f2973c6d 100644 --- a/crates/tauri-utils/Cargo.toml +++ b/crates/tauri-utils/Cargo.toml @@ -60,7 +60,8 @@ swift-rs = { version = "1", optional = true, features = ["build"] } [dev-dependencies] getrandom = { version = "0.3", features = ["std"] } serial_test = "3.5" -tauri = { path = "../tauri" } +# For doc tests +tauri = { workspace = true } tempfile = "3.15.0" [features] diff --git a/crates/tauri/Cargo.toml b/crates/tauri/Cargo.toml index 88e778b63870..c2173c8bfbdb 100644 --- a/crates/tauri/Cargo.toml +++ b/crates/tauri/Cargo.toml @@ -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" @@ -169,10 +167,8 @@ 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" diff --git a/crates/tests/acl/Cargo.toml b/crates/tests/acl/Cargo.toml index 9e4f45b903b7..3e5e2a0e5cbc 100644 --- a/crates/tests/acl/Cargo.toml +++ b/crates/tests/acl/Cargo.toml @@ -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" diff --git a/crates/tests/restart/Cargo.toml b/crates/tests/restart/Cargo.toml index a1351ab18331..795b1e0d256d 100644 --- a/crates/tests/restart/Cargo.toml +++ b/crates/tests/restart/Cargo.toml @@ -6,7 +6,7 @@ license = "Apache-2.0 OR MIT" edition = "2021" [dependencies.tauri] -path = "../../tauri" +workspace = true [dev-dependencies] tempfile = "3" diff --git a/examples/api/src-tauri/Cargo.toml b/examples/api/src-tauri/Cargo.toml index 043d4a9fc527..c36ea3554135 100644 --- a/examples/api/src-tauri/Cargo.toml +++ b/examples/api/src-tauri/Cargo.toml @@ -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", ] } @@ -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", @@ -35,7 +36,7 @@ features = [ ] [dev-dependencies.tauri] -path = "../../../crates/tauri" +workspace = true features = ["test"] [features] diff --git a/examples/api/src-tauri/tauri-plugin-sample/Cargo.toml b/examples/api/src-tauri/tauri-plugin-sample/Cargo.toml index 15b0f050016d..62ddeeab0f23 100644 --- a/examples/api/src-tauri/tauri-plugin-sample/Cargo.toml +++ b/examples/api/src-tauri/tauri-plugin-sample/Cargo.toml @@ -5,12 +5,13 @@ edition = "2021" links = "tauri-plugin-sample" [dependencies] -tauri = { path = "../../../../crates/tauri" } +tauri = { workspace = true } log = "0.4" serde = "1" thiserror = "2" +[target.'cfg(any(target_os = "ios", target_os = "android"))'.dependencies] +tauri = { workspace = true, features = ["wry"] } + [build-dependencies] -tauri-plugin = { path = "../../../../crates/tauri-plugin", features = [ - "build", -] } +tauri-plugin = { workspace = true, features = ["build"] } diff --git a/examples/file-associations/src-tauri/Cargo.toml b/examples/file-associations/src-tauri/Cargo.toml index 1329f4d0b929..36dded79c9f6 100644 --- a/examples/file-associations/src-tauri/Cargo.toml +++ b/examples/file-associations/src-tauri/Cargo.toml @@ -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" diff --git a/examples/resources/src-tauri/Cargo.toml b/examples/resources/src-tauri/Cargo.toml index c82229d9db4c..2c6cf4291d5d 100644 --- a/examples/resources/src-tauri/Cargo.toml +++ b/examples/resources/src-tauri/Cargo.toml @@ -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 }