Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Merged by Bors] - Unify common dependencies #3442

Closed
wants to merge 2 commits into from
Closed

[Merged by Bors] - Unify common dependencies #3442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26c8db1
Unify common dependencies
c410-f3r Aug 14, 2023
1420d7e
Merge branch 'master' into misc
morenol Aug 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 31 additions & 24 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[workspace]
sehz marked this conversation as resolved.
Show resolved Hide resolved
exclude = ["smartmodule/regex-filter"]
members = [
"examples/00-produce",
"examples/01-produce-key-value",
Expand Down Expand Up @@ -53,8 +54,6 @@ members = [
"connector/json-test-connector",
"connector/sink-test-connector",
]

exclude = ["smartmodule/regex-filter"]
resolver = "2"

[workspace.dependencies]
Expand All @@ -70,30 +69,37 @@ async-trait = { version = "0.1.41", default-features = false }
base64 = "0.21.0"
bytes = "1.1.0"
bytesize = "1.1.0"
cargo-generate = { version = "0.18.2", default-features = false }
cargo_toml = "0.15"
cargo-generate = { version = "0.18.2", default-features = false }
cfg-if = "1.0.0"
chrono = { version = "0.4.23", default-features = false }
clap = { version = "4.0.10", default-features = false }
criterion = "0.5.0"
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 }
const_format = { version = "0.2" }
content_inspector = { version = "0.2" }
crc32c = { version = "0.6"}
criterion = "0.5.0"
crossbeam-channel = "0.5"
current_platform = { version = "0.2" }
derive_builder = "0.12.0"
directories = "5.0.0"
dirs = "5.0.0"
duct = { version = "0.13", default-features = false }
event-listener = "2.5.1"
eyre = { version = "0.6", default-features = false}
eyre = { version = "0.6", default-features = false }
flate2 = { version = "1.0.25" }
futures = { version = "0.3.1" }
futures-util = { version = "0.3.6", default-features = false }
futures-channel = "0.3"
futures-lite = "1.11"
futures-util = { version = "0.3.6", default-features = false }
hdrhistogram = "7.0"
hex = "0.4"
home = "0.5"
http = { default-features = false, version = "0.2" }
humantime = "2.0"
humantime-serde = { version = "1.1.1", default-features = false}
humantime-serde = { version = "1.1.1", default-features = false }
include_dir = "0.7.2"
indicatif = "0.17.0"
inventory = "0.3"
Expand All @@ -109,10 +115,11 @@ 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 }
sha2 = { version = "0.10" }
siphasher = "0.3.5"
sysinfo = { version = "0.29.0", default-features = false }
syn = "2.0"
static_assertions = "1.1.0"
syn = "2.0"
sysinfo = { version = "0.29.0", default-features = false }
tar = { version = "0.4.38", default-features = false }
tempfile = "3.4.0"
thiserror = "1.0.30"
Expand All @@ -128,20 +135,20 @@ wasmparser = "0.110.0"
which = "4.1.0"
x509-parser = "0.15.0"

# external fluvio dep
k8-client = { version = "10.0.0" }
k8-types = { version = "0.8.0" }
k8-config = { version = "2.0.0" }
k8-metadata-client = { version = "5.1.0" }
# External fluvio dependencies
fluvio_ws_stream_wasm = "0.7.0"
fluvio-command = { version = "0.2.0" }
fluvio-future = { version = "0.5.1", default-features = false }
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"
trybuild = { git = "https://github.com/infinyon/trybuild", branch = "check_option" }
flv-util = { version = "0.5.2", default-features = false }
k8-client = { version = "10.0.0" }
k8-config = { version = "2.0.0" }
k8-metadata-client = { version = "5.1.0" }
k8-types = { version = "0.8.0" }
trybuild = { branch = "check_option", git = "https://github.com/infinyon/trybuild" }

# internal fluvio dep
# Internal fluvio dependencies
fluvio = { version = "0.21.0", path = "crates/fluvio" }
fluvio-auth = { path = "crates/fluvio-auth" }
fluvio-channel = { path = "crates/fluvio-channel" }
Expand All @@ -150,19 +157,19 @@ fluvio-compression = { version = "0.3", path = "crates/fluvio-compression" }
fluvio-connector-package = { path = "crates/fluvio-connector-package/" }
fluvio-controlplane = { path = "crates/fluvio-controlplane" }
fluvio-controlplane-metadata = { version = "0.24.0", default-features = false, path = "crates/fluvio-controlplane-metadata" }
fluvio-hub-util = { path = "crates/fluvio-hub-util" }
fluvio-extension-common = { path = "crates/fluvio-extension-common", default-features = false }
fluvio-hub-util = { path = "crates/fluvio-hub-util" }
fluvio-package-index = { version = "0.7.0", path = "crates/fluvio-package-index", default-features = false }
fluvio-protocol = { version = "0.10.4", path = "crates/fluvio-protocol" }
fluvio-spu-schema = { version = "0.14.0", path = "crates/fluvio-spu-schema", default-features = false }
fluvio-sc-schema = { version = "0.21.0", path = "crates/fluvio-sc-schema", default-features = false }
fluvio-service = { path = "crates/fluvio-service" }
fluvio-socket = { version = "0.14.3", path = "crates/fluvio-socket", default-features = false }
fluvio-smartengine = { version = "0.7.0", path = "crates/fluvio-smartengine", default-features = false }
fluvio-smartmodule = { version = "0.7.0", path = "crates/fluvio-smartmodule", default-features = false }
fluvio-socket = { version = "0.14.3", path = "crates/fluvio-socket", default-features = false }
fluvio-spu-schema = { version = "0.14.0", path = "crates/fluvio-spu-schema", default-features = false }
fluvio-storage = { path = "crates/fluvio-storage" }
fluvio-stream-model = { version = "0.9.0", path = "crates/fluvio-stream-model", default-features = false }
fluvio-stream-dispatcher = { path = "crates/fluvio-stream-dispatcher" }
fluvio-stream-model = { version = "0.9.0", path = "crates/fluvio-stream-model", default-features = false }
fluvio-types = { version = "0.4.0", path = "crates/fluvio-types", default-features = false }

# Used to make eyre faster on debug builds
Expand Down
4 changes: 2 additions & 2 deletions crates/cdk/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ anyhow = { workspace = true }
clap = { workspace = true, features = ["std", "derive", "help", "usage", "error-context", "env", "wrap_help", "suggestions"], default-features = false }
cargo-builder = { path = "../cargo-builder"}
serde = { workspace = true, features = ["derive"] }
toml = { workspace=true, features = ["parse", "display", "preserve_order"] }
toml = { workspace = true, features = ["parse", "display", "preserve_order"] }
comfy-table = { workspace = true }
sysinfo = { workspace = true, default-features = false }
cargo-generate = { workspace = true }
include_dir = { workspace = true }
tempfile = { workspace = true }
current_platform = { version = "0.2" }
current_platform = { workspace = true }

fluvio = { workspace = true }
fluvio-connector-deployer = { path = "../fluvio-connector-deployer"}
Expand Down
4 changes: 2 additions & 2 deletions crates/fluvio-benchmark/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ async-channel = { workspace = true }
bincode = "1.3.3"
chrono = { workspace = true, features = ['serde']}
clap = { workspace = true, features = ["std","derive"] }
derive_builder = { workspace = true}
derive_builder = { workspace = true }
futures-util = { workspace = true }
hdrhistogram = { workspace = true }
madato = "0.5.3"
Expand All @@ -23,7 +23,7 @@ serde = { workspace = true , features = ['derive'] }
serde_yaml = { workspace = true }
statrs = "0.16.0"
thiserror = { workspace = true }
tracing = {workspace = true}
tracing = {workspace = true }

fluvio = { workspace = true }
fluvio-cli-common = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/fluvio-channel-cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ colored = { workspace = true }
clap = { workspace = true, features = ["std", "derive", "help", "usage", "error-context"], default-features = false }
tracing = { workspace = true }
cfg-if = { workspace = true }
dirs = { workspace = true}
dirs = { workspace = true }
anyhow = { workspace = true }

fluvio-cli-common = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/fluvio-channel/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ cfg-if = { workspace = true }
semver = { workspace = true }
thiserror = { workspace = true }
tracing = { workspace = true }
dirs = { workspace = true}
dirs = { workspace = true }
toml = { workspace = true, features = ["display", "parse"]}
serde = { workspace = true, features = ["derive"] }
anyhow = { workspace = true }
Expand Down
8 changes: 4 additions & 4 deletions crates/fluvio-cli-common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ file-records = ["fluvio-protocol/record", "fluvio-protocol/api"]
[dependencies]
anyhow = { workspace = true }
futures = { workspace = true, features = ["std", "io-compat"]}
home = "0.5.3"
hex = "0.4.2"
http = { version = "0.2", default-features = false}
home = { workspace = true }
hex = { workspace = true }
http = { workspace = true }
isahc = { version = "1.7", default-features = false, features = ["static-curl"] }
semver = { workspace = true }
sha2 = "0.10.0"
sha2 = { workspace = true }
tempfile = { workspace = true }
thiserror = { workspace = true }
tracing = { workspace = true }
Expand Down
14 changes: 7 additions & 7 deletions crates/fluvio-cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,23 +45,23 @@ anyhow = { workspace = true }
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}
dirs = { workspace = true }
indicatif = { workspace = true }
eyre = { workspace = true}
sha2 = "0.10.0"
hex = "0.4.2"
home = "0.5.3"
eyre = { workspace = true }
sha2 = { workspace = true }
hex = { workspace = true }
home = { workspace = true }
current_platform = "0.2"
comfy-table = { workspace = true }
atty = { version = "0.2.14", optional = true }
ctrlc = { version = "3.1.3", optional = true }
colored = { workspace = true }
handlebars = "4"
content_inspector = { version = "0.2.4", optional = true }
content_inspector = { optional = true, workspace = 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 = { workspace = true }
futures-util = { workspace = true, features = ["sink"] }
humantime = { workspace = true }
static_assertions = { workspace = true }
Expand Down
8 changes: 4 additions & 4 deletions crates/fluvio-cluster/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ thiserror = { workspace = true }
derive_builder = { workspace = true }
tracing = { workspace = true }
portpicker = { workspace = true }
async-trait = { workspace = true}
async-trait = { workspace = true }
colored = { workspace = true }
semver = { workspace = true }
url = { workspace = true}
url = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
serde_yaml = { workspace = true }
futures-util = { workspace = true}
futures-util = { workspace = true }
futures-channel = { workspace = true, features = ["sink"] }
tokio = { workspace = true, features = ["macros"] }
once_cell = { workspace = true }
Expand All @@ -58,7 +58,7 @@ duct = { workspace = true, optional = true }
comfy-table = { workspace = true, optional = true }
flate2 = { workspace = true, optional = true }
tar = { workspace = true , optional = true }
sysinfo = { workspace = true, default-features = false}
sysinfo = { workspace = true, default-features = false }


# External Fluvio dependencies
Expand Down
4 changes: 2 additions & 2 deletions crates/fluvio-connector-common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ tracing = { workspace = true }
fluvio = { workspace = true, features = ["smartengine"] }
fluvio-future = { workspace = true, features = ["subscriber"] }
fluvio-connector-package = { workspace = true }
fluvio-connector-derive = { path = "../fluvio-connector-derive/", optional = true}
fluvio-connector-derive = { path = "../fluvio-connector-derive/", optional = true }
fluvio-sc-schema = { workspace = true }
fluvio-smartengine = { workspace = true , features = [ "transformation"] }


[dev-dependencies]
trybuild = { version = "1.0" }
trybuild = { workspace = true }
serde = { workspace = true, features = ["derive"]}
fluvio = { workspace = true }
4 changes: 2 additions & 2 deletions crates/fluvio-connector-package/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ default = ["toml"]

[dependencies]
anyhow = { workspace = true }
bytesize = { workspace = true}
humantime-serde = { workspace = true}
bytesize = { workspace = true }
humantime-serde = { workspace = true }
minijinja = { version = "1.0.0", default-features = false, features = ["custom_syntax", "fuel"] }
openapiv3 = { git = "https://github.com/galibey/openapiv3", rev = "bdd22f046d2bc19ede257504645d31f835545222", default-features = false }
serde = { workspace = true, features = ["derive"], default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions crates/fluvio-extension-common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ path = "src/lib.rs"
target = ["fluvio"]

[dependencies]
anyhow = { workspace = true}
anyhow = { workspace = true }
async-trait = { workspace = true }
clap = { workspace = true, features = ["std", "derive", "help", "usage", "error-context"], default-features = false }
comfy-table = { workspace = true }
serde = { workspace = true, features = ['derive'] }
serde_json ={ workspace = true}
serde_json ={ workspace = true }
serde_yaml = { workspace = true }
futures-lite = { workspace = true }
semver = { workspace = true, features = ["serde"] }
Expand Down
6 changes: 3 additions & 3 deletions crates/fluvio-hub-protocol/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ publish = false

[dependencies]
cargo_toml = { workspace = true }
const_format = "0.2"
dirs = { workspace = true}
const_format = { workspace = true }
dirs = { workspace = true }
serde = { workspace = true, features=["derive"] }
serde_json = { workspace = true}
serde_json = { workspace = true }
serde_yaml = { workspace = true }
toml = { workspace = true }
tracing = { workspace = true }
Expand Down
8 changes: 4 additions & 4 deletions crates/fluvio-hub-util/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ publish = false

[dependencies]
cargo_toml = { workspace = true }
const_format = "0.2"
dirs = { workspace = true}
const_format = { workspace = true }
dirs = { workspace = true }
ed25519-dalek = { version = "1.0.1", features = ["serde"] }
flate2 = { workspace = true }
hex = "0.4"
hex = { workspace = true }
pem = "3.0"
rand = { workspace = true }
rand_core = "0.6"
sha2 = "0.10.6"
sha2 = { workspace = true }
serde = { workspace = true, features=["derive"] }
serde_json = { workspace = true }
serde_yaml = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/fluvio-package-index/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ path = "src/lib.rs"
http_agent = ["http"]

[dependencies]
http = { version = "0.2", default-features = false, optional = true}
http = { optional = true, workspace = true }
once_cell = { workspace = true }
semver = { workspace = true, features = ["serde"] }
serde = { workspace = true, features = ["derive"] }
Expand Down
6 changes: 3 additions & 3 deletions crates/fluvio-protocol/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "fluvio-protocol"
edition = "2021"
version = "0.10.5"
version = "0.10.6"
authors = ["Fluvio Contributors <team@fluvio.io>"]
description = "Fluvio streaming protocol"
repository = "https://github.com/infinyon/fluvio"
Expand Down Expand Up @@ -46,8 +46,8 @@ compress = ["fluvio-compression/compress"]

[dependencies]
bytes = { workspace = true }
crc32c = { workspace = true, optional = true}
content_inspector = { version = "0.2.4", optional = true }
crc32c = { workspace = true, optional = true }
content_inspector = { optional = true, workspace = true }
once_cell = { workspace = true, optional = true }
derive_builder = { workspace = true, optional = true }
eyre = { workspace = true, optional = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/fluvio-spu/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ fluvio-smartengine = { workspace = true, optional = true }
fluvio-smartmodule = { workspace = true}

[dev-dependencies]
once_cell = { workspace = true}
once_cell = { workspace = true }
derive_builder = { workspace = true }
serde_json = { workspace = true }
flate2 = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions crates/fluvio-storage/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ path = "tests/replica_test.rs"
required-features = ["fixture"]

[dependencies]
anyhow = { workspace = true}
anyhow = { workspace = true }
async-lock = { workspace = true }
blocking = "1.1.0"
derive_builder = { workspace = true}
derive_builder = { workspace = true }
bytes = { workspace = true }
nix = { workspace = true }
thiserror = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/fluvio-stream-dispatcher/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ path = "src/lib.rs"

async-trait = { workspace = true }
async-rwlock = { workspace = true }
futures-lite = { workspace = true}
futures-lite = { workspace = true }
async-channel = { workspace = true }
event-listener = { workspace = true }
once_cell = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/fluvio-test-derive/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ fluvio-future = { workspace = true, features = ["task", "timer", "subscriber", "
clap = { workspace = true, features = ["std", "derive", "help", "usage", "error-context"] }
inventory = { workspace = true }
tracing = { workspace = true }
crossbeam-channel = "0.5"
crossbeam-channel = { workspace = true }
Loading
Loading