Skip to content

Commit

Permalink
cargo: centralize features into workspace (#94)
Browse files Browse the repository at this point in the history
  • Loading branch information
TheButlah authored May 8, 2024
1 parent 526fb46 commit aeb8f3c
Show file tree
Hide file tree
Showing 8 changed files with 54 additions and 48 deletions.
10 changes: 5 additions & 5 deletions Cargo.lock

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

18 changes: 12 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,26 @@ license = "MIT OR (Apache-2.0 WITH LLVM-exception)"
repository = "https://github.com/worldcoin/orb-software"
rust-version = "1.77.0" # See rust-version.toml

# We centralize feature flags here, because it improves build caches and helps
# prevent edge cases where CI doesn't catch build errors due to more features
# being present in a --all vs -p build.
[workspace.dependencies]
clap = "4.5"
clap = { version = "4.5", features = ["derive"] }
color-eyre = "0.6.2"
eyre = "0.6.12"
libc = "0.2.153"
thiserror = "1"
nix = { version = "0.28", default-features = false }
thiserror = "1.0.60"
nix = { version = "0.28", default-features = false, features = [] }
console-subscriber = "0.2"
derive_more = { version = "0.99", default-features = false }
derive_more = { version = "0.99", default-features = false, features = ["display", "from"] }
futures = "0.3.30"
serde = "1.0.197"
tokio = { version = "1", default-features = false }
serde = { version = "1.0.197", features = ["derive"] }
tokio = { version = "1", features = ["full"] }
tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
alsa-sys = "0.3.1"
reqwest = { version = "0.11", default-features = false, features = ["rustls-tls", "stream"] }
zbus = { version = "4", default-features = false, features = ["tokio"] }

[workspace.dependencies.orb-messages]
git = "https://github.com/worldcoin/orb-messages"
Expand Down
18 changes: 9 additions & 9 deletions artificer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@ rust-version.workspace = true
[dependencies]
build-info.path = "../build-info"
cacache = "12"
clap = { version = "4", features = ["derive"] }
color-eyre = "0.6"
derive_more = { version = "0.99", default-features = false, features = ["display", "from"] }
futures = "0.3"
clap.workspace = true
color-eyre.workspace = true
derive_more.workspace = true
futures.workspace = true
indicatif = { version = "0.17", features = ["tokio"] }
octocrab = "0.32"
reqwest = { version = "0.11", default-features = false, features = ["rustls-tls", "stream"] }
reqwest.workspace = true
semver = { version = "1", features = ["serde"] }
serde = { version = "1", features = ["derive"] }
tokio = { version = "1", default-features = false, features = ["macros", "fs", "rt", "rt-multi-thread"] }
serde.workspace = true
tokio.workspace = true
tokio-util = { version = "0.7", default-features = false, features = ["compat"] }
toml = "0.8.8"
tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
tracing.workspace = true
tracing-subscriber.workspace = true

[build-dependencies]
build-info = { path = "../build-info", features = ["build-script"] }
8 changes: 4 additions & 4 deletions mcu-util/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ rust-version.workspace = true
anyhow = "1.0.79"
async-trait = "0.1.77"
can-rs = { path = "../can", features = ["isotp"] }
clap = { workspace = true, features = ["derive"] }
clap.workspace = true
crc32fast = "1.3.2"
color-eyre.workspace = true
image = "0.24.8"
orb-messages.workspace = true
prost = "0.12.3"
tokio = { version = "1.36.0", features = ["rt", "rt-multi-thread", "macros", "time", "io-util"] }
tokio.workspace = true
tokio-serial = "5.4.1"
tracing = "0.1.40"
tracing-subscriber = "0.3.18"
tracing.workspace = true
tracing-subscriber.workspace = true
16 changes: 8 additions & 8 deletions orb-attest/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@ rust-version.workspace = true
const_format = "0.2"
data-encoding = "2.3"
event-listener = "*"
eyre = "0.6"
futures = "0.3"
eyre.workspace = true
futures.workspace = true
lazy_static = "1.4"
ring = "0.16"
secrecy = { version = "0.8.0", features = ["serde"] }
serde = { version = "1.0", features = ["derive"]}
serde.workspace = true
serde_json = "~1.0"
serde_with = { version = "3.2", features=["base64"]}
thiserror = "1.0"
tokio = { version = "1", features = ["full", "sync"] }
tracing = "0.1"
thiserror.workspace = true
tokio.workspace = true
tracing.workspace = true
tracing-journald = "0.3"
tracing-subscriber = { version = "0.3", features = ["registry", "env-filter", "std"] }
tracing-subscriber.workspace = true
url = "2.2"
zbus = { version = "4", default-features = false, features = ["tokio"] }
zbus.workspace = true

[dependencies.reqwest]
version = "0.11.4"
Expand Down
18 changes: 9 additions & 9 deletions orb-backend-state/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ stage = []

[dependencies]
build-info.path = "../build-info"
clap = { version = "4", features = ["derive"] }
color-eyre = "0.6"
derive_more = { workspace = true, default-features = false, features = ["display", "from"] }
futures = "0.3"
clap.workspace = true
color-eyre.workspace = true
derive_more.workspace = true
futures.workspace = true
header-parsing.path = "../header-parsing"
orb-security-utils = { path = "../security-utils", features = ["reqwest"] }
reqwest = { version = "0.11", default-features = false, features = ["rustls-tls"] }
tokio = { version = "1", default-features = false, features = ["macros"] }
tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
zbus = { version = "4", default-features = false, features = ["tokio"] }
reqwest.workspace = true
tokio.workspace = true
tracing.workspace = true
tracing-subscriber.workspace = true
zbus.workspace = true

[build-dependencies]
build-info = { path = "../build-info", features = ["build-script"] }
12 changes: 6 additions & 6 deletions orb-ui/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@ rust-version.workspace = true

[dependencies]
async-trait = "0.1.74"
clap = { workspace = true, features = ["derive"] }
clap.workspace = true
dashmap = "5.5.3"
derive_more = { workspace = true, default-features = false, features = ["display", "from"] }
derive_more.workspace = true
eyre.workspace = true
futures.workspace = true
orb-messages.workspace = true
orb-uart.path = "uart"
orb-sound.path = "sound"
pid.path = "pid"
prost = "0.12.3"
serde = { workspace = true, features = ["derive"] }
serde.workspace = true
serde_json = "1.0.108"
tokio = { workspace = true, features = ["full"] }
tokio.workspace = true
tokio-stream = "0.1.14"
tracing.workspace = true
tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
zbus = { version = "4", default-features = false, features = ["tokio"] }
tracing-subscriber.workspace = true
zbus.workspace = true

[target.'cfg(tokio_unstable)'.dependencies]
console-subscriber.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion orb-ui/sound/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ tracing.workspace = true

[dev-dependencies]
color-eyre.workspace = true
tokio = { workspace = true, features = ["full"] }
tokio.workspace = true

0 comments on commit aeb8f3c

Please sign in to comment.