Skip to content

Commit

Permalink
Using workspace dependencies
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Virv12 committed Nov 19, 2024
1 parent c9fe1f7 commit e6fa7ad
Show file tree
Hide file tree
Showing 9 changed files with 185 additions and 178 deletions.
80 changes: 14 additions & 66 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

109 changes: 83 additions & 26 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,63 @@ assets = [
[badges]
github = { repository = "olimpiadi-informatica/task-maker-rust", workflow = "Rust" }

[workspace.dependencies]
anyhow = "1.0"
approx = "0.5"
askama = "0.11"
askama_derive = "0.11"
better-panic = "0.3"
bincode = "1.2"
blake3 = "1.3"
clap = "4.5"
clap_complete = "4.5"
colored = "2"
const_format = "0.2"
crossbeam-channel = "0.5.6"
ctrlc = "3.4"
derivative = "2.2"
directories = "5.0"
ductile = "0.3"
env_logger = "0.11"
fastrand = "2.0"
fslock = "0.2"
glob = "0.3"
inventory = "0.3.3"
itertools = "0.13"
lazy_static = "1.5"
log = "0.4"
mime_guess = "2.0"
nix = "0.26"
num_cpus = "1.10"
paste = "1.0.11"
pest = "2.1"
pest_derive = "2.1"
pretty_assertions = "1.2"
ratatui = { version = "0.28", default-features = false }
regex = "1"
rlimit = "0.10"
scopeguard = "1.2"
serde = "1.0"
serde_json = "1.0"
serde_yaml = "0.9"
shell-words = "1.1"
speculoos = "0.11"
supports-color = "2"
tabox = "1"
tempfile = "3.13"
termcolor = "1"
termion = "4"
thiserror = "1.0"
unic = "0.9"
url = "2.5"
uuid = "1.1"
walkdir = "2.5"
which = "7.0"
whoami = "1.5"
wildmatch = "2.1.0"

typescript-definitions = { git = "https://github.com/onelson/typescript-definitions", branch = "no-debug-attrs" }

[dependencies]
task-maker-dag = { path = "./task-maker-dag" }
task-maker-store = { path = "./task-maker-store" }
Expand All @@ -46,55 +103,55 @@ task-maker-lang = { path = "./task-maker-lang" } # needed only by typescriptify
task-maker-format = { path = "./task-maker-format" }

# Logging and setting up the global logger
log = "0.4"
env_logger = "0.11"
log = { workspace = true }
env_logger = { workspace = true }
# Argument parsing
clap = { version = "4.5", features = ["derive"] }
clap_complete = "4.5"
num_cpus = "1.10"
clap = { workspace = true, features = ["derive"] }
clap_complete = { workspace = true }
num_cpus = { workspace = true }
# Better stacktraces for panics
better-panic = "0.3"
better-panic = { workspace = true }
# Worker and client name
whoami = "1.5"
whoami = { workspace = true }
# Cross-platform cache directory
directories = "5.0"
directories = { workspace = true }
# Generic error utilities
anyhow = { version = "1.0", features = ["backtrace"] }
anyhow = { workspace = true, features = ["backtrace"] }
# Message serialization for UI/sandbox/...
serde = "1.0"
serde_json = "1.0"
serde = { workspace = true }
serde_json = { workspace = true }
# Sandbox implementation for --sandbox
tabox = "1"
tabox = { workspace = true }
# Signal handler for ^C
ctrlc = "3.4"
ctrlc = { workspace = true }
# Global constants
lazy_static = "1.5"
lazy_static = { workspace = true }
# General iterator utilities
itertools = "0.13"
itertools = { workspace = true }
# Iterate recursively the files in a directory (used for `task-maker-tools reset`)
walkdir = "2.5"
walkdir = { workspace = true }
# defer! macro
scopeguard = "1.2"
scopeguard = { workspace = true }
# URL parsing for connecting to a remote server
url = "2.5"
url = { workspace = true }
# Temporary directory for sandboxes
tempfile = "3.13"
tempfile = { workspace = true }
# Regex
regex = "1"
regex = { workspace = true }
# setrlimit for setting unlimited stack for the checker in the fuzzer
rlimit = "0.10"
rlimit = { workspace = true }
# Geenrating random numbers (the seed in find-bad-case tool)
fastrand = "2.0"
fastrand = { workspace = true }
# Curses UI
ratatui = { version = "0.28", default-features = false, features = ["termion"] }
ratatui = { workspace = true, features = ["termion"] }

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

[dev-dependencies]
approx = "0.5"
approx = { workspace = true }
# Resolve executable names in $PATH
which = "7.0"
which = { workspace = true }

[[bin]]
name = "task-maker"
Expand Down
14 changes: 7 additions & 7 deletions task-maker-cache/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ task-maker-dag = { path = "../task-maker-dag" }
task-maker-store = { path = "../task-maker-store" }

# General iterator utilities
itertools = "0.10"
itertools = { workspace = true }
# Serialization/Deserialization
serde = { version = "1.0", features = ["derive"] }
bincode = "1.2"
serde = { workspace = true, features = ["derive"] }
bincode = { workspace = true }
# Generic error utilities
anyhow = { version = "1.0", features = ["backtrace"] }
anyhow = { workspace = true, features = ["backtrace"] }
# Logging
log = "0.4"
log = { workspace = true }
# Compile time string format
const_format = "0.2"
const_format = { workspace = true }

[dev-dependencies]
tempfile = "3.3"
tempfile = { workspace = true }
13 changes: 7 additions & 6 deletions task-maker-dag/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,16 @@ edition = "2021"

[dependencies]
task-maker-store = { path = "../task-maker-store" }

# Serialization/Deserialization
serde = { version = "1.0", features = ["derive"] }
serde = { workspace = true, features = ["derive"] }
# UUID generation
uuid = { version = "1.1", features = ["v4", "fast-rng", "serde"] }
uuid = { workspace = true, features = ["v4", "fast-rng", "serde"] }
# Generic error utilities
anyhow = { version = "1.0", features = ["backtrace"] }
anyhow = { workspace = true, features = ["backtrace"] }
# Typescript definition generation
typescript-definitions = { git = "https://github.com/onelson/typescript-definitions", branch = "no-debug-attrs"}
typescript-definitions = { workspace = true }

[dev-dependencies]
tempfile = "3.3"
approx = "0.5"
tempfile = { workspace = true }
approx = { workspace = true }
6 changes: 3 additions & 3 deletions task-maker-diagnostics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ edition = "2021"

[dependencies]
# Serialization/Deserialization
serde = { version = "1.0", features = ["derive"] }
serde = { workspace = true, features = ["derive"] }
# Utilities for writing to the terminal with colors
colored = "2"
colored = { workspace = true }
# Generic error utilities
anyhow = "1"
anyhow = { workspace = true }
Loading

0 comments on commit e6fa7ad

Please sign in to comment.