Skip to content

Commit 83462df

Browse files
authored
use workspace inheritance (#1142)
1 parent 3d86236 commit 83462df

File tree

4 files changed

+46
-36
lines changed

4 files changed

+46
-36
lines changed

Cargo.toml

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,40 @@
11
[package]
2-
authors = ["o2sh <[email protected]>"]
2+
authors.workspace = true
3+
edition.workspace = true
4+
version.workspace = true
5+
license.workspace = true
6+
repository.workspace = true
37
categories = ["command-line-utilities"]
48
description = "Command-line Git information tool"
5-
edition = "2021"
69
exclude = ["docs/vercel/*"]
710
keywords = ["git", "cli", "terminal"]
8-
license = "MIT"
911
name = "onefetch"
10-
readme = "README.md"
11-
repository = "https://github.com/o2sh/onefetch"
1212
homepage = "https://onefetch.dev"
13-
rust-version = "1.65.0"
14-
version = "2.18.1"
13+
rust-version = "1.70.0"
1514

1615
[workspace]
1716
members = ["ascii", "image", "manifest"]
1817

19-
[dependencies]
18+
[workspace.package]
19+
authors = ["o2sh <[email protected]>"]
20+
edition = "2021"
21+
license = "MIT"
22+
version = "2.18.1"
23+
repository = "https://github.com/o2sh/onefetch"
24+
25+
[workspace.dependencies]
26+
owo-colors = "3.5.0"
2027
anyhow = "1.0"
28+
clap = { version = "4.3.19", features = ["derive"] }
29+
image = "0.24.6"
30+
strum = { version = "0.25.0", features = ["derive"] }
31+
32+
[dependencies]
33+
anyhow.workspace = true
2134
askalono = "0.4.6"
2235
byte-unit = "4.0.19"
2336
bytecount = "0.6.3"
24-
clap = { version = "4.3.19", features = ["derive"] }
37+
clap.workspace = true
2538
clap_complete = "4.3.2"
2639
crossbeam-channel = "0.5.8"
2740
gix-features-for-configuration-only = { package = "gix-features", version = "0.31.0", features = [
@@ -33,19 +46,19 @@ gix = { version = "0.49.1", default-features = false, features = [
3346
git2 = { version = "0.17.2", default-features = false }
3447
globset = "0.4.13"
3548
human-panic = "1.1.5"
36-
image = "0.24.6"
49+
image.workspace = true
3750
num-format = "0.4.4"
3851
onefetch-ascii = { path = "ascii", version = "2.18.1" }
3952
onefetch-image = { path = "image", version = "2.18.1" }
4053
onefetch-manifest = { path = "manifest", version = "2.18.1" }
41-
owo-colors = "3.5.0"
54+
owo-colors.workspace = true
4255
regex = "1.9.3"
4356
serde = "1.0"
4457
serde_json = "1.0"
4558
serde_yaml = "0.9.25"
4659
# TODO With the new value parsers, we're really close to being able to eliminate
4760
# the strum dependency
48-
strum = { version = "0.25.0", features = ["derive"] }
61+
strum.workspace = true
4962
time = { version = "0.3.25", features = ["formatting"] }
5063
time-humanize = { version = "0.1.3", features = ["time"] }
5164
tokei = "12.1.2"

ascii/Cargo.toml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
[package]
2-
authors = ["o2sh <[email protected]>"]
2+
authors.workspace = true
3+
edition.workspace = true
4+
version.workspace = true
5+
license.workspace = true
6+
repository.workspace = true
37
name = "onefetch-ascii"
48
description = "Display colorized ascii art to the terminal"
5-
version = "2.18.1"
6-
edition = "2021"
7-
license = "MIT"
8-
readme = "README.md"
9-
repository = "https://github.com/o2sh/onefetch"
109

1110
[dependencies]
12-
owo-colors = "3.5.0"
11+
owo-colors.workspace = true

image/Cargo.toml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
[package]
2-
authors = ["o2sh <[email protected]>"]
2+
authors.workspace = true
3+
edition.workspace = true
4+
version.workspace = true
5+
license.workspace = true
6+
repository.workspace = true
37
name = "onefetch-image"
48
description = "Display images in the terminal"
5-
version = "2.18.1"
6-
edition = "2021"
7-
license = "MIT"
8-
readme = "README.md"
9-
repository = "https://github.com/o2sh/onefetch"
109

1110
[dependencies]
12-
anyhow = "1.0"
13-
clap = { version = "4.3.19", features = ["derive"] }
14-
image = "0.24.6"
11+
anyhow.workspace = true
12+
clap.workspace = true
13+
image.workspace = true
1514

1615
[target.'cfg(not(windows))'.dependencies]
1716
color_quant = "1.1.0"

manifest/Cargo.toml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
[package]
2-
authors = ["o2sh <[email protected]>"]
2+
authors.workspace = true
3+
edition.workspace = true
4+
version.workspace = true
5+
license.workspace = true
6+
repository.workspace = true
37
name = "onefetch-manifest"
48
description = "Detect and parse manifest files"
5-
version = "2.18.1"
6-
edition = "2021"
7-
license = "MIT"
8-
readme = "README.md"
9-
repository = "https://github.com/o2sh/onefetch"
109

1110
[dependencies]
12-
anyhow = "1.0"
11+
anyhow.workspace = true
1312
cargo_toml = "0.15.3"
1413
npm-package-json = "0.1.3"
15-
strum = { version = "0.25.0", features = ["derive"] }
14+
strum.workspace = true

0 commit comments

Comments
 (0)