Clean up the git commits for conflicting changes

Author: mantriyogesh

host/esp_hosted_host_fw_ver.h

@@ -14,8 +14,8 @@
 #define __ESP_HOSTED_HOST_FW_VERSION_H__
 
 #define ESP_HOSTED_VERSION_MAJOR_1 2
-#define ESP_HOSTED_VERSION_MINOR_1 6
-#define ESP_HOSTED_VERSION_PATCH_1 5
+#define ESP_HOSTED_VERSION_MINOR_1 7
+#define ESP_HOSTED_VERSION_PATCH_1 0
 
 /**
  * Macro to convert version number into an integer

idf_component.yml

@@ -1,4 +1,4 @@
-version: "2.6.5"
+version: "2.7.0"
 description: ESP-Hosted-MCU provide drivers to act any ESP chipset as Wi-Fi or Bluetooth co-processor.
 url: https://github.com/espressif/esp-hosted-mcu
 examples:

slave/main/CMakeLists.txt

@@ -49,6 +49,8 @@ endif()
 # Set COMPONENT_REQUIRES to include all necessary components
 set(COMPONENT_REQUIRES ${component_requires})
 
+set(COMPONENT_PRIV_REQUIRES wpa_supplicant)
+
 # Select BT UART code based on IDF Target
 if(CONFIG_IDF_TARGET_ESP32)
     list(APPEND COMPONENT_SRCS slave_bt_uart_esp32.c)

slave/main/esp_hosted_coprocessor_fw_ver.h

@@ -14,8 +14,8 @@
 #define __ESP_HOSTED_COPROCESSOR_FW_VER_H__
 
 #define PROJECT_VERSION_MAJOR_1 2
-#define PROJECT_VERSION_MINOR_1 6
-#define PROJECT_VERSION_PATCH_1 5
+#define PROJECT_VERSION_MINOR_1 7
+#define PROJECT_VERSION_PATCH_1 0
 
 /**
  * Macro to convert version number into an integer