From 6796183b3367f34a6df951141e0f146df5b646f3 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Arcos Date: Wed, 13 Mar 2024 12:44:40 +0100 Subject: [PATCH] Prepare 3.0.0 release (#611) * docs: Update changelog * build: Bump dependencies, espflash and cargo-espflash * style: Format toml files --- CHANGELOG.md | 10 ++--- Cargo.lock | 91 ++++++++++++++++++--------------------- Cargo.toml | 4 +- cargo-espflash/Cargo.toml | 35 ++++++++------- espflash/Cargo.toml | 36 +++++++++------- 5 files changed, 89 insertions(+), 87 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1423a05..e01121c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,9 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased] - -### Added +## [3.0.0] - 2024-03-13 ### Fixed - Fix timeout while changing the baudrate for some ESP32-S3 targets (#607) @@ -15,8 +13,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Update ESP32, ESP32-C2, ESP32-C3, ESP32-C6, ESP32-H2, ESP32-S2, ESP32-S3 stub (#607, #610) -### Removed - ## [3.0.0-rc.2] - 2024-03-04 ### Added @@ -163,7 +159,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed -- Various fixesand improvements relating to crystal frequency and serial monitor for the ESP32-C2 (#314, #315, #330) +- Various fixes and improvements relating to crystal frequency and serial monitor for the ESP32-C2 (#314, #315, #330) ### Changed @@ -237,7 +233,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [1.0.0] - 2021-09-21 -[Unreleased]: https://github.com/esp-rs/espflash/compare/v3.0.0-rc.2...HEAD +[3.0.0]: https://github.com/esp-rs/espflash/compare/v3.0.0-rc.2...v3.0.0 [3.0.0-rc.2]: https://github.com/esp-rs/espflash/compare/v3.0.0-rc.1...v3.0.0-rc.2 [3.0.0-rc.1]: https://github.com/esp-rs/espflash/compare/v2.1.0...v3.0.0-rc.1 [2.1.0]: https://github.com/esp-rs/espflash/compare/v2.0.1...v2.1.0 diff --git a/Cargo.lock b/Cargo.lock index 6c14e971..aa59ad4b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -405,7 +405,7 @@ dependencies = [ [[package]] name = "cargo-espflash" -version = "3.0.0-rc.2" +version = "3.0.0" dependencies = [ "cargo", "cargo_metadata", @@ -482,11 +482,17 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + [[package]] name = "clap" -version = "4.5.1" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da" +checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651" dependencies = [ "clap_builder", "clap_derive", @@ -494,9 +500,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.1" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", @@ -581,7 +587,7 @@ version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c64043d6c7b7a4c58e39e7efccfdea7b93d885a795d0c054a69dbbf4dd52686" dependencies = [ - "crossterm 0.27.0", + "crossterm", "strum 0.25.0", "strum_macros 0.25.3", "unicode-width", @@ -697,22 +703,6 @@ version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" -[[package]] -name = "crossterm" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" -dependencies = [ - "bitflags 1.3.2", - "crossterm_winapi", - "libc", - "mio", - "parking_lot", - "signal-hook", - "signal-hook-mio", - "winapi", -] - [[package]] name = "crossterm" version = "0.27.0" @@ -722,7 +712,10 @@ dependencies = [ "bitflags 2.4.2", "crossterm_winapi", "libc", + "mio", "parking_lot", + "signal-hook", + "signal-hook-mio", "winapi", ] @@ -786,11 +779,11 @@ checksum = "f3b7eb4404b8195a9abb6356f4ac07d8ba267045c8d6d220ac4dc992e6cc75df" [[package]] name = "ctrlc" -version = "3.4.2" +version = "3.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b467862cc8610ca6fc9a1532d7777cee0804e678ab45410897b9396495994a0b" +checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" dependencies = [ - "nix 0.27.1", + "nix 0.28.0", "windows-sys 0.52.0", ] @@ -1091,9 +1084,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c012a26a7f605efc424dd53697843a72be7dc86ad2d01f7814337794a12231d" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" dependencies = [ "anstream", "anstyle", @@ -1141,13 +1134,13 @@ dependencies = [ "regex", "serde", "serde_plain", - "strum 0.26.1", + "strum 0.26.2", "thiserror", ] [[package]] name = "espflash" -version = "3.0.0-rc.2" +version = "3.0.0" dependencies = [ "addr2line", "base64 0.22.0", @@ -1155,7 +1148,7 @@ dependencies = [ "clap", "clap_complete", "comfy-table", - "crossterm 0.25.0", + "crossterm", "ctrlc", "defmt-decoder", "defmt-parser", @@ -1177,7 +1170,7 @@ dependencies = [ "serialport", "sha2", "slip-codec", - "strum 0.26.1", + "strum 0.26.2", "thiserror", "toml", "update-informer", @@ -2728,12 +2721,13 @@ dependencies = [ [[package]] name = "miette" -version = "7.1.0" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baed61d13cc3723ee6dbed730a82bfacedc60a85d81da2d77e9c3e8ebc0b504a" +checksum = "4edc8853320c2a0dab800fbda86253c8938f6ea88510dc92c5f1ed20e794afc1" dependencies = [ "backtrace", "backtrace-ext", + "cfg-if", "miette-derive", "owo-colors", "supports-color", @@ -2747,9 +2741,9 @@ dependencies = [ [[package]] name = "miette-derive" -version = "7.1.0" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301c3f54f98abc6c212ee722f5e5c62e472a334415840669e356f04850051ec" +checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" dependencies = [ "proc-macro2", "quote", @@ -2811,12 +2805,13 @@ dependencies = [ [[package]] name = "nix" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ "bitflags 2.4.2", "cfg-if", + "cfg_aliases", "libc", ] @@ -3887,9 +3882,9 @@ checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" [[package]] name = "strum" -version = "0.26.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" dependencies = [ "strum_macros 0.26.1", ] @@ -4056,18 +4051,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", @@ -4174,14 +4169,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +checksum = "af06656561d28735e9c1cd63dfd57132c8155426aa6af24f36a00a351f88c48e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.6", + "toml_edit 0.22.7", ] [[package]] @@ -4219,9 +4214,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.6" +version = "0.22.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +checksum = "18769cd1cec395d70860ceb4d932812a0b4d06b1a4bb336745a4d21b9496e992" dependencies = [ "indexmap", "serde", diff --git a/Cargo.toml b/Cargo.toml index a255a3fc..49d9d7f0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [workspace] resolver = "2" -members = ["cargo-espflash", "espflash"] +members = ["cargo-espflash", "espflash"] [profile.release] -lto = "thin" +lto = "thin" strip = true diff --git a/cargo-espflash/Cargo.toml b/cargo-espflash/Cargo.toml index cedb0c47..f62012f6 100644 --- a/cargo-espflash/Cargo.toml +++ b/cargo-espflash/Cargo.toml @@ -1,13 +1,18 @@ [package] name = "cargo-espflash" -version = "3.0.0-rc.2" +version = "3.0.0" edition = "2021" rust-version = "1.74" -description = "Cargo subcommand for flashing Espressif devices" -repository = "https://github.com/esp-rs/espflash" -license = "MIT OR Apache-2.0" -keywords = ["cargo", "cli", "embedded", "esp"] -categories = ["command-line-utilities", "development-tools", "development-tools::cargo-plugins", "embedded"] +description = "Cargo subcommand for flashing Espressif devices" +repository = "https://github.com/esp-rs/espflash" +license = "MIT OR Apache-2.0" +keywords = ["cargo", "cli", "embedded", "esp"] +categories = [ + "command-line-utilities", + "development-tools", + "development-tools::cargo-plugins", + "embedded", +] [package.metadata.binstall] pkg-url = "{ repo }/releases/download/v{ version }/{ name }-{ target }.{ archive-format }" @@ -16,15 +21,15 @@ pkg-fmt = "zip" [dependencies] cargo_metadata = "0.18.1" -clap = { version = "4.5.1", features = ["derive", "wrap_help"] } -env_logger = "0.11.2" -esp-idf-part = "0.5.0" -espflash = { version = "3.0.0-rc.2", path = "../espflash" } -log = "0.4.21" -miette = { version = "7.1.0", features = ["fancy"] } -serde = { version = "1.0.197", features = ["derive"] } -thiserror = "1.0.57" -toml = "0.8.10" +clap = { version = "4.5.2", features = ["derive", "wrap_help"] } +env_logger = "0.11.3" +esp-idf-part = "0.5.0" +espflash = { version = "3.0.0", path = "../espflash" } +log = "0.4.21" +miette = { version = "7.2.0", features = ["fancy"] } +serde = { version = "1.0.197", features = ["derive"] } +thiserror = "1.0.58" +toml = "0.8.11" [target.'cfg(unix)'.dependencies] cargo = { version = "0.77.0", features = ["vendored-openssl"] } diff --git a/espflash/Cargo.toml b/espflash/Cargo.toml index f996791e..ce32a8e5 100644 --- a/espflash/Cargo.toml +++ b/espflash/Cargo.toml @@ -1,7 +1,7 @@ [package] -name = "espflash" -version = "3.0.0-rc.2" -edition = "2021" +name = "espflash" +version = "3.0.0" +edition = "2021" rust-version = "1.74" description = "A command-line tool for flashing Espressif devices" repository = "https://github.com/esp-rs/espflash" @@ -26,17 +26,23 @@ required-features = ["cli", "serialport"] addr2line = { version = "0.21.0", optional = true } base64 = "0.22.0" bytemuck = { version = "1.14.3", features = ["derive"] } -clap = { version = "4.5.1", features = ["derive", "env", "wrap_help"], optional = true } +clap = { version = "4.5.2", features = [ + "derive", + "env", + "wrap_help", +], optional = true } clap_complete = { version = "4.5.1", optional = true } comfy-table = { version = "7.1.0", optional = true } -crossterm = { version = "0.25.0", optional = true } # 0.26.x and 0.27.x causes issues on Windows -ctrlc = { version = "3.4.2", optional = true } +crossterm = { version = "0.27.0", optional = true } # 0.26.x and 0.27.x causes issues on Windows +ctrlc = { version = "3.4.4", optional = true } # defmt dependencies are pinned since defmt does not guarantee MSRV even for patch releases -defmt-decoder = { version = "=0.3.10", features = ["unstable"], optional = true } +defmt-decoder = { version = "=0.3.10", features = [ + "unstable", +], optional = true } defmt-parser = { version = "=0.3.4", features = ["unstable"], optional = true } dialoguer = { version = "0.11.0", optional = true } directories = { version = "5.0.1", optional = true } -env_logger = { version = "0.11.2", optional = true } +env_logger = { version = "0.11.3", optional = true } esp-idf-part = "0.5.0" flate2 = "1.0.28" hex = { version = "0.4.3", features = ["serde"], optional = true } @@ -44,18 +50,18 @@ indicatif = { version = "0.17.8", optional = true } lazy_static = { version = "1.4.0", optional = true } log = "0.4.21" md-5 = "0.10.6" -miette = { version = "7.1.0" } +miette = "7.2.0" parse_int = { version = "0.6.0", optional = true } regex = { version = "1.10.3", optional = true } serde = { version = "1.0.197", features = ["derive"] } serialport = { version = "4.3.0", optional = true } sha2 = "0.10.8" slip-codec = { version = "0.4.0", optional = true } -strum = { version = "0.26.1", features = ["derive"] } -thiserror = "1.0.57" -toml = { version = "0.8.10", optional = true } +strum = { version = "0.26.2", features = ["derive"] } +thiserror = "1.0.58" +toml = { version = "0.8.11", optional = true } update-informer = { version = "1.1.0", optional = true } -xmas-elf = { version = "0.9.1" } +xmas-elf = "0.9.1" [target.'cfg(unix)'.dependencies] libc = "0.2.153" @@ -80,9 +86,9 @@ cli = [ "dep:parse_int", "dep:toml", "dep:update-informer", + "miette/fancy", "serialport", - "miette/fancy" ] # enables connecting to a device via serial port -serialport = ["dep:serialport", "dep:slip-codec", "dep:regex", "dep:toml"] +serialport = ["dep:regex", "dep:serialport", "dep:slip-codec", "dep:toml"]