From 5f501ec1c2201d3f556d8bb005872e5aecf644a2 Mon Sep 17 00:00:00 2001
From: Jakob Hasse <jakob.hasse@mailbox.org>
Date: Fri, 10 May 2024 18:13:59 +0200
Subject: [PATCH] refactor: cleaner dependency of app descriptor

---
 components/esp_rainmaker/CMakeLists.txt                |  4 ++++
 components/esp_rainmaker/src/core/esp_rmaker_node.c    | 10 +++++-----
 .../esp_rainmaker/src/core/esp_rmaker_node_config.c    |  3 ++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/components/esp_rainmaker/CMakeLists.txt b/components/esp_rainmaker/CMakeLists.txt
index 0c8db51..08114f1 100644
--- a/components/esp_rainmaker/CMakeLists.txt
+++ b/components/esp_rainmaker/CMakeLists.txt
@@ -20,6 +20,10 @@ set(priv_req protobuf-c json_parser json_generator
              nvs_flash esp_http_client app_update esp-tls mbedtls esp_https_ota
              console esp_local_ctrl esp_https_server mdns esp_schedule efuse driver rmaker_common)
 
+if ("${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}" VERSION_GREATER_EQUAL "5.0")
+    list(APPEND priv_req esp_app_format)
+endif()
+
 if ("${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}" VERSION_GREATER_EQUAL "5.1")
     # NAT64 and DNS64 features were introduced for openthread component in IDF v5.1
     list(APPEND priv_req openthread network_provisioning)
diff --git a/components/esp_rainmaker/src/core/esp_rmaker_node.c b/components/esp_rainmaker/src/core/esp_rmaker_node.c
index c877cae..04a5131 100644
--- a/components/esp_rainmaker/src/core/esp_rmaker_node.c
+++ b/components/esp_rainmaker/src/core/esp_rmaker_node.c
@@ -13,19 +13,19 @@
 // limitations under the License.
 #include <sdkconfig.h>
 #include <string.h>
-#include <esp_wifi.h>
+#include "esp_idf_version.h"
 #include <esp_log.h>
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
+#include <esp_app_desc.h>
+#else
 #include <esp_ota_ops.h>
+#endif
 #include <esp_rmaker_utils.h>
 #include <esp_rmaker_core.h>
 #include <esp_rmaker_secure_boot_digest.h>
 
 #include "esp_rmaker_internal.h"
 
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
-#include <esp_app_desc.h>
-#endif
-
 static const char *TAG = "esp_rmaker_node";
 
 static void esp_rmaker_node_info_free(esp_rmaker_node_info_t *info)
diff --git a/components/esp_rainmaker/src/core/esp_rmaker_node_config.c b/components/esp_rainmaker/src/core/esp_rmaker_node_config.c
index 0b03466..41af043 100644
--- a/components/esp_rainmaker/src/core/esp_rmaker_node_config.c
+++ b/components/esp_rainmaker/src/core/esp_rmaker_node_config.c
@@ -14,7 +14,6 @@
 #include <sdkconfig.h>
 #include <string.h>
 #include <esp_log.h>
-#include <esp_ota_ops.h>
 #include <json_generator.h>
 #include <esp_rmaker_core.h>
 #include <esp_rmaker_utils.h>
@@ -25,6 +24,8 @@
 
 #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
 #include <esp_app_desc.h>
+#else
+#include <esp_ota_ops.h>
 #endif
 
 #define NODE_CONFIG_TOPIC_SUFFIX        "config"