From 7f6d8849da02cc076b1bd501d2680fdd2d991676 Mon Sep 17 00:00:00 2001 From: Charles Schleich Date: Wed, 30 Oct 2024 10:43:33 +0100 Subject: [PATCH] Move dependencies top level (#6) * Camel Case intoEncoding * Plugin Deps top level --- Cargo.toml | 37 +++++++++++++++++++++++ zenoh-plugin-remote-api/Cargo.toml | 48 ++++++++++++++---------------- 2 files changed, 60 insertions(+), 25 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b77bb9e..8d0c6d3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,3 +12,40 @@ edition = "2021" license = "EPL-2.0 OR Apache-2.0" categories = ["network-programming", "database"] description = "Remote API Plugin for Zenoh using Websockets" + +[workspace.dependencies] +tokio = { version = "1.39.2", features = ["full"] } +tokio-tungstenite = "0.23.1" +tokio-rustls = { version = "0.26.0", default-features = false } +futures-util = "0.3.26" +rustls-pemfile = "2.1.2" +base64 = "0.22.1" +flume = "0.11" +futures = "0.3.5" +git-version = "0.3.5" +lazy_static = "1.4.0" +ts-rs = { version = "9.0", features = [ + "serde-compat", + "uuid-impl", + "serde-json-impl", + "no-serde-warnings", +] } +tracing = "0.1" +schemars = { version = "0.8.12", features = ["either"] } +serde = { version = "1.0.154", default-features = false, features = [ + "derive", +] } # Default features are disabled due to usage in no_std crates +serde_json = "1.0.114" +zenoh = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = [ + "plugins", +], version = "1.0.0-dev" } +zenoh-ext = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", version = "1.0.0-dev" } +zenoh_backend_traits = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", version = "1.0.0-dev" } +zenoh-plugin-trait = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", version = "1.0.0-dev" } +zenoh-util = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", version = "1.0.0-dev" } +zenoh-result = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", version = "1.0.0-dev" } +uuid = { version = "1.3.0", default-features = false, features = [ + "v4", + "serde", +] } +uhlc = { version = "0.8.0", default-features = false } # Default features are disabled due to usage in no_std crates diff --git a/zenoh-plugin-remote-api/Cargo.toml b/zenoh-plugin-remote-api/Cargo.toml index 1c39470..e6f1a5f 100644 --- a/zenoh-plugin-remote-api/Cargo.toml +++ b/zenoh-plugin-remote-api/Cargo.toml @@ -41,41 +41,39 @@ name = "zenoh_plugin_remote_api" crate-type = ["cdylib", "rlib"] [dependencies] -tokio = { version = "1.39.2", features = ["full"] } -tokio-tungstenite = "0.23.1" -tokio-rustls = { version = "0.26.0", default-features = false } -futures-util = "0.3.26" -rustls-pemfile = "2.1.2" -base64 = "0.22.1" -flume = "0.11" -futures = "0.3.5" -git-version = "0.3.5" -lazy_static = "1.4.0" -ts-rs = { version = "9.0", features = [ +tokio = { workspace = true } +tokio-tungstenite = { workspace = true } +tokio-rustls = { workspace = true } +futures-util = { workspace = true } +rustls-pemfile = { workspace = true } +base64 = { workspace = true } +flume = { workspace = true } +futures = { workspace = true } +git-version = { workspace = true } +lazy_static = { workspace = true } +ts-rs = { workspace = true, features = [ "serde-compat", "uuid-impl", "serde-json-impl", "no-serde-warnings", ] } -tracing = "0.1" -schemars = { version = "0.8.12", features = ["either"] } -serde = { version = "1.0.154", default-features = false, features = [ +tracing = { workspace = true } +schemars = { workspace = true } +serde = { workspace = true, default-features = false, features = [ "derive", ] } # Default features are disabled due to usage in no_std crates -serde_json = "1.0.114" -zenoh = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = [ - "plugins", -], version = "1.0.0-dev" } -zenoh-ext = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", version = "1.0.0-dev" } -zenoh_backend_traits = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", version = "1.0.0-dev" } -zenoh-plugin-trait = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", version = "1.0.0-dev" } -zenoh-util = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", version = "1.0.0-dev" } -zenoh-result = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", version = "1.0.0-dev" } -uuid = { version = "1.3.0", default-features = false, features = [ +serde_json = { workspace = true } +zenoh = { workspace = true, features = ["plugins"] } +zenoh-ext = { workspace = true } +zenoh_backend_traits = { workspace = true } +zenoh-plugin-trait = { workspace = true } +zenoh-util = { workspace = true } +zenoh-result = { workspace = true } +uuid = { workspace=true, default-features = false, features = [ "v4", "serde", ] } -uhlc = { version = "0.8.0", default-features = false } # Default features are disabled due to usage in no_std crates +uhlc = { workspace=true, default-features = false } # Default features are disabled due to usage in no_std crates [build-dependencies] rustc_version = "0.4.0"