diff options
author | 2023-05-31 18:01:36 +0000 | |
---|---|---|
committer | 2023-05-31 18:01:36 +0000 | |
commit | 781ed8a9cdbb72ab639e73f52219b7d96fa6ec86 (patch) | |
tree | 48d08d2e0f2ed3b4cdd501e02c64535791ca40bd | |
parent | 01fa3f2e72196250e5552b204d2197583c231075 (diff) | |
parent | 963c8e340bcea8339a0bfda02c44dfbedde42383 (diff) | |
download | rtic-781ed8a9cdbb72ab639e73f52219b7d96fa6ec86.tar.gz rtic-781ed8a9cdbb72ab639e73f52219b7d96fa6ec86.tar.zst rtic-781ed8a9cdbb72ab639e73f52219b7d96fa6ec86.zip |
Merge #756v2.0.0
756: v2.0 release r=datdenkikniet a=korken89
Co-authored-by: Emil Fresk <emil.fresk@gmail.com>
Co-authored-by: datdenkikniet <jcdra1@gmail.com>
-rw-r--r-- | .github/workflows/build.yml | 7 | ||||
-rw-r--r-- | examples/rp2040_local_i2c_init/Cargo.toml | 4 | ||||
-rw-r--r-- | examples/stm32f3_blinky/Cargo.toml | 6 | ||||
-rw-r--r-- | rtic-common/Cargo.toml | 2 | ||||
-rw-r--r-- | rtic-macros/Cargo.toml | 2 | ||||
-rw-r--r-- | rtic-monotonics/Cargo.toml | 14 | ||||
-rw-r--r-- | rtic-sync/Cargo.toml | 4 | ||||
-rw-r--r-- | rtic-time/Cargo.toml | 4 | ||||
-rw-r--r-- | rtic/Cargo.toml | 6 |
9 files changed, 25 insertions, 24 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ad0f5eda..5cb794b1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,9 +12,10 @@ on: env: CARGO_TERM_COLOR: always DEV_VERSION: 2 - STABLE_VERSION: 1 - OLDSTABLE_VERSION: 0.5 - OLDOLDSTABLE_VERSION: 0.4 + STABLE_VERSION: 2 + OLDSTABLE_VERSION: 1 + OLDOLDSTABLE_VERSION: 0.5 + OLDOLDOLDSTABLE_VERSION: 0.4 jobs: # Run cargo xtask format-check diff --git a/examples/rp2040_local_i2c_init/Cargo.toml b/examples/rp2040_local_i2c_init/Cargo.toml index 2d004e10..c2cce7bc 100644 --- a/examples/rp2040_local_i2c_init/Cargo.toml +++ b/examples/rp2040_local_i2c_init/Cargo.toml @@ -10,12 +10,12 @@ edition = "2021" [dependencies.rtic] path = "../../rtic" -version = "=2.0.0-alpha.2" +version = "2.0.0" features = ["thumbv6-backend"] [dependencies.rtic-monotonics] path = "../../rtic-monotonics" -version = "=1.0.0-alpha.2" +version = "1.0.0" features = ["rp2040"] [dependencies] diff --git a/examples/stm32f3_blinky/Cargo.toml b/examples/stm32f3_blinky/Cargo.toml index be4d03d0..3773f0e5 100644 --- a/examples/stm32f3_blinky/Cargo.toml +++ b/examples/stm32f3_blinky/Cargo.toml @@ -9,18 +9,18 @@ version = "0.1.0" [dependencies.rtic] path = "../../rtic" -version = "=2.0.0-alpha.2" +version = "2.0.0" features = ["thumbv7-backend"] [dependencies.rtic-monotonics] path = "../../rtic-monotonics" -version = "=1.0.0-alpha.2" +version = "1.0.0" features = ["cortex-m-systick"] [dependencies] embedded-hal = "0.2.7" panic-rtt-target = { version = "0.1.2", features = ["cortex-m"] } -rtt-target = { version = "0.3.1", features = ["cortex-m"] } +rtt-target = { version = "0.4.0" } [dependencies.stm32f3xx-hal] features = ["stm32f303xc", "rt"] diff --git a/rtic-common/Cargo.toml b/rtic-common/Cargo.toml index 726090ac..1e7f98f7 100644 --- a/rtic-common/Cargo.toml +++ b/rtic-common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rtic-common" -version = "1.0.0-alpha.0" +version = "1.0.0" edition = "2021" authors = [ diff --git a/rtic-macros/Cargo.toml b/rtic-macros/Cargo.toml index f7e6c7b3..62734ee7 100644 --- a/rtic-macros/Cargo.toml +++ b/rtic-macros/Cargo.toml @@ -22,7 +22,7 @@ name = "rtic-macros" readme = "../README.md" repository = "https://github.com/rtic-rs/rtic" -version = "2.0.0-alpha.2" +version = "2.0.0" [lib] proc-macro = true diff --git a/rtic-monotonics/Cargo.toml b/rtic-monotonics/Cargo.toml index 50785e9d..88fd208c 100644 --- a/rtic-monotonics/Cargo.toml +++ b/rtic-monotonics/Cargo.toml @@ -1,14 +1,14 @@ [package] name = "rtic-monotonics" -version = "1.0.0-alpha.2" +version = "1.0.0" edition = "2021" authors = [ - "The Real-Time Interrupt-driven Concurrency developers", - "Emil Fresk <emil.fresk@gmail.com>", - "Henrik Tjäder <henrik@tjaders.com>", - "Jorge Aparicio <jorge@japaric.io>", - "Per Lindgren <per.lindgren@ltu.se>", + "The Real-Time Interrupt-driven Concurrency developers", + "Emil Fresk <emil.fresk@gmail.com>", + "Henrik Tjäder <henrik@tjaders.com>", + "Jorge Aparicio <jorge@japaric.io>", + "Per Lindgren <per.lindgren@ltu.se>", ] categories = ["concurrency", "embedded", "no-std", "asynchronous"] description = "A library that provides implementations of the Monotonic trait from rtic-time" @@ -19,7 +19,7 @@ features = ["cortex-m-systick", "rp2040", "nrf52840"] rustdoc-flags = ["--cfg", "docsrs"] [dependencies] -rtic-time = { version = "1.0.0-alpha.1", path = "../rtic-time" } +rtic-time = { version = "1.0.0", path = "../rtic-time" } embedded-hal-async = { version = "0.2.0-alpha.1", optional = true } fugit = { version = "0.3.6" } atomic-polyfill = "1" diff --git a/rtic-sync/Cargo.toml b/rtic-sync/Cargo.toml index 440a6beb..ccb6cab5 100644 --- a/rtic-sync/Cargo.toml +++ b/rtic-sync/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rtic-sync" -version = "1.0.0-alpha.0" +version = "1.0.0" edition = "2021" authors = [ @@ -19,7 +19,7 @@ license = "MIT OR Apache-2.0" [dependencies] heapless = "0.7" critical-section = "1" -rtic-common = { version = "1.0.0-alpha.0", path = "../rtic-common" } +rtic-common = { version = "1.0.0", path = "../rtic-common" } [dev-dependencies] tokio = { version = "1", features = ["rt", "macros", "time"] } diff --git a/rtic-time/Cargo.toml b/rtic-time/Cargo.toml index b0746c17..ef7635e3 100644 --- a/rtic-time/Cargo.toml +++ b/rtic-time/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rtic-time" -version = "1.0.0-alpha.1" +version = "1.0.0" edition = "2021" authors = [ @@ -19,7 +19,7 @@ license = "MIT OR Apache-2.0" [dependencies] critical-section = "1" futures-util = { version = "0.3.25", default-features = false } -rtic-common = { version = "1.0.0-alpha.0", path = "../rtic-common" } +rtic-common = { version = "1.0.0", path = "../rtic-common" } [dev-dependencies] parking_lot = "0.12" diff --git a/rtic/Cargo.toml b/rtic/Cargo.toml index c2f30450..05c6362a 100644 --- a/rtic/Cargo.toml +++ b/rtic/Cargo.toml @@ -22,7 +22,7 @@ name = "rtic" readme = "../README.md" repository = "https://github.com/rtic-rs/rtic" -version = "2.0.0-alpha.2" +version = "2.0.0" [package.metadata.docs.rs] features = ["rtic-macros/test-template"] @@ -35,8 +35,8 @@ cortex-m = { version = "0.7.0", optional = true } bare-metal = "1.0.0" #portable-atomic = { version = "0.3.19" } atomic-polyfill = "1" -rtic-monotonics = { path = "../rtic-monotonics", version = "1.0.0-alpha.1", optional = true } -rtic-macros = { path = "../rtic-macros", version = "2.0.0-alpha.2" } +rtic-monotonics = { path = "../rtic-monotonics", version = "1.0.0", optional = true } +rtic-macros = { path = "../rtic-macros", version = "2.0.0" } rtic-core = "1" critical-section = "1" |