Skip to content

Commit

Permalink
Cleanup some misc Cargo.toml funk across the project (#379)
Browse files Browse the repository at this point in the history
  • Loading branch information
acmorrow authored Jan 10, 2025
1 parent f563fe4 commit 792a62a
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 20 deletions.
10 changes: 6 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ edition = "2021"
license = "AGPL-3.0"
repository = "https://github.com/viamrobotics/micro-rdk"
version = "0.4.0-rc2"
# TODO(RSDK-8992): Upgrade rust to latest esp-rs version
rust-version = "1.83"

[profile.release]
Expand All @@ -47,7 +46,10 @@ async-io = "2"
async-lock = "3.4.0"
async-std-openssl = "0.6.3"
atomic-waker = "1.1.2"
axum = "0.7.9"
axum-extra = "0.9.6"
base64 = "0.22.1"
bincode = "2.0.0-rc.3"
bitfield = "0.17.0"
bytecodec = "0.4.15"
bytes = "1.9.0"
Expand All @@ -57,17 +59,17 @@ chrono = "0.4.38"
chrono-tz = "0.10.0"
clap = "4.5.23"
crc32fast = "1.4.2"
dns-message-parser = { version = "0.7", default-features = false}
dialoguer = "0.11.0"
dns-message-parser = { version = "0.7", default-features = false}
either = "1.13.0"
# TODO(RSDK-8991): Upgrade to latest `embedded-hal`
embedded-hal = { version = "~0.2", features = ["unproven"] }
embedded-svc = "0.27"
embuild = "0.32.0"
env_logger = "0.11.5"
esp-idf-part = "0.5.0"
# TODO(RSDK-8994): Upgrade to latest `esp-idf-svc`
esp-idf-svc = { version = "~0.48", default-features = false }
esp-idf-part = "0.5.0"
espflash = { git = "https://github.com/viamrobotics/espflash.git", branch = "monitor-output" }
futures = "0.3.31"
futures-lite = "2"
Expand Down Expand Up @@ -95,9 +97,9 @@ prost = "0.13.4"
prost-types = "0.13.4"
quote = "1.0.37"
rand = "0.8.5"
regex = "1.11"
# TODO(RSDK-8996): Upgrade `rcgen` to latest release
rcgen = "~0.12"
regex = "1.11"
reqwest = "0.12.9"
reqwless = "0.13.0"
# TODO(RSDK-8996): Upgrade `ringbuf` to latest release
Expand Down
2 changes: 0 additions & 2 deletions etc/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# TODO(RSDK-8992): Upgrade rust to latest esp-rs version
FROM rust:1.83-bookworm AS builder
RUN apt update && apt-get install -y --no-install-recommends git libudev-dev make bzip2 gcc libgcrypt20 libgcrypt20-dev ninja-build libudev-dev sudo wget git flex bison gperf ccache libffi-dev libssl-dev dfu-util libusb-1.0-0 cmake pkg-config libglib2.0-dev libpixman-1-dev software-properties-common openssh-client libslirp-dev python3-venv

Expand All @@ -23,7 +22,6 @@ RUN git clone --depth 1 -b v4.4.8 --single-branch --recurse-submodules --shallow

FROM debian:bookworm

# TODO(RSDK-8992): Upgrade rust to latest esp-rs version
ARG RUST_VERSION=1.83.0

ENV DEBIAN_FRONTEND=noninteractive
Expand Down
8 changes: 4 additions & 4 deletions etc/ota-dev-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ version.workspace = true
rust-version.workspace = true

[dependencies]
axum = {version = "0.7.9", features = ["http2"]}
axum-extra = "0.9.6"
axum = { workspace = true, features = ["http2"]}
axum-extra.workspace = true
local-ip-address.workspace = true
tokio.workspace = true
tower.workspace = true
tower-http.workspace = true
tracing.workspace = true
tower.workspace = true
tracing-subscriber.workspace = true
tracing.workspace = true
1 change: 0 additions & 1 deletion micro-rdk-ffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ embedded-svc.workspace = true
futures-lite.workspace = true
micro-rdk = { workspace = true, features = ["esp32", "data", "data-upload-hook-unstable"], default-features = true }


[dependencies]
base64.workspace = true
lazy_static.workspace = true
Expand Down
1 change: 0 additions & 1 deletion micro-rdk-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ serde.workspace = true
serde_json.workspace = true
thiserror.workspace = true


[build-dependencies]
embuild.workspace = true
regex.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions micro-rdk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,13 @@ ota = []
local-signaling = []

[dev-dependencies]
test-log.workspace = true
env_logger.workspace = true
rustls = { workspace = true, features = ["dangerous_configuration"] }
test-log.workspace = true

[target.'cfg(not(target_os = "espidf"))'.dependencies]
async-std-openssl = { workspace = true, optional = true }
bincode.workspace = true
env_logger.workspace = true
futures-rustls.workspace = true
local-ip-address = { workspace = true, optional = true }
Expand All @@ -45,7 +46,6 @@ rcgen = { workspace = true, optional = true }
rustls = { workspace = true, optional = true }
rustls-pemfile = { workspace = true, optional = true }
webpki-roots = { workspace = true, optional = true }
bincode = "2.0.0-rc.3"

[dependencies]
async-channel.workspace = true
Expand Down
1 change: 0 additions & 1 deletion templates/module/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ version = "0.3.3"
edition = "2021"
authors = ["{{authors}}"]
resolver = "2"
# TODO(RSDK-8992): Upgrade rust to latest esp-rs version
rust-version = "1.83"

[dependencies]
Expand Down
9 changes: 4 additions & 5 deletions templates/project/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ version = "0.3.3"
edition = "2021"
authors = ["{{authors}}"]
resolver = "2"
# TODO(RSDK-8992): Upgrade rust to latest esp-rs version
rust-version = "1.83"

[profile.release]
Expand All @@ -25,14 +24,14 @@ features = [
]

[dependencies]
embedded-svc = "0.27"
embedded-hal = { version = "~0.2", features = ["unproven"]}
log = "0.4"
async-channel = "2"
embedded-hal = { version = "~0.2", features = ["unproven"]}
embedded-svc = "0.27"
futures-lite = "2"
log = "0.4"

[build-dependencies]
cargo_metadata = "0.18"
cargo_metadata = "0.19"
embuild = "0.32"
regex = "1.11"
serde = { version = "1.0", features = ["derive"] }
Expand Down

0 comments on commit 792a62a

Please sign in to comment.