From ce317dec6f185ff5199c96aea45ea7b79653a4e3 Mon Sep 17 00:00:00 2001 From: Sehyo Chang Date: Tue, 25 Apr 2023 03:40:50 +0000 Subject: [PATCH] chore: move more dep to workspace (#3190) --- Cargo.lock | 16 +++------------- Cargo.toml | 11 +++++++---- crates/fluvio-auth/Cargo.toml | 4 ++-- crates/fluvio-cli/Cargo.toml | 7 +++---- crates/fluvio-connector-package/Cargo.toml | 2 +- crates/fluvio-controlplane-metadata/Cargo.toml | 3 ++- crates/fluvio/Cargo.toml | 10 +++++----- examples/00-produce/Cargo.toml | 4 ++-- examples/01-produce-batch/Cargo.toml | 4 ++-- examples/01-produce-key-value/Cargo.toml | 6 +++--- examples/02-consume/Cargo.toml | 4 ++-- examples/03-echo/Cargo.toml | 6 +++--- examples/04-admin-watch/Cargo.toml | 8 +++++--- release-tools/check-crate-version/Cargo.toml | 6 +++--- 14 files changed, 43 insertions(+), 48 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 36303b1a8f..26aedc8c44 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6958,7 +6958,6 @@ checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" dependencies = [ "filetime", "libc", - "xattr", ] [[package]] @@ -7301,13 +7300,13 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] @@ -8489,15 +8488,6 @@ dependencies = [ "time 0.3.20", ] -[[package]] -name = "xattr" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" -dependencies = [ - "libc", -] - [[package]] name = "yaml-rust" version = "0.4.5" diff --git a/Cargo.toml b/Cargo.toml index e2343a0ce6..aa8f749704 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -98,14 +98,15 @@ pin-project = "1.0.1" portpicker = "0.1.1" rand = "0.8.5" regex = "1.7" -semver = "1.0.3" -serde = { version = "1.0.117", default-features = false } +semver = "1.0.13" +serde = { version = "1.0.144", default-features = false } serde_json = "1.0.60" serde_yaml = { version = "0.9.0", default-features = false } +siphasher = "0.3.5" sysinfo = { version = "0.28.0", default-features = false } syn = "1.0" static_assertions = "1.1.0" -tar = { version = "0.4", default-features = false } +tar = { version = "0.4.38", default-features = false } tempfile = "3.4.0" thiserror = "1.0.30" tokio = { version = "1.4.0", default-features = false } @@ -114,9 +115,10 @@ toml = { version = "0.7.0", default-features = false } tracing = "0.1.19" tracing-subscriber = { version = "0.3", default-features = false } url = "2.1.1" +wasm-bindgen-test = "0.3.24" wasmparser = "0.103.0" which = "4.1.0" - +x509-parser = "0.15.0" # external fluvio dep k8-client = { version = "10.0.0" } @@ -128,6 +130,7 @@ flv-util = { version = "0.5.2", default-features = false } fluvio-helm = { version = "0.4.1" } fluvio-command = { version = "0.2.0" } flv-tls-proxy = { version = "0.7" } +fluvio_ws_stream_wasm = "0.7.0" # internal fluvio dep fluvio = { version = "0.18", path = "crates/fluvio" } diff --git a/crates/fluvio-auth/Cargo.toml b/crates/fluvio-auth/Cargo.toml index 36ec348b2b..d448631a83 100644 --- a/crates/fluvio-auth/Cargo.toml +++ b/crates/fluvio-auth/Cargo.toml @@ -15,12 +15,12 @@ path = "src/lib.rs" [dependencies] async-trait = { workspace = true } -futures-util = { version = "0.3.5" } +futures-util = { workspace = true } serde = { workspace = true, features = ['derive'] } serde_json = { workspace = true } thiserror = { workspace = true } tracing = { workspace = true } -x509-parser = "0.15.0" +x509-parser = { workspace = true } fluvio-controlplane-metadata = { workspace = true } fluvio-future = { workspace = true, features = ["net", "openssl_tls"] } diff --git a/crates/fluvio-cli/Cargo.toml b/crates/fluvio-cli/Cargo.toml index 93ffc415da..fee9ecbbe5 100644 --- a/crates/fluvio-cli/Cargo.toml +++ b/crates/fluvio-cli/Cargo.toml @@ -61,7 +61,7 @@ content_inspector = { version = "0.2.4", optional = true } flate2 = { workspace = true } crossterm = { version = "0.26.0", features = ['event-stream']} tui = { version = "0.19.0", default-features = false, features = ['crossterm'] } -futures = "0.3" +futures = { workspace = true} futures-util = { workspace = true, features = ["sink"] } humantime = "2.1.0" static_assertions = { workspace = true } @@ -73,9 +73,8 @@ semver = { workspace = true } thiserror = { workspace = true } tokio = { workspace = true, features = ["macros"] } tracing = { workspace = true } - -which = "4.0.2" -url = "2.1.1" +which = { workspace = true } +url = { workspace = true } # Fluvio dependencies k8-config = { workspace = true, optional = true } diff --git a/crates/fluvio-connector-package/Cargo.toml b/crates/fluvio-connector-package/Cargo.toml index f0cad039e6..dbdf7302b6 100644 --- a/crates/fluvio-connector-package/Cargo.toml +++ b/crates/fluvio-connector-package/Cargo.toml @@ -18,7 +18,7 @@ openapiv3 = { git = "https://github.com/galibey/openapiv3", rev = "bdd22f046d2bc once_cell = { workspace = true } serde = { workspace = true, default-features = false, features = ["derive"] } serde_yaml = { workspace = true } -toml = { workspace = true , default-features = false, optional = true, features = ["preserve_order"] } +toml = { workspace = true , optional = true, features = ["preserve_order"] } tracing = { workspace = true } # fluvio dependencies diff --git a/crates/fluvio-controlplane-metadata/Cargo.toml b/crates/fluvio-controlplane-metadata/Cargo.toml index 2034638337..1b5a798041 100644 --- a/crates/fluvio-controlplane-metadata/Cargo.toml +++ b/crates/fluvio-controlplane-metadata/Cargo.toml @@ -26,7 +26,7 @@ flate2 = { workspace = true, optional = true } lenient_semver = "0.4.2" semver = { workspace = true } serde = { workspace = true, features = ['derive'], optional = true } -toml = { workspace = true, default-features = true, optional = true } +toml = { workspace = true, default-features = true, optional = true } tracing = { workspace = true } # External Fluvio dependencies @@ -41,3 +41,4 @@ fluvio-protocol = { workspace = true, features = [ "record",] } [dev-dependencies] serde_yaml = { workspace = true } fluvio-future = { workspace = true, features = ["fixture"] } + diff --git a/crates/fluvio/Cargo.toml b/crates/fluvio/Cargo.toml index a141cf3429..b3c221e857 100644 --- a/crates/fluvio/Cargo.toml +++ b/crates/fluvio/Cargo.toml @@ -36,14 +36,14 @@ futures-util = { workspace = true } once_cell = { workspace = true } serde = { workspace = true, features = ['derive'] } serde_json = { workspace = true } -tokio = { version = "1.3.0", features = ["macros", "sync"] } +tokio = { workspace = true, features = ["macros", "sync"] } thiserror = { workspace = true } semver = { workspace = true } pin-project = { workspace = true } -siphasher = "0.3.5" +siphasher = { workspace = true } -toml = { workspace = true } +toml = { workspace = true, features = ["display"] } tracing = { workspace = true } # Fluvio dependencies @@ -79,5 +79,5 @@ async-std = { workspace = true } fluvio-future = { workspace = true, features = ["io", "fixture"] } [target.'cfg(target_arch = "wasm32")'.dev-dependencies] -wasm-bindgen-test = "0.3.24" -fluvio_ws_stream_wasm = "0.7.0" +wasm-bindgen-test = { workspace = true } +fluvio_ws_stream_wasm = { workspace = true} diff --git a/examples/00-produce/Cargo.toml b/examples/00-produce/Cargo.toml index 5fc435018e..5964258252 100644 --- a/examples/00-produce/Cargo.toml +++ b/examples/00-produce/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" publish = false [dependencies] -async-std = { version = "1.8.0", default-features = false, features = ["attributes"] } +async-std = { workspace = true, features = ["attributes"] } anyhow = { workspace = true} -fluvio = { path = "../../crates/fluvio" } \ No newline at end of file +fluvio = { workspace = true } \ No newline at end of file diff --git a/examples/01-produce-batch/Cargo.toml b/examples/01-produce-batch/Cargo.toml index 292edf3457..6189a4f186 100644 --- a/examples/01-produce-batch/Cargo.toml +++ b/examples/01-produce-batch/Cargo.toml @@ -8,7 +8,7 @@ publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -async-std = { version = "1.8.0", default-features = false, features = ["attributes"] } +async-std = { workspace = true, features = ["attributes"] } anyhow = { workspace = true} -fluvio = { path = "../../crates/fluvio" } \ No newline at end of file +fluvio = { workspace = true } \ No newline at end of file diff --git a/examples/01-produce-key-value/Cargo.toml b/examples/01-produce-key-value/Cargo.toml index c59a0df797..7089c99d83 100644 --- a/examples/01-produce-key-value/Cargo.toml +++ b/examples/01-produce-key-value/Cargo.toml @@ -8,8 +8,8 @@ publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -async-std = { version = "1.8.0", default-features = false, features = ["attributes"] } -tracing-subscriber = "0.3.15" anyhow = { workspace = true } +async-std = { workspace = true, features = ["attributes"] } +tracing-subscriber = { workspace = true } -fluvio = { path = "../../crates/fluvio" } +fluvio = { workspace = true } diff --git a/examples/02-consume/Cargo.toml b/examples/02-consume/Cargo.toml index fa9dd6d8f9..516515c191 100644 --- a/examples/02-consume/Cargo.toml +++ b/examples/02-consume/Cargo.toml @@ -8,8 +8,8 @@ publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -async-std = { version = "1.8.0", default-features = false , features = ["attributes"] } +async-std = { workspace = true , features = ["attributes"] } futures-lite = { workspace = true } anyhow = { workspace = true } -fluvio = { path = "../../crates/fluvio" } +fluvio = { workspace = true } diff --git a/examples/03-echo/Cargo.toml b/examples/03-echo/Cargo.toml index 7d4512b4fb..e1b683f4e5 100644 --- a/examples/03-echo/Cargo.toml +++ b/examples/03-echo/Cargo.toml @@ -8,8 +8,8 @@ publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -futures = "0.3.0" -async-std = { version = "1.8.0", default-features = false,features = ["attributes"] } +futures = { workspace = true } +async-std = { workspace = true, features = ["attributes"] } anyhow = { workspace = true } -fluvio = { path = "../../crates/fluvio" } \ No newline at end of file +fluvio = { workspace = true } \ No newline at end of file diff --git a/examples/04-admin-watch/Cargo.toml b/examples/04-admin-watch/Cargo.toml index 8a96434874..38301da834 100644 --- a/examples/04-admin-watch/Cargo.toml +++ b/examples/04-admin-watch/Cargo.toml @@ -8,6 +8,8 @@ publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -fluvio = { path = "../../crates/fluvio", features = ["unstable"] } -futures = "0.3.0" -async-std = { version = "1.8.0", default-features = false,features = ["attributes"] } +async-std = { workspace = true, features = ["attributes"] } +futures = { workspace = true } + + +fluvio = { workspace = true , features = ["unstable"] } \ No newline at end of file diff --git a/release-tools/check-crate-version/Cargo.toml b/release-tools/check-crate-version/Cargo.toml index 14bb945431..5e0b6aa62c 100644 --- a/release-tools/check-crate-version/Cargo.toml +++ b/release-tools/check-crate-version/Cargo.toml @@ -10,11 +10,11 @@ license = "Apache-2.0" [dependencies] toml-diff = { path = "toml-diff" } clap = { workspace = true,features = ["std", "derive", "env"] } -flate2 = "1.0.24" +flate2 = { workspace = true } reqwest = { version = "0.11.11", features = ["json"] } -semver = "1.0.13" +semver = { workspace = true } serde = { workspace = true, features = ["serde_derive"] } serde_json = { workspace = true } -tar = "0.4.38" +tar = { workspace = true } toml = { workspace = true, features = ["parse"] } tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }