Skip to content

Commit e6fa7ad

Browse files
committed
Using workspace dependencies
Dependabot is not able to update a dependency in multiple crates in a single pull requests, leading to conflicting versions. Using workspace dependencies the issue is avoided.
1 parent c9fe1f7 commit e6fa7ad

File tree

9 files changed

+185
-178
lines changed

9 files changed

+185
-178
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 83 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,63 @@ assets = [
3737
[badges]
3838
github = { repository = "olimpiadi-informatica/task-maker-rust", workflow = "Rust" }
3939

40+
[workspace.dependencies]
41+
anyhow = "1.0"
42+
approx = "0.5"
43+
askama = "0.11"
44+
askama_derive = "0.11"
45+
better-panic = "0.3"
46+
bincode = "1.2"
47+
blake3 = "1.3"
48+
clap = "4.5"
49+
clap_complete = "4.5"
50+
colored = "2"
51+
const_format = "0.2"
52+
crossbeam-channel = "0.5.6"
53+
ctrlc = "3.4"
54+
derivative = "2.2"
55+
directories = "5.0"
56+
ductile = "0.3"
57+
env_logger = "0.11"
58+
fastrand = "2.0"
59+
fslock = "0.2"
60+
glob = "0.3"
61+
inventory = "0.3.3"
62+
itertools = "0.13"
63+
lazy_static = "1.5"
64+
log = "0.4"
65+
mime_guess = "2.0"
66+
nix = "0.26"
67+
num_cpus = "1.10"
68+
paste = "1.0.11"
69+
pest = "2.1"
70+
pest_derive = "2.1"
71+
pretty_assertions = "1.2"
72+
ratatui = { version = "0.28", default-features = false }
73+
regex = "1"
74+
rlimit = "0.10"
75+
scopeguard = "1.2"
76+
serde = "1.0"
77+
serde_json = "1.0"
78+
serde_yaml = "0.9"
79+
shell-words = "1.1"
80+
speculoos = "0.11"
81+
supports-color = "2"
82+
tabox = "1"
83+
tempfile = "3.13"
84+
termcolor = "1"
85+
termion = "4"
86+
thiserror = "1.0"
87+
unic = "0.9"
88+
url = "2.5"
89+
uuid = "1.1"
90+
walkdir = "2.5"
91+
which = "7.0"
92+
whoami = "1.5"
93+
wildmatch = "2.1.0"
94+
95+
typescript-definitions = { git = "https://github.com/onelson/typescript-definitions", branch = "no-debug-attrs" }
96+
4097
[dependencies]
4198
task-maker-dag = { path = "./task-maker-dag" }
4299
task-maker-store = { path = "./task-maker-store" }
@@ -46,55 +103,55 @@ task-maker-lang = { path = "./task-maker-lang" } # needed only by typescriptify
46103
task-maker-format = { path = "./task-maker-format" }
47104

48105
# Logging and setting up the global logger
49-
log = "0.4"
50-
env_logger = "0.11"
106+
log = { workspace = true }
107+
env_logger = { workspace = true }
51108
# Argument parsing
52-
clap = { version = "4.5", features = ["derive"] }
53-
clap_complete = "4.5"
54-
num_cpus = "1.10"
109+
clap = { workspace = true, features = ["derive"] }
110+
clap_complete = { workspace = true }
111+
num_cpus = { workspace = true }
55112
# Better stacktraces for panics
56-
better-panic = "0.3"
113+
better-panic = { workspace = true }
57114
# Worker and client name
58-
whoami = "1.5"
115+
whoami = { workspace = true }
59116
# Cross-platform cache directory
60-
directories = "5.0"
117+
directories = { workspace = true }
61118
# Generic error utilities
62-
anyhow = { version = "1.0", features = ["backtrace"] }
119+
anyhow = { workspace = true, features = ["backtrace"] }
63120
# Message serialization for UI/sandbox/...
64-
serde = "1.0"
65-
serde_json = "1.0"
121+
serde = { workspace = true }
122+
serde_json = { workspace = true }
66123
# Sandbox implementation for --sandbox
67-
tabox = "1"
124+
tabox = { workspace = true }
68125
# Signal handler for ^C
69-
ctrlc = "3.4"
126+
ctrlc = { workspace = true }
70127
# Global constants
71-
lazy_static = "1.5"
128+
lazy_static = { workspace = true }
72129
# General iterator utilities
73-
itertools = "0.13"
130+
itertools = { workspace = true }
74131
# Iterate recursively the files in a directory (used for `task-maker-tools reset`)
75-
walkdir = "2.5"
132+
walkdir = { workspace = true }
76133
# defer! macro
77-
scopeguard = "1.2"
134+
scopeguard = { workspace = true }
78135
# URL parsing for connecting to a remote server
79-
url = "2.5"
136+
url = { workspace = true }
80137
# Temporary directory for sandboxes
81-
tempfile = "3.13"
138+
tempfile = { workspace = true }
82139
# Regex
83-
regex = "1"
140+
regex = { workspace = true }
84141
# setrlimit for setting unlimited stack for the checker in the fuzzer
85-
rlimit = "0.10"
142+
rlimit = { workspace = true }
86143
# Geenrating random numbers (the seed in find-bad-case tool)
87-
fastrand = "2.0"
144+
fastrand = { workspace = true }
88145
# Curses UI
89-
ratatui = { version = "0.28", default-features = false, features = ["termion"] }
146+
ratatui = { workspace = true, features = ["termion"] }
90147

91148
# Typescript definition generation
92-
typescript-definitions = { git = "https://github.com/onelson/typescript-definitions", branch = "no-debug-attrs"}
149+
typescript-definitions = { workspace = true }
93150

94151
[dev-dependencies]
95-
approx = "0.5"
152+
approx = { workspace = true }
96153
# Resolve executable names in $PATH
97-
which = "7.0"
154+
which = { workspace = true }
98155

99156
[[bin]]
100157
name = "task-maker"

task-maker-cache/Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ task-maker-dag = { path = "../task-maker-dag" }
99
task-maker-store = { path = "../task-maker-store" }
1010

1111
# General iterator utilities
12-
itertools = "0.10"
12+
itertools = { workspace = true }
1313
# Serialization/Deserialization
14-
serde = { version = "1.0", features = ["derive"] }
15-
bincode = "1.2"
14+
serde = { workspace = true, features = ["derive"] }
15+
bincode = { workspace = true }
1616
# Generic error utilities
17-
anyhow = { version = "1.0", features = ["backtrace"] }
17+
anyhow = { workspace = true, features = ["backtrace"] }
1818
# Logging
19-
log = "0.4"
19+
log = { workspace = true }
2020
# Compile time string format
21-
const_format = "0.2"
21+
const_format = { workspace = true }
2222

2323
[dev-dependencies]
24-
tempfile = "3.3"
24+
tempfile = { workspace = true }

task-maker-dag/Cargo.toml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,16 @@ edition = "2021"
66

77
[dependencies]
88
task-maker-store = { path = "../task-maker-store" }
9+
910
# Serialization/Deserialization
10-
serde = { version = "1.0", features = ["derive"] }
11+
serde = { workspace = true, features = ["derive"] }
1112
# UUID generation
12-
uuid = { version = "1.1", features = ["v4", "fast-rng", "serde"] }
13+
uuid = { workspace = true, features = ["v4", "fast-rng", "serde"] }
1314
# Generic error utilities
14-
anyhow = { version = "1.0", features = ["backtrace"] }
15+
anyhow = { workspace = true, features = ["backtrace"] }
1516
# Typescript definition generation
16-
typescript-definitions = { git = "https://github.com/onelson/typescript-definitions", branch = "no-debug-attrs"}
17+
typescript-definitions = { workspace = true }
1718

1819
[dev-dependencies]
19-
tempfile = "3.3"
20-
approx = "0.5"
20+
tempfile = { workspace = true }
21+
approx = { workspace = true }

task-maker-diagnostics/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ edition = "2021"
55

66
[dependencies]
77
# Serialization/Deserialization
8-
serde = { version = "1.0", features = ["derive"] }
8+
serde = { workspace = true, features = ["derive"] }
99
# Utilities for writing to the terminal with colors
10-
colored = "2"
10+
colored = { workspace = true }
1111
# Generic error utilities
12-
anyhow = "1"
12+
anyhow = { workspace = true }

0 commit comments

Comments
 (0)