From 7fee3d3a2ae2b42e78944ee4e653c887ec8d8703 Mon Sep 17 00:00:00 2001 From: chip Date: Fri, 26 May 2023 15:04:01 +0200 Subject: [PATCH] use cargo workspace package table (#6885) --- Cargo.toml | 9 +++++++++ core/tauri-build/Cargo.toml | 16 +++++++++------- core/tauri-codegen/Cargo.toml | 16 +++++++++------- core/tauri-macros/Cargo.toml | 16 +++++++++------- core/tauri-runtime-wry/Cargo.toml | 16 +++++++++------- core/tauri-runtime/Cargo.toml | 16 +++++++++------- core/tauri-utils/Cargo.toml | 15 +++++++++------ core/tauri/Cargo.toml | 24 +++++++++++++----------- 8 files changed, 76 insertions(+), 52 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 438e14c32..e31b3c9d0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,6 +23,15 @@ exclude = [ "examples/workspace", ] +[workspace.package] +authors = [ "Tauri Programme within The Commons Conservancy" ] +homepage = "https://tauri.app/" +repository = "https://github.com/tauri-apps/tauri" +categories = [ "gui", "web-programming" ] +license = "Apache-2.0 OR MIT" +edition = "2021" +rust-version = "1.65" + # default to small, optimized workspace release binaries [profile.release] panic = "abort" diff --git a/core/tauri-build/Cargo.toml b/core/tauri-build/Cargo.toml index fbeed9036..1804ba295 100644 --- a/core/tauri-build/Cargo.toml +++ b/core/tauri-build/Cargo.toml @@ -1,17 +1,19 @@ [package] name = "tauri-build" version = "2.0.0-alpha.5" -authors = [ "Tauri Programme within The Commons Conservancy" ] -categories = [ "gui", "web-programming" ] -license = "Apache-2.0 OR MIT" -homepage = "https://tauri.app" -repository = "https://github.com/tauri-apps/tauri/tree/dev/core/tauri-build" description = "build time code to pair with https://crates.io/crates/tauri" -edition = "2021" -rust-version = "1.65" exclude = [ "CHANGELOG.md", "/target" ] readme = "README.md" +# workspace defined package items +authors = { workspace = true } +homepage = { workspace = true } +repository = { workspace = true } +categories = { workspace = true } +license = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } + [package.metadata.docs.rs] all-features = true rustdoc-args = [ "--cfg", "doc_cfg" ] diff --git a/core/tauri-codegen/Cargo.toml b/core/tauri-codegen/Cargo.toml index d12070054..291b0c118 100644 --- a/core/tauri-codegen/Cargo.toml +++ b/core/tauri-codegen/Cargo.toml @@ -1,17 +1,19 @@ [package] name = "tauri-codegen" version = "2.0.0-alpha.5" -authors = [ "Tauri Programme within The Commons Conservancy" ] -categories = [ "gui", "web-programming" ] -license = "Apache-2.0 OR MIT" -homepage = "https://tauri.app" -repository = "https://github.com/tauri-apps/tauri/tree/dev/core/tauri-codegen" description = "code generation meant to be consumed inside of `tauri` through `tauri-build` or `tauri-macros`" -edition = "2021" -rust-version = "1.65" exclude = [ "CHANGELOG.md", "/target" ] readme = "README.md" +# workspace defined package items +authors = { workspace = true } +homepage = { workspace = true } +repository = { workspace = true } +categories = { workspace = true } +license = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } + [dependencies] sha2 = "0.10" base64 = "0.21" diff --git a/core/tauri-macros/Cargo.toml b/core/tauri-macros/Cargo.toml index 4934eceff..7035d5b5b 100644 --- a/core/tauri-macros/Cargo.toml +++ b/core/tauri-macros/Cargo.toml @@ -1,17 +1,19 @@ [package] name = "tauri-macros" version = "2.0.0-alpha.5" -authors = [ "Tauri Programme within The Commons Conservancy" ] -categories = [ "gui", "os", "filesystem", "web-programming" ] -license = "Apache-2.0 OR MIT" -homepage = "https://tauri.app" -repository = "https://github.com/tauri-apps/tauri" description = "Macros for the tauri crate." -edition = "2021" -rust-version = "1.65" exclude = [ "CHANGELOG.md", "/target" ] readme = "README.md" +# workspace defined package items +authors = { workspace = true } +homepage = { workspace = true } +repository = { workspace = true } +categories = { workspace = true } +license = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } + [lib] proc-macro = true diff --git a/core/tauri-runtime-wry/Cargo.toml b/core/tauri-runtime-wry/Cargo.toml index a7a338411..736479fc8 100644 --- a/core/tauri-runtime-wry/Cargo.toml +++ b/core/tauri-runtime-wry/Cargo.toml @@ -1,17 +1,19 @@ [package] name = "tauri-runtime-wry" version = "0.13.0-alpha.5" -authors = [ "Tauri Programme within The Commons Conservancy" ] -categories = [ "gui", "web-programming" ] -license = "Apache-2.0 OR MIT" -homepage = "https://tauri.app" -repository = "https://github.com/tauri-apps/tauri" description = "Wry bindings to the Tauri runtime" -edition = "2021" -rust-version = "1.65" exclude = [ "CHANGELOG.md", "/target" ] readme = "README.md" +# workspace defined package items +authors = { workspace = true } +homepage = { workspace = true } +repository = { workspace = true } +categories = { workspace = true } +license = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } + [dependencies] wry = { version = "0.28.3", default-features = false, features = [ "file-drop", "protocol" ] } tauri-runtime = { version = "0.13.0-alpha.5", path = "../tauri-runtime" } diff --git a/core/tauri-runtime/Cargo.toml b/core/tauri-runtime/Cargo.toml index ccd9a3c71..c9b16271d 100644 --- a/core/tauri-runtime/Cargo.toml +++ b/core/tauri-runtime/Cargo.toml @@ -1,17 +1,19 @@ [package] name = "tauri-runtime" version = "0.13.0-alpha.5" -authors = [ "Tauri Programme within The Commons Conservancy" ] -categories = [ "gui", "web-programming" ] -license = "Apache-2.0 OR MIT" -homepage = "https://tauri.app" -repository = "https://github.com/tauri-apps/tauri" description = "Runtime for Tauri applications" -edition = "2021" -rust-version = "1.65" exclude = [ "CHANGELOG.md", "/target" ] readme = "README.md" +# workspace defined package items +authors = { workspace = true } +homepage = { workspace = true } +repository = { workspace = true } +categories = { workspace = true } +license = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } + [package.metadata.docs.rs] all-features = true rustdoc-args = [ "--cfg", "doc_cfg" ] diff --git a/core/tauri-utils/Cargo.toml b/core/tauri-utils/Cargo.toml index 0cfc8fb95..919c04bb0 100644 --- a/core/tauri-utils/Cargo.toml +++ b/core/tauri-utils/Cargo.toml @@ -1,16 +1,19 @@ [package] name = "tauri-utils" version = "2.0.0-alpha.5" -authors = [ "Tauri Programme within The Commons Conservancy" ] -license = "Apache-2.0 OR MIT" -homepage = "https://tauri.app" -repository = "https://github.com/tauri-apps/tauri" description = "Utilities for Tauri" -edition = "2021" -rust-version = "1.65" exclude = [ "CHANGELOG.md", "/target" ] readme = "README.md" +# workspace defined package items +authors = { workspace = true } +homepage = { workspace = true } +repository = { workspace = true } +categories = { workspace = true } +license = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } + [dependencies] serde = { version = "1", features = [ "derive" ] } serde_json = "1" diff --git a/core/tauri/Cargo.toml b/core/tauri/Cargo.toml index 5a6252490..69cc56220 100644 --- a/core/tauri/Cargo.toml +++ b/core/tauri/Cargo.toml @@ -1,18 +1,20 @@ [package] -authors = [ "Tauri Programme within The Commons Conservancy" ] -categories = [ "gui", "web-programming" ] -description = "Make tiny, secure apps for all desktop platforms with Tauri" -edition = "2021" -rust-version = "1.65" -exclude = [ "/test", "/.scripts", "CHANGELOG.md", "/target" ] -homepage = "https://tauri.app" -license = "Apache-2.0 OR MIT" name = "tauri" -readme = "README.md" -repository = "https://github.com/tauri-apps/tauri" version = "2.0.0-alpha.9" +description = "Make tiny, secure apps for all desktop platforms with Tauri" +exclude = [ "/test", "/.scripts", "CHANGELOG.md", "/target" ] +readme = "README.md" links = "Tauri" +# workspace defined package items +authors = { workspace = true } +homepage = { workspace = true } +repository = { workspace = true } +categories = { workspace = true } +license = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } + [package.metadata.docs.rs] no-default-features = true features = [ @@ -111,7 +113,7 @@ serde = { version = "1.0", features = [ "derive" ] } serde_json = "1.0" tauri = { path = ".", default-features = false, features = [ "wry" ] } tokio = { version = "1", features = [ "full" ] } -cargo_toml = "0.11" +cargo_toml = "0.15" winnow = "=0.4.1" [features]