From 3141d6cab5b4b84144bd5981bba7a952922ac6de Mon Sep 17 00:00:00 2001 From: David Cermak Date: Tue, 18 Nov 2025 14:39:18 +0100 Subject: [PATCH] fix(modem): Update example to use optional mqtt deps --- .../modem_tcp_client/main/idf_component.yml | 12 ++++++++---- .../examples/pppos_client/main/idf_component.yml | 16 ++++++++++------ .../simple_cmux_client/main/idf_component.yml | 4 ++++ .../test/target_ota/main/idf_component.yml | 10 +++++++--- 4 files changed, 29 insertions(+), 13 deletions(-) diff --git a/components/esp_modem/examples/modem_tcp_client/main/idf_component.yml b/components/esp_modem/examples/modem_tcp_client/main/idf_component.yml index 0d9805d7f..d04386172 100644 --- a/components/esp_modem/examples/modem_tcp_client/main/idf_component.yml +++ b/components/esp_modem/examples/modem_tcp_client/main/idf_component.yml @@ -1,7 +1,11 @@ dependencies: espressif/esp_modem: - version: "^1.0.1" - override_path: "../../../" + version: ^1.0.1 + override_path: ../../../ espressif/mbedtls_cxx: - version: "*" - override_path: "../../../../mbedtls_cxx" + version: '*' + override_path: ../../../../mbedtls_cxx + espressif/mqtt: + rules: + - if: idf_version >=6.0 + version: ^1.0.0 diff --git a/components/esp_modem/examples/pppos_client/main/idf_component.yml b/components/esp_modem/examples/pppos_client/main/idf_component.yml index 0c242b0d7..acbea9497 100644 --- a/components/esp_modem/examples/pppos_client/main/idf_component.yml +++ b/components/esp_modem/examples/pppos_client/main/idf_component.yml @@ -1,12 +1,16 @@ ## IDF Component Manager Manifest File dependencies: ## Required IDF version - idf: ">=4.1.0" + idf: '>=4.1.0' espressif/esp_modem: - version: "^1.0.0" - override_path: "../../../" + version: ^1.0.0 + override_path: ../../../ espressif/esp_modem_usb_dte: - version: "^1.2.0" + version: ^1.2.0 rules: - - if: "idf_version >=4.4" - - if: "target in [esp32s2, esp32s3, esp32p4]" + - if: idf_version >=4.4 + - if: target in [esp32s2, esp32s3, esp32p4] + espressif/mqtt: + rules: + - if: idf_version >=6.0 + version: ^1.0.0 diff --git a/components/esp_modem/examples/simple_cmux_client/main/idf_component.yml b/components/esp_modem/examples/simple_cmux_client/main/idf_component.yml index 3289c9b16..228838410 100644 --- a/components/esp_modem/examples/simple_cmux_client/main/idf_component.yml +++ b/components/esp_modem/examples/simple_cmux_client/main/idf_component.yml @@ -2,3 +2,7 @@ dependencies: espressif/esp_modem: version: "^1.0.1" override_path: "../../../" + espressif/mqtt: + rules: + - if: idf_version >=6.0 + version: ^1.0.0 diff --git a/components/esp_modem/test/target_ota/main/idf_component.yml b/components/esp_modem/test/target_ota/main/idf_component.yml index ae03f49c9..94026716e 100644 --- a/components/esp_modem/test/target_ota/main/idf_component.yml +++ b/components/esp_modem/test/target_ota/main/idf_component.yml @@ -1,10 +1,14 @@ ## IDF Component Manager Manifest File dependencies: espressif/esp_modem: - version: "*" + version: '*' override_path: ../../.. espressif/mbedtls_cxx: - version: "*" + version: '*' override_path: ../../../../mbedtls_cxx idf: - version: ">=4.1.0" + version: '>=4.1.0' + espressif/mqtt: + rules: + - if: idf_version >=6.0 + version: ^1.0.0