Skip to content

Commit

Permalink
Unify common dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
c410-f3r committed Jul 20, 2023
1 parent 146e334 commit bc2060d
Show file tree
Hide file tree
Showing 21 changed files with 61 additions and 58 deletions.
6 changes: 3 additions & 3 deletions Cargo.lock

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

7 changes: 6 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ color-eyre = { version = "0.6.0", default-features = false }
colored = "2.0.0"
crc32c = { version = "0.6"}
comfy-table = { version = "7.0.1", default-features = false }
convert_case = "0.6.0"
derive_builder = "0.12.0"
directories = "5.0.0"
dirs = "5.0.0"
Expand All @@ -92,13 +91,18 @@ futures = { version = "0.3.1" }
futures-util = { version = "0.3.6", default-features = false }
futures-channel = "0.3"
futures-lite = "1.11"
hdrhistogram = "7.0"
humantime = "2.0"
humantime-serde = { version = "1.1.1", default-features = false}
include_dir = "0.7.2"
indicatif = "0.17.0"
inventory = "0.3"
nix = "0.26.0"
once_cell = "1.7.2"
pin-project = "1.1.0"
portpicker = "0.1.1"
proc-macro2 = "1.0"
quote = "1.0"
rand = "0.8.5"
regex = "1.7"
semver = "1.0.13"
Expand All @@ -118,6 +122,7 @@ toml = { version = "0.7.0", default-features = false }
tracing = "0.1.19"
tracing-subscriber = { version = "0.3", default-features = false }
url = "2.1.1"
uuid = { version = "1.1", features = ["serde", "v4"] }
wasm-bindgen-test = "0.3.24"
wasmparser = "0.108.0"
which = "4.1.0"
Expand Down
2 changes: 1 addition & 1 deletion connector/cargo_template/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ edition = "2021"
[dependencies]
fluvio = { git = "https://github.com/infinyon/fluvio", rev = "{{fluvio-cargo-dependency-hash}}" }
fluvio-connector-common = { git = "https://github.com/infinyon/fluvio", rev = "{{fluvio-cargo-dependency-hash}}", features = ["derive"]}
serde = { version = "1.0", default-features = false, features = ["derive"]}
serde = { default-features = false, features = ["derive"], workspace = true }
10 changes: 5 additions & 5 deletions connector/json-test-connector/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ publish = false


[dependencies]
async-trait = { version = "0.1", default-features = false}
async-trait = { workspace = true }
futures = { version = "0.3", default-features = false }
anyhow = { workspace = true}
async-std = { version = "1.12", default-features = false, features = ["attributes", "tokio1"]}
tokio = { version = "1.23", default-features = false, features = ["time"]}
serde = { version = "1.0", default-features = false, features = ["derive"]}
anyhow = { workspace = true }
async-std = { features = ["attributes", "tokio1"], workspace = true }
tokio = { default-features = false, features = ["time"], workspace = true }
serde = { default-features = false, features = ["derive"], workspace = true }

fluvio = { path = "../../crates/fluvio/", features = ["smartengine"]}
fluvio-connector-common = { path = "../../crates/fluvio-connector-common/", features = ["derive"] }
Expand Down
10 changes: 5 additions & 5 deletions connector/sink-test-connector/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ publish = false


[dependencies]
async-trait = { version = "0.1", default-features = false}
futures = { version = "0.3", default-features = false }
anyhow = { workspace = true}
async-std = { version = "1.12", default-features = false, features = ["attributes"]}
serde = { version = "1.0", default-features = false, features = ["derive"]}
async-trait = { workspace = true }
futures = { workspace = true }
anyhow = { workspace = true }
async-std = { features = ["attributes"], workspace = true }
serde = { default-features = false, features = ["derive"], workspace = true }

fluvio = { path = "../../crates/fluvio/", features = ["smartengine"]}
fluvio-connector-common = { path = "../../crates/fluvio-connector-common/", features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/cdk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ toml = { workspace=true, features = ["parse", "display", "preserve_order"] }
comfy-table = { workspace = true }
sysinfo = { workspace = true, default-features = false }
cargo-generate = { workspace = true }
include_dir = "0.7.2"
include_dir = { workspace = true }
tempfile = { workspace = true }
current_platform = { version = "0.2" }

Expand Down
2 changes: 1 addition & 1 deletion crates/fluvio-benchmark/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ chrono = { workspace = true, features = ['serde']}
clap = { workspace = true, features = ["std","derive"] }
derive_builder = { workspace = true}
futures-util = { workspace = true }
hdrhistogram = "7.5.2"
hdrhistogram = { workspace = true }
madato = "0.5.3"
rand = { workspace = true }
serde = { workspace = true , features = ['derive'] }
Expand Down
2 changes: 1 addition & 1 deletion crates/fluvio-channel-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ path = "src/lib.rs"
default = ["fluvio-future", "fluvio-types"]

[dependencies]
colored = "2"
colored = { workspace = true }
clap = { workspace = true, features = ["std", "derive", "help", "usage", "error-context"], default-features = false }
tracing = { workspace = true }
cfg-if = { workspace = true }
Expand Down
8 changes: 4 additions & 4 deletions crates/fluvio-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,24 +46,24 @@ bytesize = { workspace = true, features = ['serde'] }
clap = { workspace = true, features = ["std", "derive", "string", "help", "usage", "env", "error-context"] }
clap_complete = "4.0.2"
dirs = { workspace = true}
indicatif = "0.17.0"
eyre = "0.6.1"
indicatif = { workspace = true }
eyre = { workspace = true}
sha2 = "0.10.0"
hex = "0.4.2"
home = "0.5.3"
current_platform = "0.2"
comfy-table = { workspace = true }
atty = { version = "0.2.14", optional = true }
ctrlc = { version = "3.1.3", optional = true }
colored = "2"
colored = { workspace = true }
handlebars = "4"
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 = { workspace = true}
futures-util = { workspace = true, features = ["sink"] }
humantime = "2.1.0"
humantime = { workspace = true }
static_assertions = { workspace = true }
sysinfo = { workspace = true }
serde_yaml = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions crates/fluvio-connector-derive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ proc-macro = true

[dependencies]
syn = { version = "1.0", default-features = false, features = ["full", "parsing", "proc-macro", "derive", "printing"] }
quote = "1.0"
proc-macro2 = "1.0"
quote = { workspace = true }
proc-macro2 = { workspace = true }
8 changes: 4 additions & 4 deletions crates/fluvio-protocol-derive/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "fluvio-protocol-derive"
version = "0.5.3"
version = "0.5.4"
edition = "2021"
authors = ["Fluvio Contributors <team@fluvio.io>"]
description = "Procedure macro to encode/decode fluvio protocol"
Expand All @@ -13,9 +13,9 @@ proc-macro = true
doctest = false

[dependencies]
proc-macro2 = "1.0.0"
quote = "1.0.0"
tracing = "0.1"
proc-macro2 = { workspace = true }
quote = { workspace = true }
tracing = { workspace = true }

[dependencies.syn]
version = "1.0.0"
Expand Down
6 changes: 3 additions & 3 deletions crates/fluvio-smartmodule-derive/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "fluvio-smartmodule-derive"
version = "0.6.0"
version = "0.6.1"
edition = "2021"
license = "Apache-2.0"
authors = ["Fluvio Contributors <team@fluvio.io>"]
Expand All @@ -14,5 +14,5 @@ proc-macro = true

[dependencies]
syn = { workspace = true, features = ["full"] }
quote = "1.0"
proc-macro2 = "1.0"
quote = { workspace = true }
proc-macro2 = { workspace = true }
4 changes: 1 addition & 3 deletions crates/fluvio-smartmodule/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ smartmodule = []
[dependencies]
tracing = { workspace = true }
thiserror = { workspace = true }
eyre = { version = ">=0.6.8", default-features = false, features = [
"auto-install",
] }
eyre = { default-features = false, features = ["auto-install"], workspace = true }
fluvio-smartmodule-derive = { version = "0.6.0", path = "../fluvio-smartmodule-derive" }
fluvio-protocol = { workspace = true, features = [ "link"] }

Expand Down
6 changes: 3 additions & 3 deletions crates/fluvio-socket/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "fluvio-socket"
version = "0.14.4"
version = "0.14.5"
edition = "2021"
authors = ["Fluvio Contributors <team@fluvio.io>"]
description = "Provide TCP socket wrapper for fluvio protocol"
Expand All @@ -20,12 +20,12 @@ tracing = { workspace = true }
cfg-if = { workspace = true }
bytes = { workspace = true }
once_cell = { workspace = true }
futures-util = { version = "0.3.5", features = ["sink", "io"] }
futures-util = { features = ["sink", "io"], workspace = true }
async-lock = { workspace = true }
event-listener = { workspace = true }
async-channel = { workspace = true }
tokio = { workspace = true, features = ["macros"] }
tokio-util = { version = "0.7.0", features = ["codec", "compat"] }
tokio-util = { features = ["codec", "compat"], workspace = true }
async-trait = { workspace = true }
pin-project = { workspace = true }
thiserror = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/fluvio-spu/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ serde_json = { workspace = true }
regex = { workspace = true }
tokio = { workspace = true, features = ["macros"] }
async-channel = { workspace = true }
async-rwlock = "1.1.0"
async-rwlock = { workspace = true }
async-lock = { workspace = true }
event-listener = { workspace = true }
async-io = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions crates/fluvio-stream-model/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ tracing = { workspace = true }
k8-types = { workspace = true, optional = true }

[dev-dependencies]
async-std = { workspace = true, features = [ "attributes",] }
tokio = { workspace = true, features = ["macros"] }
async-std = { workspace = true, features = ["attributes"] }
tokio = { workspace = true, features = ["macros"] }
fluvio-future = { workspace = true, features = ["fixture"] }
4 changes: 2 additions & 2 deletions crates/fluvio-test-case-derive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ version = "0.0.0"
proc-macro = true

[dependencies]
proc-macro2 = "1.0"
quote = "1.0"
proc-macro2 = { workspace = true }
quote = { workspace = true }
syn = { workspace = true, features = ["full"]}

[dev-dependencies]
Expand Down
6 changes: 3 additions & 3 deletions crates/fluvio-test-derive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ proc-macro = true

[dependencies]
syn = { workspace = true, features = ["full"]}
quote = "1.0"
proc-macro2 = "1.0"
quote = { workspace = true }
proc-macro2 = { workspace = true }
serde_json = { workspace = true }
inflections = "1.1"
fluvio-test-util = { path = "../fluvio-test-util" }
Expand All @@ -28,6 +28,6 @@ fluvio = { workspace = true }
tokio = { workspace = true, features = ["macros"] }
fluvio-future = { workspace = true, features = ["task", "timer", "subscriber", "fixture"] }
clap = { workspace = true, features = ["std", "derive", "help", "usage", "error-context"] }
inventory = "0.3"
inventory = { workspace = true }
tracing = { workspace = true }
crossbeam-channel = "0.5"
12 changes: 6 additions & 6 deletions crates/fluvio-test-util/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ tokio = { workspace = true, features = ["macros"] }
syn = { workspace = true }
serde = { workspace = true}
serde_json = { workspace = true}
humantime = "2.1"
quote = "1.0"
proc-macro2 = "1.0"
inventory = "0.3"
humantime = { workspace = true}
quote = { workspace = true }
proc-macro2 = { workspace = true }
inventory = { workspace = true }
comfy-table = { workspace = true }
once_cell = { workspace = true }
dyn-clone = "1.0"
semver = { workspace = true }
hdrhistogram = "7.3.0"
uuid = { version = "1.1", features = ["serde", "v4"] }
hdrhistogram = { workspace = true }
uuid = { workspace = true }
anyhow = { workspace = true }

fluvio = { workspace = true }
Expand Down
12 changes: 6 additions & 6 deletions crates/fluvio-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@ nix = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true}
serde_yaml = { workspace = true }
inventory = "0.3"
tokio = { workspace = true, features = ["macros"] }
inventory = { workspace = true }
tokio = { workspace = true, features = ["macros"] }
comfy-table = { workspace = true }
hdrhistogram = "7.3.0"
hdrhistogram = { workspace = true }
crc = "3.0"
fork = "0.1"
crossbeam-channel = "0.5"
sysinfo = { workspace = true }
signal-hook = "0.3.13"
indicatif = "0.17.0"
async-std = { workspace = true, features = ["attributes",] }
uuid = { version = "1.1", features = ["serde", "v4"] }
indicatif = { workspace = true }
async-std = { workspace = true, features = ["attributes"] }
uuid = { workspace = true }

tracing = { workspace = true }

Expand Down
2 changes: 1 addition & 1 deletion crates/smartmodule-development-kit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ clap = { workspace = true, features = ["std", "derive", "help", "usage", "error-
dirs = { workspace = true}
toml = { workspace = true }
cargo-generate = { workspace = true }
include_dir = "0.7.2"
include_dir = { workspace = true }
tempfile = { workspace = true }
enum-display = "0.1.3"
lib-cargo-crate = "0.2.1"
Expand Down

0 comments on commit bc2060d

Please sign in to comment.