Skip to content

Commit

Permalink
Using workspace dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
rodoufu committed Jan 16, 2024
1 parent 335380a commit 7469511
Show file tree
Hide file tree
Showing 14 changed files with 61 additions and 44 deletions.
17 changes: 17 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,20 @@ members = [
"tracing-journald",
"examples"
]

[workspace.dependencies]
criterion = "0.3.6"
futures = "0.3.21"
http = "0.2.8"
log = "0.4.17"
nu-ansi-term = "0.46.0"
once_cell = "1.19"
parking_lot = "0.12.1"
pin-project-lite = "0.2.9"
serde = "1.0.139"
serde_json = "1.0.82"
tempfile = "3.3.0"
thiserror = "1.0.31"
time = "0.3.2"
tokio = "1.20.0"
tokio-test = "0.4.2"
16 changes: 8 additions & 8 deletions examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,28 +25,28 @@ tracing-appender = { path = "../tracing-appender" }
tracing-journald = { path = "../tracing-journald" }

# serde example
serde_json = "1.0.82"
serde_json = { workspace = true }

futures = "0.3.21"
tokio = { version = "1.20.0", features = ["full"] }
futures = { workspace = true }
tokio = { workspace = true, features = ["full"] }

# tower examples
tower = { version = "0.4.13", features = ["full"] }
http = "0.2.8"
http = { workspace = true }
hyper = { version = "0.14.20", features = ["full"] }
rand = "0.7.3"
bytes = "1.2.0"
argh = "0.1.8"

# sloggish example
nu-ansi-term = "0.46.0"
nu-ansi-term = { workspace = true }
humantime = "2.1.0"
log = "0.4.17"
log = { workspace = true }

# inferno example
inferno = "0.11.6"
tempfile = "3.3.0"
tempfile = { workspace = true }

# fmt examples
snafu = "0.6.10"
thiserror = "1.0.31"
thiserror = { workspace = true }
10 changes: 5 additions & 5 deletions tracing-appender/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ rust-version = "1.53.0"

[dependencies]
crossbeam-channel = "0.5.5"
time = { version = "0.3.2", default-features = false, features = ["formatting", "parsing"] }
parking_lot = { optional = true, version = "0.12.1" }
thiserror = "1.0.31"
time = { workspace = true, default-features = false, features = ["formatting", "parsing"] }
parking_lot = { workspace = true, optional = true }
thiserror = { workspace = true }

[dependencies.tracing-subscriber]
path = "../tracing-subscriber"
Expand All @@ -35,8 +35,8 @@ features = ["fmt", "std"]
[dev-dependencies]
criterion = { version = "0.3.6", default_features = false }
tracing = { path = "../tracing", version = "0.2" }
time = { version = "0.3.2", default-features = false, features = ["formatting", "parsing"] }
tempfile = "3.3.0"
time = { workspace = true, default-features = false, features = ["formatting", "parsing"] }
tempfile = { workspace = true }

[[bench]]
name = "bench"
Expand Down
2 changes: 1 addition & 1 deletion tracing-attributes/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ quote = "1.0.20"
[dev-dependencies]
tracing = { path = "../tracing", version = "0.2" }
tracing-mock = { path = "../tracing-mock" }
tokio-test = "0.4.2"
tokio-test = { workspace = true }
tracing-subscriber = { path = "../tracing-subscriber", version = "0.3", features = [
"env-filter",
] }
Expand Down
2 changes: 1 addition & 1 deletion tracing-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ std = ["once_cell", "alloc"]
maintenance = { status = "actively-developed" }

[dependencies]
once_cell = { version = "1.13.0", optional = true }
once_cell = { workspace = true, optional = true }

[package.metadata.docs.rs]
all-features = true
Expand Down
4 changes: 2 additions & 2 deletions tracing-flame/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ smallvec = ["tracing-subscriber/smallvec"]
[dependencies]
tracing-subscriber = { path = "../tracing-subscriber", version = "0.3", default-features = false, features = ["registry", "fmt"] }
tracing = { path = "../tracing", version = "0.2", default-features = false, features = ["std"] }
once_cell = "1.13.0"
once_cell = { workspace = true }

[dev-dependencies]
tempfile = "3.3.0"
tempfile = { workspace = true }
6 changes: 3 additions & 3 deletions tracing-futures/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ std = ["tracing/std"]

[dependencies]
futures_01 = { package = "futures", version = "0.1.31", optional = true }
futures = { version = "0.3.21", optional = true }
futures = { workspace = true, optional = true }
futures-task = { version = "0.3.21", optional = true }
pin-project-lite = { version = "0.2.9", optional = true }
pin-project-lite = { workspace = true, optional = true }
tracing = { path = "../tracing", version = "0.2", default-features = false }
tokio-executor = { version = "0.1.10", optional = true }
tokio_01 = { package = "tokio", version = "0.1.22", optional = true }
Expand All @@ -41,7 +41,7 @@ mio = "0.6.23"

[dev-dependencies]
futures = "0.3.21"
tokio-test = "0.4.2"
tokio-test = { workspace = true }
tracing-core = { path = "../tracing-core", version = "0.2" }
tracing-mock = { path = "../tracing-mock" }
tracing-test = { path = "../tracing-test" }
Expand Down
4 changes: 2 additions & 2 deletions tracing-journald/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tracing-core = { path = "../tracing-core", version = "0.2" }
tracing-subscriber = { path = "../tracing-subscriber", version = "0.3", default-features = false, features = ["registry"] }

[dev-dependencies]
serde_json = "1.0.82"
serde = { version = "1.0.139", features = ["derive"] }
serde_json = { workspace = true }
serde = { workspace = true, features = ["derive"] }
tracing = { path = "../tracing", version = "0.2" }

4 changes: 2 additions & 2 deletions tracing-log/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ log-tracer = []

[dependencies]
tracing-core = { path = "../tracing-core", version = "0.2"}
log = "0.4.17"
once_cell = "1.13.0"
log = { workspace = true }
once_cell = { workspace = true }
env_logger = { version = "0.8.4", optional = true }

[dev-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions tracing-serde/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ default = ["std"]
std = ["serde/std", "tracing-core/std"]

[dependencies]
serde = { version = "1.0.139", default-features = false, features = ["alloc"] }
serde = { workspace = true, default-features = false, features = ["alloc"] }
tracing-core = { path = "../tracing-core", version = "0.2", default-features = false }

[dev-dependencies]
serde_json = "1.0.82"
serde_json = { workspace = true }

[badges]
maintenance = { status = "experimental" }
18 changes: 9 additions & 9 deletions tracing-subscriber/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,20 @@ tracing = { optional = true, path = "../tracing", version = "0.2", default-featu
matchers = { optional = true, version = "0.1.0" }
regex = { optional = true, version = "1.6.0", default-features = false, features = ["std", "unicode-case", "unicode-perl"] }
smallvec = { optional = true, version = "1.9.0" }
once_cell = { optional = true, version = "1.13.0" }
once_cell = { workspace = true, optional = true }

# fmt
tracing-log = { path = "../tracing-log", version = "0.2", optional = true, default-features = false, features = ["log-tracer", "std"] }
nu-ansi-term = { version = "0.46.0", optional = true }
time = { version = "0.3.2", features = ["formatting"], optional = true }
nu-ansi-term = { workspace = true, optional = true }
time = { workspace = true, features = ["formatting"], optional = true }

# only required by the json feature
serde_json = { version = "1.0.82", optional = true }
serde = { version = "1.0.139", optional = true }
serde_json = { workspace = true, optional = true }
serde = { workspace = true, optional = true }
tracing-serde = { path = "../tracing-serde", version = "0.2", optional = true }

# opt-in deps
parking_lot = { version = "0.12.1", optional = true }
parking_lot = { workspace = true, optional = true }
chrono = { version = "0.4.26", default-features = false, features = ["clock", "std"], optional = true }

# registry
Expand All @@ -68,12 +68,12 @@ thread_local = { version = "1.1.4", optional = true }
[dev-dependencies]
tracing = { path = "../tracing", version = "0.2" }
tracing-mock = { path = "../tracing-mock", features = ["tracing-subscriber"] }
log = "0.4.17"
log = { workspace = true }
tracing-log = { path = "../tracing-log", version = "0.2" }
criterion = { version = "0.3.6", default_features = false }
criterion = { workspace = true, default_features = false }
regex = { version = "1.6.0", default-features = false, features = ["std"] }
tracing-futures = { path = "../tracing-futures", version = "0.3", default-features = false, features = ["std-future", "std"] }
tokio = { version = "1.20.0", features = ["rt", "macros"] }
tokio = { workspace = true, features = ["rt", "macros"] }
# Enable the `time` crate's `macros` feature, for examples.
time = { version = "0.3.2", features = ["formatting", "macros"] }

Expand Down
2 changes: 1 addition & 1 deletion tracing-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ rust-version = "1.49.0"
publish = false

[dependencies]
tokio-test = "0.4.2"
tokio-test = { workspace = true }

[package.metadata.docs.rs]
all-features = true
Expand Down
6 changes: 3 additions & 3 deletions tracing-tower/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ tower-make = [
[dependencies]
tracing = { path = "../tracing", version = "0.2", default-features = false, features = ["std"] }
tracing-futures = { version = "0.3", path = "../tracing-futures", features = ["std-future"] }
futures = "0.3.21"
futures = { workspace = true }
tower-service = "0.3.2"
tower-layer = { version = "0.3.1", optional = true }
tower_make = { package = "tower-make", version = "0.3.0", optional = true }
pin-project-lite = { version = "0.2.9", optional = true }
http = { version = "0.2.8", optional = true }
pin-project-lite = { workspace = true, optional = true }
http = { workspace = true, optional = true }

[badges]
maintenance = { status = "experimental" }
Expand Down
10 changes: 5 additions & 5 deletions tracing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ rust-version = "1.63.0"

[dependencies]
tracing-core = { path = "../tracing-core", version = "0.2", default-features = false }
log = { version = "0.4.17", optional = true }
log = { workspace = true, optional = true }
tracing-attributes = { path = "../tracing-attributes", version = "0.2", optional = true }
pin-project-lite = "0.2.9"
pin-project-lite = { workspace = true }

[dev-dependencies]
criterion = { version = "0.3.6", default_features = false }
futures = { version = "0.3.21", default_features = false }
log = "0.4.17"
criterion = { workspace = true, default_features = false }
futures = { workspace = true, default_features = false }
log = { workspace = true }
tracing-mock = { path = "../tracing-mock" }

[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
Expand Down

0 comments on commit 7469511

Please sign in to comment.