From 750f4ea797703ed6301c3a99a3acb6ea648f251b Mon Sep 17 00:00:00 2001
From: Clyde Stubbs <2366188+clydebarrow@users.noreply.github.com>
Date: Wed, 10 Dec 2025 00:40:58 +1100
Subject: [PATCH] [pio] Rationalise library definitions in platformio.ini
 (#12374)

---
 .clang-tidy.hash |  2 +-
 platformio.ini   | 26 ++++++++++++--------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/.clang-tidy.hash b/.clang-tidy.hash
index 7dabee48f..a3322ba73 100644
--- a/.clang-tidy.hash
+++ b/.clang-tidy.hash
@@ -1 +1 @@
-c01eec15857a784dd603c0afd194ab3b29a632422fe6f6b0a806ad4d81b5efc0
+766420905c06eeb6c5f360f68fd965e5ddd9c4a5db6b823263d3ad3accb64a07
diff --git a/platformio.ini b/platformio.ini
index 9095d27af..d37c798c0 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -32,20 +32,24 @@ build_flags =
 
 ; This are common settings for all environments.
 [common]
-lib_deps =
-    esphome/noise-c@0.1.10                  ; api
-    improv/Improv@1.2.4                    ; improv_serial / esp32_improv
+; Base dependencies for all environments
+lib_deps_base =
     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
-    kikuchan98/pngle@1.1.0                 ; online_image
     https://github.com/esphome/TinyGPSPlus.git#v1.1.0     ; gps
+; This is using the repository until a new release is published to PlatformIO
+    https://github.com/Sensirion/arduino-gas-index-algorithm.git#3.2.1 ; Sensirion Gas Index Algorithm Arduino Library
+    lvgl/lvgl@8.4.0                        ; lvgl
+
+lib_deps =
+    ${common.lib_deps_base}
+    esphome/noise-c@0.1.10                  ; api
+    improv/Improv@1.2.4                    ; improv_serial / esp32_improv
+    kikuchan98/pngle@1.1.0                 ; online_image
     ; Using the repository directly, otherwise ESP-IDF can't use the library
     https://github.com/bitbank2/JPEGDEC.git#ca1e0f2    ; online_image
-    ; This is using the repository until a new release is published to PlatformIO
-    https://github.com/Sensirion/arduino-gas-index-algorithm.git#3.2.1 ; Sensirion Gas Index Algorithm Arduino Library
-    lvgl/lvgl@8.4.0                                       ; lvgl
     ; This dependency is used only in unit tests.
     ; Must coincide with PLATFORMIO_GOOGLE_TEST_LIB in scripts/cpp_unit_test.py
     ; See scripts/cpp_unit_test.py and tests/components/README.md
@@ -236,13 +240,7 @@ build_flags =
     -DUSE_ZEPHYR
     -DUSE_NRF52
 lib_deps =
-    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
-    https://github.com/esphome/TinyGPSPlus.git#v1.1.0     ; gps
-    https://github.com/Sensirion/arduino-gas-index-algorithm.git#3.2.1 ; Sensirion Gas Index Algorithm Arduino Library
-    lvgl/lvgl@8.4.0                                       ; lvgl
+    ${common.lib_deps_base}
 
 ; All the actual environments are defined below.