Merge branch 'bump_ESPAsyncWebServer_AsyncTCP' into integration

esphome/components/async_tcp/__init__.py

@@ -31,7 +31,7 @@ CONFIG_SCHEMA = cv.All(
 async def to_code(config):
     if CORE.is_esp32 or CORE.is_libretiny:
         # https://github.com/ESP32Async/AsyncTCP
-        cg.add_library("ESP32Async/AsyncTCP", "3.4.4")
+        cg.add_library("ESP32Async/AsyncTCP", "3.4.5")
     elif CORE.is_esp8266:
         # https://github.com/ESP32Async/ESPAsyncTCP
         cg.add_library("ESP32Async/ESPAsyncTCP", "2.0.0")

esphome/components/json/__init__.py

@@ -12,6 +12,6 @@ CONFIG_SCHEMA = cv.All(
 
 @coroutine_with_priority(1.0)
 async def to_code(config):
-    cg.add_library("bblanchon/ArduinoJson", "6.18.5")
+    cg.add_library("bblanchon/ArduinoJson", "7.4.2")
     cg.add_define("USE_JSON")
     cg.add_global(json_ns.using)

esphome/components/web_server_base/__init__.py

@@ -40,7 +40,4 @@ async def to_code(config):
         if CORE.is_esp8266:
             cg.add_library("ESP8266WiFi", None)
         # https://github.com/ESP32Async/ESPAsyncWebServer/blob/main/library.json
-        # Use fork with libretiny compatibility fix
-        cg.add_library(
-            "https://github.com/bdraco/ESPAsyncWebServer.git#libretiny_Fix", None
-        )
+        cg.add_library("ESP32Async/ESPAsyncWebServer", "3.7.10")

esphome/platformio_api.py

@@ -78,6 +78,8 @@ def run_platformio_cli(*args, **kwargs) -> str | int:
     os.environ.setdefault(
         "PLATFORMIO_LIBDEPS_DIR", os.path.abspath(CORE.relative_piolibdeps_path())
     )
+    # Suppress Python syntax warnings from third-party scripts during compilation
+    os.environ.setdefault("PYTHONWARNINGS", "ignore::SyntaxWarning")
     cmd = ["platformio"] + list(args)
 
     if not CORE.verbose:

esphome/writer.py

@@ -162,6 +162,9 @@ def get_ini_content():
     # Sort to avoid changing build unflags order
     CORE.add_platformio_option("build_unflags", sorted(CORE.build_unflags))
 
+    # Add extra script for C++ flags
+    CORE.add_platformio_option("extra_scripts", ["pre:cxx_flags.py"])
+
     content = "[platformio]\n"
     content += f"description = ESPHome {__version__}\n"
 
@@ -222,6 +225,9 @@ def write_platformio_project():
         write_gitignore()
     write_platformio_ini(content)
 
+    # Write extra script for C++ specific flags
+    write_cxx_flags_script()
+
 
 DEFINES_H_FORMAT = ESPHOME_H_FORMAT = """\
 #pragma once
@@ -394,3 +400,16 @@ def write_gitignore():
     if not os.path.isfile(path):
         with open(file=path, mode="w", encoding="utf-8") as f:
             f.write(GITIGNORE_CONTENT)
+
+
+CXX_FLAGS_SCRIPT = """# Auto-generated ESPHome script for C++ specific compiler flags
+Import("env")
+
+# Add C++ specific warning flags
+env.Append(CXXFLAGS=["-Wno-volatile"])
+"""
+
+
+def write_cxx_flags_script() -> None:
+    path = CORE.relative_build_path("cxx_flags.py")
+    write_file_if_changed(path, CXX_FLAGS_SCRIPT)

platformio.ini

@@ -35,7 +35,7 @@ build_flags =
 lib_deps =
     esphome/noise-c@0.1.10                  ; api
     improv/Improv@1.2.4                    ; improv_serial / esp32_improv
-    bblanchon/ArduinoJson@6.18.5           ; json
+    bblanchon/ArduinoJson@7.4.2           ; json
     wjtje/qr-code-generator-library@1.7.0  ; qr_code
     functionpointer/arduino-MLX90393@1.0.2 ; mlx90393
     pavlodn/HaierProtocol@0.9.31           ; haier
@@ -235,7 +235,7 @@ build_flags =
     -DUSE_ZEPHYR
     -DUSE_NRF52
 lib_deps =
-    bblanchon/ArduinoJson@7.0.0           ; json
+    bblanchon/ArduinoJson@7.4.2           ; json
     wjtje/qr-code-generator-library@1.7.0  ; qr_code
     pavlodn/HaierProtocol@0.9.31           ; haier
     functionpointer/arduino-MLX90393@1.0.2 ; mlx90393