From 02111b9526e69e01f3bd5656ce6309b6814eb882 Mon Sep 17 00:00:00 2001 From: Fabian-Lars Date: Mon, 18 Mar 2024 21:39:46 +0100 Subject: [PATCH] chore: Change workspace inheritance syntax for better covector support (#1092) --- plugins/authenticator/Cargo.toml | 18 +++++++++--------- plugins/autostart/Cargo.toml | 18 +++++++++--------- plugins/fs-extra/Cargo.toml | 18 +++++++++--------- plugins/fs-watch/Cargo.toml | 18 +++++++++--------- plugins/localhost/Cargo.toml | 18 +++++++++--------- plugins/log/Cargo.toml | 14 +++++++------- plugins/persisted-scope/Cargo.toml | 18 +++++++++--------- plugins/positioner/Cargo.toml | 18 +++++++++--------- plugins/single-instance/Cargo.toml | 18 +++++++++--------- .../examples/vanilla/src-tauri/Cargo.toml | 8 ++++---- plugins/sql/Cargo.toml | 18 +++++++++--------- plugins/store/Cargo.toml | 18 +++++++++--------- .../AppSettingsManager/src-tauri/Cargo.toml | 6 +++--- plugins/stronghold/Cargo.toml | 18 +++++++++--------- plugins/upload/Cargo.toml | 18 +++++++++--------- plugins/websocket/Cargo.toml | 18 +++++++++--------- .../examples/tauri-app/src-tauri/Cargo.toml | 8 ++++---- plugins/window-state/Cargo.toml | 18 +++++++++--------- shared/template/Cargo.toml | 16 ++++++++-------- 19 files changed, 152 insertions(+), 152 deletions(-) diff --git a/plugins/authenticator/Cargo.toml b/plugins/authenticator/Cargo.toml index e0e71a75..b8b039ef 100644 --- a/plugins/authenticator/Cargo.toml +++ b/plugins/authenticator/Cargo.toml @@ -2,19 +2,19 @@ name = "tauri-plugin-authenticator" version = "0.0.0" description = "Use hardware security-keys in your Tauri App." -authors.workspace = true -license.workspace = true -edition.workspace = true -rust-version.workspace = true +authors = { workspace = true } +license = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -serde.workspace = true -serde_json.workspace = true -tauri.workspace = true -log.workspace = true -thiserror.workspace = true +serde = { workspace = true } +serde_json = { workspace = true } +tauri = { workspace = true } +log = { workspace = true } +thiserror = { workspace = true } authenticator = "0.3.1" once_cell = "1" sha2 = "0.10" diff --git a/plugins/autostart/Cargo.toml b/plugins/autostart/Cargo.toml index f1049a6e..51b5bc0a 100644 --- a/plugins/autostart/Cargo.toml +++ b/plugins/autostart/Cargo.toml @@ -2,17 +2,17 @@ name = "tauri-plugin-autostart" version = "0.0.0" description = "Automatically launch your application at startup." -authors.workspace = true -license.workspace = true -edition.workspace = true -rust-version.workspace = true +authors = { workspace = true } +license = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -serde.workspace = true -serde_json.workspace = true -tauri.workspace = true -log.workspace = true -thiserror.workspace = true +serde = { workspace = true } +serde_json = { workspace = true } +tauri = { workspace = true } +log = { workspace = true } +thiserror = { workspace = true } auto-launch = "0.5" \ No newline at end of file diff --git a/plugins/fs-extra/Cargo.toml b/plugins/fs-extra/Cargo.toml index 3904ec59..3bb15aa3 100644 --- a/plugins/fs-extra/Cargo.toml +++ b/plugins/fs-extra/Cargo.toml @@ -2,16 +2,16 @@ name = "tauri-plugin-fs-extra" version = "0.0.0" description = "Additional file system methods not included in the core API." -authors.workspace = true -license.workspace = true -edition.workspace = true -rust-version.workspace = true +authors = { workspace = true } +license = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -serde.workspace = true -serde_json.workspace = true -tauri.workspace = true -log.workspace = true -thiserror.workspace = true \ No newline at end of file +serde = { workspace = true } +serde_json = { workspace = true } +tauri = { workspace = true } +log = { workspace = true } +thiserror = { workspace = true } \ No newline at end of file diff --git a/plugins/fs-watch/Cargo.toml b/plugins/fs-watch/Cargo.toml index 9114907d..7c0822b4 100644 --- a/plugins/fs-watch/Cargo.toml +++ b/plugins/fs-watch/Cargo.toml @@ -2,18 +2,18 @@ name = "tauri-plugin-fs-watch" version = "0.0.0" description = "Watch files and directories for changes." -authors.workspace = true -license.workspace = true -edition.workspace = true -rust-version.workspace = true +authors = { workspace = true } +license = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -serde.workspace = true -serde_json.workspace = true -tauri.workspace = true -log.workspace = true -thiserror.workspace = true +serde = { workspace = true } +serde_json = { workspace = true } +tauri = { workspace = true } +log = { workspace = true } +thiserror = { workspace = true } notify = { version = "6" , features = ["serde"] } notify-debouncer-mini = { version = "0.4" , features = ["serde"] } diff --git a/plugins/localhost/Cargo.toml b/plugins/localhost/Cargo.toml index e56b16f1..26372bae 100644 --- a/plugins/localhost/Cargo.toml +++ b/plugins/localhost/Cargo.toml @@ -2,18 +2,18 @@ name = "tauri-plugin-localhost" version = "0.1.0" description = "Expose your apps assets through a localhost server instead of the default custom protocol." -authors.workspace = true -license.workspace = true -edition.workspace = true -rust-version.workspace = true +authors = { workspace = true } +license = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -serde.workspace = true -serde_json.workspace = true -tauri.workspace = true -log.workspace = true -thiserror.workspace = true +serde = { workspace = true } +serde_json = { workspace = true } +tauri = { workspace = true } +log = { workspace = true } +thiserror = { workspace = true } tiny_http = "0.12" http = "1" diff --git a/plugins/log/Cargo.toml b/plugins/log/Cargo.toml index 01e312d5..52668c99 100644 --- a/plugins/log/Cargo.toml +++ b/plugins/log/Cargo.toml @@ -2,17 +2,17 @@ name = "tauri-plugin-log" version = "0.0.0" description = "Configurable logging for your Tauri app." -authors.workspace = true -license.workspace = true -edition.workspace = true -rust-version.workspace = true +authors = { workspace = true } +license = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -serde.workspace = true -serde_json.workspace = true -tauri.workspace = true +serde = { workspace = true } +serde_json = { workspace = true } +tauri = { workspace = true } serde_repr = "0.1" byte-unit = "5" fern = "0.6" diff --git a/plugins/persisted-scope/Cargo.toml b/plugins/persisted-scope/Cargo.toml index 23cfed40..e3c481cd 100644 --- a/plugins/persisted-scope/Cargo.toml +++ b/plugins/persisted-scope/Cargo.toml @@ -2,19 +2,19 @@ name = "tauri-plugin-persisted-scope" version = "0.1.3" description = "Save filesystem and asset scopes and restore them when the app is reopened." -authors.workspace = true -license.workspace = true -edition.workspace = true -rust-version.workspace = true +authors = { workspace = true } +license = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -serde.workspace = true -serde_json.workspace = true -tauri.workspace = true -log.workspace = true -thiserror.workspace = true +serde = { workspace = true } +serde_json = { workspace = true } +tauri = { workspace = true } +log = { workspace = true } +thiserror = { workspace = true } aho-corasick = "1.1" bincode = "1" diff --git a/plugins/positioner/Cargo.toml b/plugins/positioner/Cargo.toml index dcab86c9..11623b33 100644 --- a/plugins/positioner/Cargo.toml +++ b/plugins/positioner/Cargo.toml @@ -2,19 +2,19 @@ name = "tauri-plugin-positioner" version = "1.0.4" description = "Position your windows at well-known locations." -authors.workspace = true -license.workspace = true -edition.workspace = true -rust-version.workspace = true +authors = { workspace = true } +license = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -serde.workspace = true -serde_json.workspace = true -tauri.workspace = true -log.workspace = true -thiserror.workspace = true +serde = { workspace = true } +serde_json = { workspace = true } +tauri = { workspace = true } +log = { workspace = true } +thiserror = { workspace = true } serde_repr = "0.1" [features] diff --git a/plugins/single-instance/Cargo.toml b/plugins/single-instance/Cargo.toml index 3ed00375..b0d703ba 100644 --- a/plugins/single-instance/Cargo.toml +++ b/plugins/single-instance/Cargo.toml @@ -2,20 +2,20 @@ name = "tauri-plugin-single-instance" version = "0.0.0" description = "Ensure a single instance of your tauri app is running." -authors.workspace = true -license.workspace = true -edition.workspace = true -rust-version.workspace = true +authors = { workspace = true } +license = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } exclude = ["/examples"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -serde.workspace = true -serde_json.workspace = true -tauri.workspace = true -log.workspace = true -thiserror.workspace = true +serde = { workspace = true } +serde_json = { workspace = true } +tauri = { workspace = true } +log = { workspace = true } +thiserror = { workspace = true } [target.'cfg(target_os = "windows")'.dependencies.windows-sys] version = "0.52" diff --git a/plugins/single-instance/examples/vanilla/src-tauri/Cargo.toml b/plugins/single-instance/examples/vanilla/src-tauri/Cargo.toml index 21c3af73..ab8df5a2 100644 --- a/plugins/single-instance/examples/vanilla/src-tauri/Cargo.toml +++ b/plugins/single-instance/examples/vanilla/src-tauri/Cargo.toml @@ -8,13 +8,13 @@ edition = "2021" rust-version = "1.57" [dependencies] -serde.workspace = true -serde_json.workspace = true -tauri.workspace = true +serde = { workspace = true } +serde_json = { workspace = true } +tauri = { workspace = true } tauri-plugin-single-instance = { path = "../../../" } [build-dependencies] -tauri-build.workspace = true +tauri-build = { workspace = true } [features] custom-protocol = [ "tauri/custom-protocol" ] diff --git a/plugins/sql/Cargo.toml b/plugins/sql/Cargo.toml index 17239b02..40fa7e6d 100644 --- a/plugins/sql/Cargo.toml +++ b/plugins/sql/Cargo.toml @@ -2,20 +2,20 @@ name = "tauri-plugin-sql" version = "0.0.0" description = "Interface with SQL databases." -authors.workspace = true -license.workspace = true -edition.workspace = true -#rust-version.workspace = true +authors = { workspace = true } +license = { workspace = true } +edition = { workspace = true } +#rust-version = { workspace = true } rust-version = "1.65" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -serde.workspace = true -serde_json.workspace = true -tauri.workspace = true -log.workspace = true -thiserror.workspace = true +serde = { workspace = true } +serde_json = { workspace = true } +tauri = { workspace = true } +log = { workspace = true } +thiserror = { workspace = true } futures-core = "0.3" sqlx = { version = "0.7", features = ["json", "time"] } time = "0.3" diff --git a/plugins/store/Cargo.toml b/plugins/store/Cargo.toml index 626dbebc..b73881ad 100644 --- a/plugins/store/Cargo.toml +++ b/plugins/store/Cargo.toml @@ -2,16 +2,16 @@ name = "tauri-plugin-store" version = "0.0.0" description = "Simple, persistent key-value store." -authors.workspace = true -license.workspace = true -edition.workspace = true -rust-version.workspace = true +authors = { workspace = true } +license = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -serde.workspace = true -serde_json.workspace = true -tauri.workspace = true -log.workspace = true -thiserror.workspace = true \ No newline at end of file +serde = { workspace = true } +serde_json = { workspace = true } +tauri = { workspace = true } +log = { workspace = true } +thiserror = { workspace = true } \ No newline at end of file diff --git a/plugins/store/examples/AppSettingsManager/src-tauri/Cargo.toml b/plugins/store/examples/AppSettingsManager/src-tauri/Cargo.toml index a342892f..d2ca76b4 100644 --- a/plugins/store/examples/AppSettingsManager/src-tauri/Cargo.toml +++ b/plugins/store/examples/AppSettingsManager/src-tauri/Cargo.toml @@ -10,12 +10,12 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [build-dependencies] -tauri-build.workspace = true +tauri-build = { workspace = true } [dependencies] tauri = { workspace = true, features = ["shell-open"] } -serde.workspace = true -serde_json.workspace = true +serde = { workspace = true } +serde_json = { workspace = true } tauri-plugin-store = { path = "../../../" } [features] diff --git a/plugins/stronghold/Cargo.toml b/plugins/stronghold/Cargo.toml index 5952fb1b..e046f13c 100644 --- a/plugins/stronghold/Cargo.toml +++ b/plugins/stronghold/Cargo.toml @@ -2,19 +2,19 @@ name = "tauri-plugin-stronghold" version = "0.0.0" description = "Store secrets and keys using the IOTA Stronghold encrypted database." -authors.workspace = true -license.workspace = true -edition.workspace = true -rust-version.workspace = true +authors = { workspace = true } +license = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -serde.workspace = true -serde_json.workspace = true -tauri.workspace = true -log.workspace = true -thiserror.workspace = true +serde = { workspace = true } +serde_json = { workspace = true } +tauri = { workspace = true } +log = { workspace = true } +thiserror = { workspace = true } iota_stronghold = "1" iota-crypto = "0.23" hex = "0.4" diff --git a/plugins/upload/Cargo.toml b/plugins/upload/Cargo.toml index 49abc6d4..0395abfd 100644 --- a/plugins/upload/Cargo.toml +++ b/plugins/upload/Cargo.toml @@ -2,19 +2,19 @@ name = "tauri-plugin-upload" version = "0.0.0" description = "Upload files from disk to a remote server over HTTP." -authors.workspace = true -license.workspace = true -edition.workspace = true -rust-version.workspace = true +authors = { workspace = true } +license = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -serde.workspace = true -serde_json.workspace = true -tauri.workspace = true -log.workspace = true -thiserror.workspace = true +serde = { workspace = true } +serde_json = { workspace = true } +tauri = { workspace = true } +log = { workspace = true } +thiserror = { workspace = true } tokio = { version = "1", features = [ "fs" ] } tokio-util = { version = "0.7", features = [ "codec" ] } reqwest = { version = "0.11", features = [ "json", "stream" ] } diff --git a/plugins/websocket/Cargo.toml b/plugins/websocket/Cargo.toml index 249f3c9b..6ded04a1 100644 --- a/plugins/websocket/Cargo.toml +++ b/plugins/websocket/Cargo.toml @@ -1,20 +1,20 @@ [package] name = "tauri-plugin-websocket" version = "0.0.0" -authors.workspace = true -license.workspace = true -edition.workspace = true -rust-version.workspace = true +authors = { workspace = true } +license = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } exclude = ["/examples"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -serde.workspace = true -serde_json.workspace = true -tauri.workspace = true -log.workspace = true -thiserror.workspace = true +serde = { workspace = true } +serde_json = { workspace = true } +tauri = { workspace = true } +log = { workspace = true } +thiserror = { workspace = true } http = "1" rand = "0.8" futures-util = "0.3" diff --git a/plugins/websocket/examples/tauri-app/src-tauri/Cargo.toml b/plugins/websocket/examples/tauri-app/src-tauri/Cargo.toml index ed1ab7d6..ce5c6d22 100644 --- a/plugins/websocket/examples/tauri-app/src-tauri/Cargo.toml +++ b/plugins/websocket/examples/tauri-app/src-tauri/Cargo.toml @@ -5,16 +5,16 @@ description = "A Tauri App" edition = "2021" [dependencies] -serde.workspace = true -serde_json.workspace = true -tauri.workspace = true +serde = { workspace = true } +serde_json = { workspace = true } +tauri = { workspace = true } tokio = { version = "1", features = ["net"] } futures-util = "0.3" tauri-plugin-websocket = { path = "../../../" } tokio-tungstenite = "0.21" [build-dependencies] -tauri-build.workspace = true +tauri-build = { workspace = true } [features] custom-protocol = [ "tauri/custom-protocol" ] diff --git a/plugins/window-state/Cargo.toml b/plugins/window-state/Cargo.toml index 19693f36..cdf6955e 100644 --- a/plugins/window-state/Cargo.toml +++ b/plugins/window-state/Cargo.toml @@ -2,18 +2,18 @@ name = "tauri-plugin-window-state" version = "0.1.0" description = "Save window positions and sizes and restore them when the app is reopened." -authors.workspace = true -license.workspace = true -edition.workspace = true -rust-version.workspace = true +authors = { workspace = true } +license = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -serde.workspace = true -serde_json.workspace = true -tauri.workspace = true -log.workspace = true -thiserror.workspace = true +serde = { workspace = true } +serde_json = { workspace = true } +tauri = { workspace = true } +log = { workspace = true } +thiserror = { workspace = true } bincode = "1.3" bitflags = "2" diff --git a/shared/template/Cargo.toml b/shared/template/Cargo.toml index e8eecc46..07b8b1e4 100644 --- a/shared/template/Cargo.toml +++ b/shared/template/Cargo.toml @@ -1,15 +1,15 @@ [package] name = "tauri-plugin-PLUGIN_NAME" version = "0.0.0" -edition.workspace = true -authors.workspace = true -license.workspace = true +edition = { workspace = true } +authors = { workspace = true } +license = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -serde.workspace = true -serde_json.workspace = true -tauri.workspace = true -log.workspace = true -thiserror.workspace = true \ No newline at end of file +serde = { workspace = true } +serde_json = { workspace = true } +tauri = { workspace = true } +log = { workspace = true } +thiserror = { workspace = true } \ No newline at end of file