Skip to content

Commit d2ebadb

Browse files
karimElmougisxyazi
andauthored
chore: move common dependencies to workspace Cargo.toml (#1388)
Co-authored-by: sxyazi <[email protected]>
1 parent 3fdbbfe commit d2ebadb

File tree

15 files changed

+216
-199
lines changed

15 files changed

+216
-199
lines changed

Cargo.lock

Lines changed: 67 additions & 67 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,30 @@ codegen-units = 1
88
lto = true
99
panic = "abort"
1010
strip = true
11+
12+
[workspace.dependencies]
13+
ansi-to-tui = "=3.1.0"
14+
anyhow = "1.0.86"
15+
arc-swap = "1.7.1"
16+
base64 = "0.22.1"
17+
bitflags = "2.6.0"
18+
clap = { version = "4.5.13", features = [ "derive" ] }
19+
crossterm = { version = "0.27.0", features = [ "event-stream" ] }
20+
dirs = "5.0.1"
21+
futures = "0.3.30"
22+
globset = "0.4.14"
23+
libc = "0.2.155"
24+
md-5 = "0.10.6"
25+
mlua = { version = "0.9.9", features = [ "lua54", "serialize", "macros", "async" ] }
26+
parking_lot = "0.12.3"
27+
ratatui = "0.27.0"
28+
regex = "1.10.6"
29+
scopeguard = "1.2.0"
30+
serde = { version = "1.0.204", features = [ "derive" ] }
31+
serde_json = "1.0.122"
32+
shell-words = "1.1.0"
33+
tokio = { version = "1.39.2", features = [ "full" ] }
34+
tokio-stream = "0.1.15"
35+
tokio-util = "0.7.11"
36+
tracing = { version = "0.1.40", features = [ "max_level_debug", "release_max_level_warn" ] }
37+
unicode-width = "0.1.13"

yazi-adapter/Cargo.toml

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,20 @@ yazi-config = { path = "../yazi-config", version = "0.3.0" }
1313
yazi-shared = { path = "../yazi-shared", version = "0.3.0" }
1414

1515
# External dependencies
16-
ansi-to-tui = "=3.1.0"
17-
anyhow = "1.0.86"
18-
arc-swap = "1.7.1"
19-
base64 = "0.22.1"
16+
ansi-to-tui = { workspace = true }
17+
anyhow = { workspace = true }
18+
arc-swap = { workspace = true }
19+
base64 = { workspace = true }
2020
color_quant = "1.1.0"
21-
crossterm = "0.27.0"
22-
futures = "0.3.30"
21+
crossterm = { workspace = true }
22+
futures = { workspace = true }
2323
image = "0.25.2"
2424
imagesize = "0.13.0"
2525
kamadak-exif = "0.5.5"
26-
ratatui = "0.27.0"
27-
scopeguard = "1.2.0"
28-
tokio = { version = "1.39.2", features = [ "full" ] }
29-
30-
# Logging
31-
tracing = { version = "0.1.40", features = [ "max_level_debug", "release_max_level_warn" ] }
26+
ratatui = { workspace = true }
27+
scopeguard = { workspace = true }
28+
tokio = { workspace = true }
29+
tracing = { workspace = true }
3230

3331
[target.'cfg(target_os = "macos")'.dependencies]
34-
crossterm = { version = "0.27.0", features = [ "use-dev-tty" ] }
32+
crossterm = { workspace = true, features = [ "use-dev-tty" ] }

yazi-boot/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ homepage = "https://yazi-rs.github.io"
99
repository = "https://github.com/sxyazi/yazi"
1010

1111
[dependencies]
12-
regex = "1.10.5"
12+
regex = { workspace = true }
1313
yazi-adapter = { path = "../yazi-adapter", version = "0.3.0" }
1414
yazi-config = { path = "../yazi-config", version = "0.3.0" }
1515
yazi-shared = { path = "../yazi-shared", version = "0.3.0" }
1616

1717
# External dependencies
18-
clap = { version = "4.5.11", features = [ "derive" ] }
19-
serde = { version = "1.0.204", features = [ "derive" ] }
18+
clap = { workspace = true }
19+
serde = { workspace = true }
2020

2121
[build-dependencies]
22-
clap = { version = "4.5.11", features = [ "derive" ] }
23-
clap_complete = "4.5.11"
22+
clap = { workspace = true }
23+
clap_complete = "4.5.12"
2424
clap_complete_fig = "4.5.2"
2525
clap_complete_nushell = "4.5.3"
2626
vergen-gitcl = { version = "1.0.0", features = [ "build" ] }

yazi-cli/Cargo.toml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,28 @@ yazi-dds = { path = "../yazi-dds", version = "0.3.0" }
1414
yazi-shared = { path = "../yazi-shared", version = "0.3.0" }
1515

1616
# External dependencies
17-
anyhow = "1.0.86"
18-
clap = { version = "4.5.11", features = [ "derive" ] }
19-
crossterm = "0.27.0"
20-
md-5 = "0.10.6"
21-
serde_json = "1.0.121"
22-
tokio = { version = "1.39.2", features = [ "full" ] }
23-
toml_edit = "0.22.18"
17+
anyhow = { workspace = true }
18+
clap = { workspace = true }
19+
crossterm = { workspace = true }
20+
md-5 = { workspace = true }
21+
serde_json = { workspace = true }
22+
tokio = { workspace = true }
23+
toml_edit = "0.22.20"
2424

2525
[build-dependencies]
2626
yazi-shared = { path = "../yazi-shared", version = "0.3.0" }
2727

2828
# External build dependencies
29-
anyhow = "1.0.86"
30-
clap = { version = "4.5.11", features = [ "derive" ] }
31-
clap_complete = "4.5.11"
29+
anyhow = { workspace = true }
30+
clap = { workspace = true }
31+
clap_complete = "4.5.12"
3232
clap_complete_fig = "4.5.2"
3333
clap_complete_nushell = "4.5.3"
34-
serde_json = "1.0.121"
34+
serde_json = { workspace = true }
3535
vergen-gitcl = { version = "1.0.0", features = [ "build" ] }
3636

3737
[target.'cfg(target_os = "macos")'.dependencies]
38-
crossterm = { version = "0.27.0", features = [ "use-dev-tty" ] }
38+
crossterm = { workspace = true, features = [ "use-dev-tty" ] }
3939

4040
[[bin]]
4141
name = "ya"

yazi-config/Cargo.toml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ repository = "https://github.com/sxyazi/yazi"
1212
yazi-shared = { path = "../yazi-shared", version = "0.3.0" }
1313

1414
# External dependencies
15-
anyhow = "1.0.86"
16-
arc-swap = "1.7.1"
17-
bitflags = "2.6.0"
18-
crossterm = "0.27.0"
19-
globset = "0.4.14"
20-
indexmap = "2.2.6"
21-
ratatui = "0.27.0"
22-
regex = "1.10.5"
23-
serde = { version = "1.0.204", features = [ "derive" ] }
24-
toml = { version = "0.8.17", features = [ "preserve_order" ] }
15+
anyhow = { workspace = true }
16+
arc-swap = { workspace = true }
17+
bitflags = { workspace = true }
18+
crossterm = { workspace = true }
19+
globset = { workspace = true }
20+
indexmap = "2.3.0"
21+
ratatui = { workspace = true }
22+
regex = { workspace = true }
23+
serde = { workspace = true }
24+
toml = { version = "0.8.19", features = [ "preserve_order" ] }
2525
validator = { version = "0.18.1", features = [ "derive" ] }
2626

2727
[target.'cfg(target_os = "macos")'.dependencies]
28-
crossterm = { version = "0.27.0", features = [ "use-dev-tty" ] }
28+
crossterm = { workspace = true, features = [ "use-dev-tty" ] }

yazi-config/preset/yazi.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ueberzug_offset = [ 0, 0, 0, 0 ]
2929

3030
[opener]
3131
edit = [
32-
{ run = '${EDITOR:=vi} "$@"', desc = "$EDITOR", block = true, for = "unix" },
32+
{ run = '${EDITOR:-vi} "$@"', desc = "$EDITOR", block = true, for = "unix" },
3333
{ run = 'code %*', orphan = true, desc = "code", for = "windows" },
3434
{ run = 'code -w %*', block = true, desc = "code (block)", for = "windows" },
3535
]

yazi-core/Cargo.toml

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,25 @@ yazi-scheduler = { path = "../yazi-scheduler", version = "0.3.0" }
2020
yazi-shared = { path = "../yazi-shared", version = "0.3.0" }
2121

2222
# External dependencies
23-
anyhow = "1.0.86"
24-
bitflags = "2.6.0"
25-
crossterm = "0.27.0"
26-
dirs = "5.0.1"
27-
futures = "0.3.30"
23+
anyhow = { workspace = true }
24+
bitflags = { workspace = true }
25+
crossterm = { workspace = true }
26+
dirs = { workspace = true }
27+
futures = { workspace = true }
2828
notify = { git = "https://github.com/notify-rs/notify.git", rev = "96dec74316a93bed6eec9db177b233e6e017275e", default-features = false, features = [ "macos_fsevent" ] }
29-
parking_lot = "0.12.3"
30-
ratatui = "0.27.0"
31-
scopeguard = "1.2.0"
32-
serde = "1.0.204"
33-
shell-words = "1.1.0"
34-
tokio = { version = "1.39.2", features = [ "full" ] }
35-
tokio-stream = "0.1.15"
36-
tokio-util = "0.7.11"
37-
unicode-width = "0.1.13"
38-
39-
# Logging
40-
tracing = { version = "0.1.40", features = [ "max_level_debug", "release_max_level_warn" ] }
29+
parking_lot = { workspace = true }
30+
ratatui = { workspace = true }
31+
scopeguard = { workspace = true }
32+
serde = { workspace = true }
33+
shell-words = { workspace = true }
34+
tokio = { workspace = true }
35+
tokio-stream = { workspace = true }
36+
tokio-util = { workspace = true }
37+
tracing = { workspace = true }
38+
unicode-width = { workspace = true }
4139

4240
[target."cfg(unix)".dependencies]
43-
libc = "0.2.155"
41+
libc = { workspace = true }
4442

4543
[target.'cfg(target_os = "macos")'.dependencies]
46-
crossterm = { version = "0.27.0", features = [ "use-dev-tty" ] }
44+
crossterm = { workspace = true, features = [ "use-dev-tty" ] }

yazi-dds/Cargo.toml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,15 @@ yazi-boot = { path = "../yazi-boot", version = "0.3.0" }
1717
yazi-shared = { path = "../yazi-shared", version = "0.3.0" }
1818

1919
# External dependencies
20-
anyhow = "1.0.86"
21-
mlua = { version = "0.9.9", features = [ "lua54" ] }
22-
parking_lot = "0.12.3"
23-
serde = { version = "1.0.204", features = [ "derive" ] }
24-
serde_json = "1.0.121"
25-
tokio = { version = "1.39.2", features = [ "full" ] }
26-
tokio-stream = "0.1.15"
27-
tokio-util = "0.7.11"
28-
29-
# Logging
30-
tracing = { version = "0.1.40", features = [ "max_level_debug", "release_max_level_warn" ] }
20+
anyhow = { workspace = true }
21+
mlua = { workspace = true }
22+
parking_lot = { workspace = true }
23+
serde = { workspace = true }
24+
serde_json = { workspace = true }
25+
tokio = { workspace = true }
26+
tokio-stream = { workspace = true }
27+
tokio-util = { workspace = true }
28+
tracing = { workspace = true }
3129

3230
[build-dependencies]
3331
vergen-gitcl = { version = "1.0.0", features = [ "build" ] }

yazi-fm/Cargo.toml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,29 +24,29 @@ yazi-proxy = { path = "../yazi-proxy", version = "0.3.0" }
2424
yazi-shared = { path = "../yazi-shared", version = "0.3.0" }
2525

2626
# External dependencies
27-
anyhow = "1.0.86"
27+
anyhow = { workspace = true }
2828
better-panic = "0.3.0"
29-
crossterm = { version = "0.27.0", features = [ "event-stream" ] }
29+
crossterm = { workspace = true }
3030
fdlimit = "0.3.0"
31-
futures = "0.3.30"
32-
mlua = { version = "0.9.9", features = [ "lua54" ] }
33-
ratatui = "0.27.0"
34-
scopeguard = "1.2.0"
31+
futures = { workspace = true }
32+
mlua = { workspace = true }
33+
ratatui = { workspace = true }
34+
scopeguard = { workspace = true }
3535
syntect = { version = "5.2.0", default-features = false, features = [ "parsing", "plist-load", "regex-onig" ] }
36-
tokio = { version = "1.39.2", features = [ "full" ] }
37-
tokio-stream = "0.1.15"
36+
tokio = { workspace = true }
37+
tokio-stream = { workspace = true }
3838

3939
# Logging
40-
tracing = { version = "0.1.40", features = [ "max_level_debug", "release_max_level_warn" ] }
40+
tracing = { workspace = true }
4141
tracing-appender = "0.2.3"
4242
tracing-subscriber = "0.3.18"
4343

4444
[target."cfg(unix)".dependencies]
45-
libc = "0.2.155"
45+
libc = { workspace = true }
4646
signal-hook-tokio = { version = "0.3.1", features = [ "futures-v0_3" ] }
4747

4848
[target.'cfg(target_os = "macos")'.dependencies]
49-
crossterm = { version = "0.27.0", features = [ "event-stream", "use-dev-tty" ] }
49+
crossterm = { workspace = true, features = [ "use-dev-tty" ] }
5050

5151
[target.'cfg(all(not(target_os = "macos"), not(target_os = "windows")))'.dependencies]
5252
tikv-jemallocator = "0.6.0"

0 commit comments

Comments
 (0)