Skip to content

Commit

Permalink
chore: move more dep to workspace (#3190)
Browse files Browse the repository at this point in the history
  • Loading branch information
@sehz
sehz committed Apr 25, 2023
1 parent 97d83b0 commit 1dfb18b
Show file tree
Hide file tree
Showing 14 changed files with 43 additions and 48 deletions.
16 changes: 3 additions & 13 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 7 additions & 4 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand All @@ -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" }
Expand All @@ -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" }
Expand Down
4 changes: 2 additions & 2 deletions crates/fluvio-auth/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
7 changes: 3 additions & 4 deletions crates/fluvio-cli/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand All @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion crates/fluvio-connector-package/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion crates/fluvio-controlplane-metadata/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -41,3 +41,4 @@ fluvio-protocol = { workspace = true, features = [ "record",] }
[dev-dependencies]
serde_yaml = { workspace = true }
fluvio-future = { workspace = true, features = ["fixture"] }

10 changes: 5 additions & 5 deletions crates/fluvio/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}
4 changes: 2 additions & 2 deletions examples/00-produce/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
fluvio = { workspace = true }
4 changes: 2 additions & 2 deletions examples/01-produce-batch/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
fluvio = { workspace = true }
6 changes: 3 additions & 3 deletions examples/01-produce-key-value/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
4 changes: 2 additions & 2 deletions examples/02-consume/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
6 changes: 3 additions & 3 deletions examples/03-echo/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
fluvio = { workspace = true }
8 changes: 5 additions & 3 deletions examples/04-admin-watch/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
6 changes: 3 additions & 3 deletions release-tools/check-crate-version/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }

0 comments on commit 1dfb18b

Please sign in to comment.