From c83d1de974b053d924a3e4f208514f2ce24772a8 Mon Sep 17 00:00:00 2001
From: Sycrosity <72102935+Sycrosity@users.noreply.github.com>
Date: Wed, 14 Aug 2024 14:45:46 +0200
Subject: [PATCH] Update to latest release (`0.6.0`) for `embassy-executor` in
 `esp-embassy-hal` (fixes #1941) (#1942)

* Updated to latest release (`0.6.0`) for `embassy-executor`

* update changelog

* update hil-test version of embassy-executor to 0.6.0

* update embassy-executor in `examples`

* reflect esp_hal change in `OneShotTimer` to not have a lifetime.

* update changelog

* revert OneShotTimer changes
---
 esp-hal-embassy/CHANGELOG.md | 2 ++
 esp-hal-embassy/Cargo.toml   | 2 +-
 examples/Cargo.toml          | 2 +-
 hil-test/Cargo.toml          | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/esp-hal-embassy/CHANGELOG.md b/esp-hal-embassy/CHANGELOG.md
index 41c4502d45f..11dc227c643 100644
--- a/esp-hal-embassy/CHANGELOG.md
+++ b/esp-hal-embassy/CHANGELOG.md
@@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Updated to latest release (`0.6.0`) for `embassy-executor` (#1942)
+
 ### Fixed
 
 - Fixed a bug where the timeout was huge whenever the timestamp at the time of scheduling was already in the past (#1875)
diff --git a/esp-hal-embassy/Cargo.toml b/esp-hal-embassy/Cargo.toml
index aed8bc5e6e2..ff5bc8d0305 100644
--- a/esp-hal-embassy/Cargo.toml
+++ b/esp-hal-embassy/Cargo.toml
@@ -15,7 +15,7 @@ features       = ["esp32c6"]
 critical-section    = "1.1.2"
 defmt               = { version = "0.3.8", optional = true }
 document-features   = "0.2.10"
-embassy-executor    = { version = "0.5.0", optional = true }
+embassy-executor    = { version = "0.6.0", optional = true }
 embassy-time-driver = { version = "0.1.0", features = [ "tick-hz-1_000_000" ] }
 esp-hal             = { version = "0.19.0", path = "../esp-hal" }
 log                 = { version = "0.4.22", optional = true }
diff --git a/examples/Cargo.toml b/examples/Cargo.toml
index e3bb27e0060..4aa78acfa04 100644
--- a/examples/Cargo.toml
+++ b/examples/Cargo.toml
@@ -13,7 +13,7 @@ cfg-if              = "1.0.0"
 critical-section    = "1.1.2"
 crypto-bigint       = { version = "0.5.5", default-features = false }
 elliptic-curve      = { version = "0.13.8", default-features = false, features = ["sec1"] }
-embassy-executor    = { version = "0.5.0", features = ["task-arena-size-40960"] }
+embassy-executor    = { version = "0.6.0", features = ["task-arena-size-40960"] }
 embassy-futures     = "0.1.1"
 embassy-net = { version = "0.4.0", features = [ "tcp", "udp", "dhcpv4", "medium-ethernet"] }
 embassy-sync        = "0.6.0"
diff --git a/hil-test/Cargo.toml b/hil-test/Cargo.toml
index b1585ddc9d4..2819cd6c75e 100644
--- a/hil-test/Cargo.toml
+++ b/hil-test/Cargo.toml
@@ -145,7 +145,7 @@ static_cell        = { version = "2.1.0", features = ["nightly"] }
 [dev-dependencies]
 crypto-bigint       = { version = "0.5.5", default-features = false }
 elliptic-curve      = { version = "0.13.8", default-features = false, features = ["sec1"] }
-embassy-executor    = { version = "0.5.0", default-features = false }
+embassy-executor    = { version = "0.6.0", default-features = false }
 # Add the `embedded-test/defmt` feature for more verbose testing
 embedded-test       = { version = "0.4.0", default-features = false }
 hex-literal         = "0.4.1"