Skip to content

Commit 3a52d42

Browse files
Mass refactor of Cargo files to use workspace inheritance
1 parent 3302ba1 commit 3a52d42

File tree

13 files changed

+188
-157
lines changed

13 files changed

+188
-157
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,62 @@ members = [
1414
"scribbles",
1515
"defaults",
1616
]
17+
18+
[workspace.dependencies]
19+
log = "0.4.28"
20+
21+
### Error Handling
22+
anyhow = "1.0.86"
23+
thiserror = "1.0.50"
24+
25+
### Serialing / Deserialising
26+
strum = { version = "0.26.3", features = ["derive"] }
27+
serde = { version = "1.0.204", features = ["derive"] }
28+
29+
### JSON Handling
30+
serde_json = { version = "1.0.120" }
31+
json-patch = "2.0.0"
32+
33+
### Async Handling
34+
tokio = { version = "1.39.1", features = ["full"] }
35+
futures = "0.3.30"
36+
37+
### Enums
38+
enumset = "1.1.5"
39+
enum-map = { version = "2.7.3", features = ["serde"] }
40+
41+
### Messaging
42+
interprocess = { version = "2.2.1", features = ["tokio"] }
43+
byteorder = "1.5.0"
44+
45+
### CLI Parameter Handling
46+
clap = { version = "4.5.11", features = ["derive"] }
47+
48+
### Directory Inclusion
49+
include_dir = "0.7.4"
50+
51+
### Image Manipulation
52+
image = "0.25.6"
53+
54+
### CFG handler
55+
cfg-if = "1.0.0"
56+
57+
### USB Handler
58+
rusb = "0.9.4"
59+
60+
### Lazy Statics
61+
lazy_static = "1.5.0"
62+
63+
### Regular Expressions
64+
fancy-regex = "0.14.0"
65+
66+
### Which? - LINUX / MAC SPECIFIC?
67+
which = "6.0.1"
68+
69+
### Windows Specific
70+
windows = "0.58.0"
71+
winreg = "0.52.0"
72+
windres = "0.2.2"
73+
74+
### Linux Specific
75+
nix = "0.29.0"

audio/Cargo.toml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,23 @@ edition = "2021"
66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
77

88
[dependencies]
9-
# Symphonia for Audio Decoding..
9+
# Common Workspace
10+
log = { workspace = true }
11+
anyhow = { workspace = true }
12+
fancy-regex = { workspace = true } # Used for Finding Devices
13+
14+
# Symphonia for Audio Decoding.
1015
symphonia = { version = "0.5.4", features = ["wav", "mp3", "ogg", "flac"] }
1116

12-
# Hound for WAV Encoding..
17+
# Hound for WAV Encoding.
1318
hound = "3.5.1"
1419

1520
# Audio Normalisation
1621
ebur128 = "0.1.9"
1722

18-
# Exceptions
19-
anyhow = "1.0.86"
20-
21-
# Logging..
22-
log = "0.4.22"
23-
2423
# Ring Buffer is now needed on all platforms.
2524
rb = "0.4.1"
2625

27-
# Regular Expressions to help with device finding..
28-
fancy-regex = "0.14.0"
29-
3026
# Under Linux, we'll use PulseAudio to output to the GoXLR..
3127
# We can't find the specific audio channels using CPAL, so will ask Pulse instead.
3228
[target.'cfg(target_os = "linux")'.dependencies]

client/Cargo.toml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,18 @@ path = "src/bin/quiet.rs"
2424
[dependencies]
2525
goxlr-ipc = { path = "../ipc" }
2626
goxlr-types = { path = "../types", features = ["clap"] }
27-
tokio = { version = "1.39.1", features = ["full"] }
28-
simplelog = "0.12.2"
29-
anyhow = "1.0.86"
30-
clap = { version = "4.5.11", features = ["derive"] }
31-
strum = { version = "0.26.3" }
32-
serde_json = { version = "1.0.120" }
33-
tokio-serde = { version = "0.9.0", features = ["json"] }
34-
interprocess = { version = "2.2.1", features = ["tokio"] }
27+
28+
# Common Workspace
29+
anyhow = { workspace = true }
30+
strum = { workspace = true }
31+
serde_json = { workspace = true }
32+
tokio = { workspace = true }
33+
interprocess = { workspace = true }
34+
clap = { workspace = true }
3535

3636
[build-dependencies]
37-
clap = { version = "4.5.11", features = ["derive"] }
38-
clap_complete = "4.5.4"
3937
goxlr-types = { path = "../types", features = ["clap"] }
38+
39+
clap = { workspace = true }
40+
clap_complete = "4.5.4"
41+

0 commit comments

Comments
 (0)