From 04d27d3675cff997e4ca3559c7f01b704b00c9dd Mon Sep 17 00:00:00 2001 From: Ryan Summers Date: Fri, 10 Nov 2023 14:58:58 +0100 Subject: [PATCH] Updating MQTT dependencies --- Cargo.lock | 34 +++++++++++++++++++--------------- Cargo.toml | 6 +++--- py/pyproject.toml | 2 +- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dcd65d2d..3b0e26e6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -454,9 +454,9 @@ dependencies = [ [[package]] name = "embedded-io" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bbadc628dc286b9ae02f0cb0f5411c056eb7487b72f0083203f115de94060" +checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" [[package]] name = "embedded-nal" @@ -833,8 +833,9 @@ dependencies = [ [[package]] name = "miniconf" -version = "0.8.0" -source = "git+https://github.com/quartiq/miniconf#587a5bf6f498a9bd05d4e6fb76e7b108dd0f9a1d" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9df2d7bdba3acb28460c347b21e1e88d869f2716ebe060eb6a79f7b76b57de72" dependencies = [ "embedded-io", "heapless", @@ -849,8 +850,9 @@ dependencies = [ [[package]] name = "miniconf_derive" -version = "0.8.0" -source = "git+https://github.com/quartiq/miniconf#587a5bf6f498a9bd05d4e6fb76e7b108dd0f9a1d" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89f46d25f40e41f552d76b8eb9e225fe493ebf978a5c3f42b7599e45cfe6b4e3" dependencies = [ "proc-macro2", "quote", @@ -859,8 +861,9 @@ dependencies = [ [[package]] name = "minimq" -version = "0.7.0" -source = "git+https://github.com/quartiq/minimq#cec9ce70a9091b4e20d3b09c0efe8341dc762f41" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b561c2c86a3509f7c514f546fb24755753a30fdcf67cce8d5f2f38688483cd31" dependencies = [ "bit_field", "embedded-nal 0.7.0", @@ -874,8 +877,9 @@ dependencies = [ [[package]] name = "minireq" -version = "0.2.0" -source = "git+https://github.com/quartiq/minireq#b7a4c90714e1695c953b355b26e05e967aea782e" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "249c23889cc6d50d796d5fbef033ba7698e6d011c32338eddc4e9ce6b86b3c52" dependencies = [ "embedded-io", "heapless", @@ -992,22 +996,22 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.7" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" +checksum = "683751d591e6d81200c39fb0d1032608b77724f34114db54f571ff1317b337c0" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.7" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" +checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e" dependencies = [ "proc-macro2", "quote", - "syn 1.0.105", + "syn 2.0.29", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 78c65019..faffd27c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,12 +48,12 @@ usb-device = "0.2.9" encdec = { version = "0.9", default-features = false } crc-any = { version = "2.4.3", default-features = false } panic-persist = { version = "0.3", features = ["custom-panic-handler", "utf8"] } -miniconf = { git = "https://github.com/quartiq/miniconf", features = ["mqtt-client"]} +miniconf = { version = "0.9.0", features = ["mqtt-client"]} # Note: Keep `py/pyproject.toml` version in sync with the Minimq version used in FW. -minimq = { git = "https://github.com/quartiq/minimq" } +minimq = "0.8.0" w5500 = "0.4.1" smlang= "0.6" -minireq = { git = "https://github.com/quartiq/minireq" } +minireq = "0.3.0" rtt-target = {version = "0.3", features=["cortex-m"]} enum-iterator = { version = "1.4", default-features = false } enc424j600 = { version = "0.3", features = ["cortex-m-cpu"] } diff --git a/py/pyproject.toml b/py/pyproject.toml index 84e060cb..492cf6d4 100644 --- a/py/pyproject.toml +++ b/py/pyproject.toml @@ -15,5 +15,5 @@ authors = [ ] dependencies = [ # Note: keep this in sync with Cargo.toml - "miniconf-mqtt@git+https://github.com/quartiq/miniconf@main#subdirectory=py/miniconf-mqtt", + "miniconf-mqtt@git+https://github.com/quartiq/miniconf@v0.8.0#subdirectory=py/miniconf-mqtt", ]