From 5ab5112271a9dbef6d875ad89706fc726e126b95 Mon Sep 17 00:00:00 2001 From: Emil Fresk Date: Tue, 9 Nov 2021 10:35:58 +0100 Subject: [PATCH] Update versions and changelog --- CHANGELOG.md | 6 +++++- Cargo.toml | 9 ++++----- macros/Cargo.toml | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c86bb03e07..9ee854ff4f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] +## [v0.6.0-rc.4] - 2021-11-09 + +- Updated to use the new generic `Monotonic` trait ## [v0.6.0-rc.3] - 2021-11-08 @@ -444,7 +447,8 @@ Yanked due to a soundness issue in `init`; the issue has been mostly fixed in v0 - Initial release -[Unreleased]: https://github.com/rtic-rs/cortex-m-rtic/compare/v0.6.0-rc.3...HEAD +[Unreleased]: https://github.com/rtic-rs/cortex-m-rtic/compare/v0.6.0-rc.4...HEAD +[v0.6.0-rc.4]: https://github.com/rtic-rs/cortex-m-rtic/compare/v0.6.0-rc.3...v0.6.0-rc.4 [v0.6.0-rc.3]: https://github.com/rtic-rs/cortex-m-rtic/compare/v0.6.0-rc.2...v0.6.0-rc.3 [v0.6.0-rc.2]: https://github.com/rtic-rs/cortex-m-rtic/compare/v0.6.0-rc.1...v0.6.0-rc.2 [v0.6.0-rc.1]: https://github.com/rtic-rs/cortex-m-rtic/compare/v0.6.0-rc.0...v0.6.0-rc.1 diff --git a/Cargo.toml b/Cargo.toml index 7cdf7f94c4..ed6efbaadd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,16 +14,15 @@ name = "cortex-m-rtic" readme = "README.md" repository = "https://github.com/rtic-rs/cortex-m-rtic" -version = "0.6.0-rc.3" +version = "0.6.0-rc.4" [lib] name = "rtic" [dependencies] cortex-m = "0.7.0" -cortex-m-rtic-macros = { path = "macros", version = "0.6.0-rc.3" } -# rtic-monotonic = "0.1.0-rc.1" -rtic-monotonic = { git = "https://github.com/rtic-rs/rtic-monotonic.git", branch = "master" } +cortex-m-rtic-macros = { path = "macros", version = "0.6.0-rc.4" } +rtic-monotonic = "0.1.0-rc.2" rtic-core = "0.3.1" heapless = "0.7.7" bare-metal = "1.0.0" @@ -34,7 +33,7 @@ version_check = "0.9" [dev-dependencies] lm3s6965 = "0.1.3" cortex-m-semihosting = "0.3.3" -systick-monotonic = { git = "https://github.com/rtic-rs/systick-monotonic.git", branch = "new-trait-and-time-lib" } +systick-monotonic = "0.1.0-rc.2" [dev-dependencies.panic-semihosting] features = ["exit"] diff --git a/macros/Cargo.toml b/macros/Cargo.toml index de335bc444..394c17753f 100644 --- a/macros/Cargo.toml +++ b/macros/Cargo.toml @@ -12,7 +12,7 @@ license = "MIT OR Apache-2.0" name = "cortex-m-rtic-macros" readme = "../README.md" repository = "https://github.com/rtic-rs/cortex-m-rtic" -version = "0.6.0-rc.3" +version = "0.6.0-rc.4" [lib] proc-macro = true