From b1f487093be3c52336b8f561ab7037c519e9fbdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20Buga?= Date: Thu, 24 Apr 2025 15:41:20 +0200 Subject: [PATCH] Update dependencies (#3416) --- esp-alloc/CHANGELOG.md | 1 + esp-alloc/Cargo.toml | 2 +- esp-backtrace/CHANGELOG.md | 1 + esp-backtrace/Cargo.toml | 4 ++-- esp-bootloader-esp-idf/CHANGELOG.md | 1 + esp-bootloader-esp-idf/Cargo.toml | 2 +- esp-build/Cargo.toml | 4 ++-- esp-config/Cargo.toml | 2 +- esp-hal-embassy/CHANGELOG.md | 5 +++-- esp-hal-embassy/Cargo.toml | 4 ++-- esp-hal-procmacros/Cargo.toml | 10 +++++----- esp-hal/CHANGELOG.md | 1 + esp-hal/Cargo.toml | 18 +++++++++--------- esp-ieee802154/CHANGELOG.md | 1 + esp-ieee802154/Cargo.toml | 4 ++-- esp-metadata/Cargo.toml | 8 ++++---- esp-println/CHANGELOG.md | 1 + esp-println/Cargo.toml | 6 +++--- esp-wifi/CHANGELOG.md | 1 + esp-wifi/Cargo.toml | 6 +++--- hil-test/Cargo.toml | 6 +++--- qa-test/Cargo.toml | 2 +- xtask/Cargo.toml | 2 +- xtensa-lx-rt-proc-macros/Cargo.toml | 4 ++-- xtensa-lx-rt/Cargo.toml | 12 ++++++------ xtensa-lx/Cargo.toml | 2 +- 26 files changed, 59 insertions(+), 51 deletions(-) diff --git a/esp-alloc/CHANGELOG.md b/esp-alloc/CHANGELOG.md index c7f7b10b5..187d4362e 100644 --- a/esp-alloc/CHANGELOG.md +++ b/esp-alloc/CHANGELOG.md @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Bump Rust edition to 2024, bump MSRV to 1.85. (#3391) +- Update `defmt` to 1.0 (#3416) ### Fixed diff --git a/esp-alloc/Cargo.toml b/esp-alloc/Cargo.toml index 3dea8b962..bb99763a7 100644 --- a/esp-alloc/Cargo.toml +++ b/esp-alloc/Cargo.toml @@ -20,7 +20,7 @@ test = false [dependencies] allocator-api2 = { version = "0.2.0", default-features = false } -defmt = { version = "0.3.10", optional = true } +defmt = { version = "1.0.1", optional = true } cfg-if = "1.0.0" critical-section = "1.2.0" enumset = "1.1.5" diff --git a/esp-backtrace/CHANGELOG.md b/esp-backtrace/CHANGELOG.md index 896604231..8b6e8dad9 100644 --- a/esp-backtrace/CHANGELOG.md +++ b/esp-backtrace/CHANGELOG.md @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - The `arch::backtrace` function now returns a `Backtrace` struct (#3280) - Bump Rust edition to 2024, bump MSRV to 1.85. (#3391) +- Update `defmt` to 1.0 (#3416) ### Fixed diff --git a/esp-backtrace/Cargo.toml b/esp-backtrace/Cargo.toml index c7603e6ca..634dcc179 100644 --- a/esp-backtrace/Cargo.toml +++ b/esp-backtrace/Cargo.toml @@ -20,11 +20,11 @@ test = false [dependencies] cfg-if = "1.0.0" -defmt = { version = "0.3.10", optional = true } +defmt = { version = "1.0.1", optional = true } esp-config = { version = "0.3.0", path = "../esp-config" } esp-println = { version = "0.13.0", optional = true, default-features = false, path = "../esp-println" } heapless = "0.8" -semihosting = { version = "0.1.18", optional = true } +semihosting = { version = "0.1.20", optional = true } [build-dependencies] esp-build = { version = "0.2.0", path = "../esp-build" } diff --git a/esp-bootloader-esp-idf/CHANGELOG.md b/esp-bootloader-esp-idf/CHANGELOG.md index 6ab92fac4..0535b2b55 100644 --- a/esp-bootloader-esp-idf/CHANGELOG.md +++ b/esp-bootloader-esp-idf/CHANGELOG.md @@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Bump Rust edition to 2024, bump MSRV to 1.85. (#3391) +- Update `defmt` to 1.0 (#3416) ### Fixed diff --git a/esp-bootloader-esp-idf/Cargo.toml b/esp-bootloader-esp-idf/Cargo.toml index 17c5c4bdd..70bb8df36 100644 --- a/esp-bootloader-esp-idf/Cargo.toml +++ b/esp-bootloader-esp-idf/Cargo.toml @@ -18,7 +18,7 @@ bench = false test = false [dependencies] -defmt = { version = "0.3.10", optional = true } +defmt = { version = "1.0.1", optional = true } document-features = "0.2.11" esp-config = { version = "0.3.0", path = "../esp-config" } embedded-storage = "0.3.1" diff --git a/esp-build/Cargo.toml b/esp-build/Cargo.toml index 06d1d3caf..f4961dd48 100644 --- a/esp-build/Cargo.toml +++ b/esp-build/Cargo.toml @@ -12,6 +12,6 @@ license = "MIT OR Apache-2.0" proc-macro = true [dependencies] -quote = "1.0.38" -syn = { version = "2.0.96", features = ["fold", "full"] } +quote = "1.0.40" +syn = { version = "2.0.100", features = ["fold", "full"] } termcolor = "1.4.1" diff --git a/esp-config/Cargo.toml b/esp-config/Cargo.toml index e6d145471..a2ca2f599 100644 --- a/esp-config/Cargo.toml +++ b/esp-config/Cargo.toml @@ -13,7 +13,7 @@ bench = false test = false [dependencies] -document-features = "0.2.10" +document-features = "0.2.11" serde = { version = "1.0.197", features = ["derive"], optional = true } serde_json = { version = "1.0.0", optional = true } diff --git a/esp-hal-embassy/CHANGELOG.md b/esp-hal-embassy/CHANGELOG.md index 69f23d2b3..e5e5f4ef8 100644 --- a/esp-hal-embassy/CHANGELOG.md +++ b/esp-hal-embassy/CHANGELOG.md @@ -11,10 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Re-added the `multiple-integrated` timer queue flavour (#3166) -- Bump Rust edition to 2024, bump MSRV to 1.85. (#3391) - ### Changed +- Bump Rust edition to 2024, bump MSRV to 1.85. (#3391) +- Update `defmt` to 1.0 (#3416) + ### Fixed ### Removed diff --git a/esp-hal-embassy/Cargo.toml b/esp-hal-embassy/Cargo.toml index 68726c4f7..119c76a02 100644 --- a/esp-hal-embassy/Cargo.toml +++ b/esp-hal-embassy/Cargo.toml @@ -20,7 +20,7 @@ test = false [dependencies] critical-section = "1.2.0" -defmt = { version = "0.3.10", optional = true } +defmt = { version = "1.0.1", optional = true } document-features = "0.2.11" embassy-executor = { version = "0.7.0", features = ["timer-item-payload-size-4"], optional = true } embassy-sync = { version = "0.6.2" } @@ -29,7 +29,7 @@ embassy-time-driver = { version = "0.2.0", features = [ "tick-hz-1_000_000 embassy-time-queue-utils = { version = "0.1.0", features = ["_generic-queue"] } esp-config = { version = "0.3.0", path = "../esp-config" } esp-hal = { version = "1.0.0-beta.0", path = "../esp-hal" } -log = { version = "0.4.26", optional = true } +log = { version = "0.4.27", optional = true } macros = { version = "0.17.0", features = ["embassy"], package = "esp-hal-procmacros", path = "../esp-hal-procmacros" } portable-atomic = "1.11.0" static_cell = "2.1.0" diff --git a/esp-hal-procmacros/Cargo.toml b/esp-hal-procmacros/Cargo.toml index 880f14d3e..e5fdfd58e 100644 --- a/esp-hal-procmacros/Cargo.toml +++ b/esp-hal-procmacros/Cargo.toml @@ -15,15 +15,15 @@ features = ["embassy", "has-ulp-core", "interrupt", "ram", "is-ulp-core"] proc-macro = true [dependencies] -darling = "0.20.10" +darling = "0.20.11" document-features = "0.2.11" litrs = "0.4.1" object = { version = "0.36.7", default-features = false, features = ["read_core", "elf"], optional = true } -proc-macro-crate = "3.2.0" +proc-macro-crate = "3.3.0" proc-macro-error2 = "2.0.1" -proc-macro2 = "1.0.93" -quote = "1.0.38" -syn = { version = "2.0.98", features = ["extra-traits", "full"] } +proc-macro2 = "1.0.95" +quote = "1.0.40" +syn = { version = "2.0.100", features = ["extra-traits", "full"] } [features] ## Provide a `#[main]` procmacro to mark the entry point for Embassy applications. diff --git a/esp-hal/CHANGELOG.md b/esp-hal/CHANGELOG.md index 87ac578f7..9f292839d 100644 --- a/esp-hal/CHANGELOG.md +++ b/esp-hal/CHANGELOG.md @@ -48,6 +48,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Made the `ParlIo` traits for `TxPins`, `RxPins`, `ConfigurePins` public (#3398) - Renamed `Flex::enable_input` to `set_input_enable` (#3387) - Make `esp_hal::interrupt::current_runlevel` public under the unstable feature (#3403) +- Update `defmt` to 1.0 (#3416) ### Fixed diff --git a/esp-hal/Cargo.toml b/esp-hal/Cargo.toml index 7e7eeb0f7..890e683c2 100644 --- a/esp-hal/Cargo.toml +++ b/esp-hal/Cargo.toml @@ -21,13 +21,13 @@ bench = false test = false [dependencies] -bitflags = "2.8.0" -bytemuck = "1.21.0" -bitfield = "0.18.1" +bitflags = "2.9.0" +bytemuck = "1.22.0" +bitfield = "0.19.0" cfg-if = "1.0.0" critical-section = { version = "1.2.0", features = ["restore-state-u32"] } -defmt = { version = "0.3.10", optional = true } -delegate = "0.13.2" +defmt = { version = "1.0.1", optional = true } +delegate = "0.13.3" digest = { version = "0.10.7", default-features = false, optional = true } document-features = "0.2.11" embassy-embedded-hal = { version = "0.3.0", optional = true } @@ -47,7 +47,7 @@ esp-metadata = { version = "0.6.0", path = "../esp-metadata", defaul esp-synopsys-usb-otg = { version = "0.4.2", optional = true, features = ["fs", "esp32sx"] } fugit = "0.3.7" instability = "0.3.7" -log = { version = "0.4.26", optional = true } +log = { version = "0.4.27", optional = true } nb = "1.1.0" paste = "1.0.15" portable-atomic = { version = "1.11.0", default-features = false } @@ -79,15 +79,15 @@ xtensa-lx = { version = "0.10.0", path = "../xtensa-lx" } xtensa-lx-rt = { version = "0.18.0", path = "../xtensa-lx-rt" } [build-dependencies] -basic-toml = "0.1.9" +basic-toml = "0.1.10" cfg-if = "1.0.0" esp-build = { version = "0.2.0", path = "../esp-build" } esp-metadata = { version = "0.6.0", path = "../esp-metadata" } esp-config = { version = "0.3.0", path = "../esp-config", features = ["build"] } -serde = { version = "1.0.218", features = ["derive"] } +serde = { version = "1.0.219", features = ["derive"] } [dev-dependencies] -jiff = { version = "0.2.2", default-features = false, features = ["static"] } +jiff = { version = "0.2.10", default-features = false, features = ["static"] } [features] default = [] diff --git a/esp-ieee802154/CHANGELOG.md b/esp-ieee802154/CHANGELOG.md index ffe9e8e72..d00219b6d 100644 --- a/esp-ieee802154/CHANGELOG.md +++ b/esp-ieee802154/CHANGELOG.md @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Bump Rust edition to 2024, bump MSRV to 1.85. (#3391) +- Update `defmt` to 1.0 (#3416) ### Fixed diff --git a/esp-ieee802154/Cargo.toml b/esp-ieee802154/Cargo.toml index f5e3a8767..42b4b1679 100644 --- a/esp-ieee802154/Cargo.toml +++ b/esp-ieee802154/Cargo.toml @@ -28,8 +28,8 @@ heapless = "0.8.0" ieee802154 = "0.6.1" cfg-if = "1.0.0" esp-config = { version = "0.3.0", path = "../esp-config" } -defmt = { version = "0.3.10", optional = true } -log = { version = "0.4.26", optional = true } +defmt = { version = "1.0.1", optional = true } +log = { version = "0.4.27", optional = true } [build-dependencies] esp-config = { version = "0.3.0", path = "../esp-config" } diff --git a/esp-metadata/Cargo.toml b/esp-metadata/Cargo.toml index 1ac63abd2..d43ebe400 100644 --- a/esp-metadata/Cargo.toml +++ b/esp-metadata/Cargo.toml @@ -9,11 +9,11 @@ repository = "https://github.com/esp-rs/esp-hal" license = "MIT OR Apache-2.0" [dependencies] -anyhow = { version = "1.0.95", optional = true } -clap = { version = "4.5.26", features = ["derive"], optional = true } +anyhow = { version = "1.0.98", optional = true } +clap = { version = "4.5.37", features = ["derive"], optional = true } basic-toml = { version = "0.1.9", optional = true } -serde = { version = "1.0.217", features = ["derive"], optional = true } -strum = { version = "0.26.3", features = ["derive"], optional = true } +serde = { version = "1.0.219", features = ["derive"], optional = true } +strum = { version = "0.27.1", features = ["derive"], optional = true } [features] default = ["build"] diff --git a/esp-println/CHANGELOG.md b/esp-println/CHANGELOG.md index e4cfe0950..8074db419 100644 --- a/esp-println/CHANGELOG.md +++ b/esp-println/CHANGELOG.md @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Bump Rust edition to 2024, bump MSRV to 1.85. (#3391) +- Update `defmt` to 1.0 (#3416) ### Fixed diff --git a/esp-println/Cargo.toml b/esp-println/Cargo.toml index 1de16d2fc..79842b182 100644 --- a/esp-println/Cargo.toml +++ b/esp-println/Cargo.toml @@ -22,13 +22,13 @@ test = false [dependencies] critical-section = { version = "1.2.0", optional = true } -defmt = { version = "0.3.10", optional = true } -log = { version = "0.4.26", optional = true } +defmt = { version = "1.0.1", optional = true } +log = { version = "0.4.27", optional = true } portable-atomic = { version = "1.11.0", optional = true, default-features = false } [build-dependencies] esp-build = { version = "0.2.0", path = "../esp-build" } -log = "0.4.26" +log = "0.4.27" [features] default = ["auto", "colors", "critical-section"] diff --git a/esp-wifi/CHANGELOG.md b/esp-wifi/CHANGELOG.md index 3fdd44641..cd4cf935e 100644 --- a/esp-wifi/CHANGELOG.md +++ b/esp-wifi/CHANGELOG.md @@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Remove the `heapless` dependency (including from the public API) (#3317) - Bump Rust edition to 2024, bump MSRV to 1.85. (#3391) +- Update `defmt` to 1.0 (#3416) ### Fixed diff --git a/esp-wifi/Cargo.toml b/esp-wifi/Cargo.toml index d34e6a86c..7d5288203 100644 --- a/esp-wifi/Cargo.toml +++ b/esp-wifi/Cargo.toml @@ -16,8 +16,8 @@ test = false [dependencies] allocator-api2 = { version = "0.2.0", default-features = false, features = ["alloc"] } -defmt = { version = "0.3.10", optional = true } -log = { version = "0.4.26", optional = true } +defmt = { version = "1.0.1", optional = true } +log = { version = "0.4.27", optional = true } document-features = "0.2.11" esp-alloc = { version = "0.7.0", path = "../esp-alloc", optional = true } esp-hal = { version = "1.0.0-beta.0", path = "../esp-hal", default-features = false } @@ -37,7 +37,7 @@ embassy-net-driver = { version = "0.2.0", optional = true } cfg-if = "1.0.0" portable-atomic = { version = "1.11.0", default-features = false } portable_atomic_enum = { version = "0.3.1", features = ["portable-atomic"] } -rand_core = "0.6.4" +rand_core = "0.9.3" bt-hci = { version = "0.3.0", optional = true } esp-config = { version = "0.3.0", path = "../esp-config" } diff --git a/hil-test/Cargo.toml b/hil-test/Cargo.toml index 52a693384..171d2515a 100644 --- a/hil-test/Cargo.toml +++ b/hil-test/Cargo.toml @@ -223,8 +223,8 @@ required-features = ["esp-wifi", "esp-alloc"] allocator-api2 = { version = "0.2.0", default-features = false, features = ["alloc"] } cfg-if = "1.0.0" critical-section = "1.1.3" -defmt = "0.3.8" -defmt-rtt = { version = "0.4.1", optional = true } +defmt = "1.0.1" +defmt-rtt = { version = "1.0.0", optional = true } embassy-executor = "0.7.0" embassy-futures = "0.1.1" embedded-storage = "0.3.1" @@ -254,7 +254,7 @@ elliptic-curve = { version = "0.13.8", default-features = false, features = embassy-executor = { version = "0.7.0", default-features = false } # Add the `embedded-test/defmt` feature for more verbose testing embedded-test = { version = "0.6.0", default-features = false, features = ["embassy", "external-executor"] } -hex-literal = "0.4.1" +hex-literal = "1.0.0" nb = "1.1.0" p192 = { version = "0.13.0", default-features = false, features = ["arithmetic"] } p256 = { version = "0.13.2", default-features = false, features = ["arithmetic"] } diff --git a/qa-test/Cargo.toml b/qa-test/Cargo.toml index 482348960..65bb92319 100644 --- a/qa-test/Cargo.toml +++ b/qa-test/Cargo.toml @@ -19,7 +19,7 @@ esp-hal = { path = "../esp-hal", features = ["unstable", "log"] } esp-hal-embassy = { path = "../esp-hal-embassy" } esp-println = { path = "../esp-println", features = ["log"] } lis3dh-async = "0.9.3" -ssd1306 = "0.9.0" +ssd1306 = "0.10.0" [features] unstable = [] diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index a951d7cda..4a379a6be 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -21,7 +21,7 @@ rocket = { version = "0.5.1", optional = true } semver = { version = "1.0.23", features = ["serde"] } serde = { version = "1.0.215", features = ["derive"] } serde_json = "1.0.70" -strum = { version = "0.26.3", features = ["derive"] } +strum = { version = "0.27.1", features = ["derive"] } toml_edit = "0.22.22" walkdir = "2.5.0" diff --git a/xtensa-lx-rt-proc-macros/Cargo.toml b/xtensa-lx-rt-proc-macros/Cargo.toml index d4c98c8de..eabb5c62b 100644 --- a/xtensa-lx-rt-proc-macros/Cargo.toml +++ b/xtensa-lx-rt-proc-macros/Cargo.toml @@ -14,7 +14,7 @@ categories = ["embedded", "no-std"] proc-macro = true [dependencies] -darling = "0.20" -proc-macro2 = "1.0" +darling = "0.20.11" +proc-macro2 = "1.0.95" quote = "1.0" syn = { version = "2.0", features = ["extra-traits", "full"] } diff --git a/xtensa-lx-rt/Cargo.toml b/xtensa-lx-rt/Cargo.toml index b02a09d1a..8fced48b1 100644 --- a/xtensa-lx-rt/Cargo.toml +++ b/xtensa-lx-rt/Cargo.toml @@ -18,18 +18,18 @@ bench = false test = false [dependencies] -document-features = "0.2.10" +document-features = "0.2.11" macros = { version = "0.2.2", package = "xtensa-lx-rt-proc-macros", path = "../xtensa-lx-rt-proc-macros" } r0 = "1.0.0" xtensa-lx = { version = "0.10.0", path = "../xtensa-lx" } [build-dependencies] -anyhow = "1.0.95" +anyhow = "1.0.98" enum-as-inner = "0.6.1" -minijinja = "2.6.0" -serde = { version = "1.0.217", features = ["derive"] } -strum = { version = "0.26.3", features = ["derive"] } -toml = "0.8.19" +minijinja = "2.9.0" +serde = { version = "1.0.219", features = ["derive"] } +strum = { version = "0.27.1", features = ["derive"] } +toml = "0.8.20" [features] ## Save and restore float registers for exceptions diff --git a/xtensa-lx/Cargo.toml b/xtensa-lx/Cargo.toml index a1bcb80cb..1de6294f3 100644 --- a/xtensa-lx/Cargo.toml +++ b/xtensa-lx/Cargo.toml @@ -17,6 +17,6 @@ test = false [dependencies] critical-section = "1.2.0" -document-features = "0.2.10" +document-features = "0.2.11" [features]