From e98264d1a6378a4e1773898e46f8da6c9714a189 Mon Sep 17 00:00:00 2001 From: proddy Date: Tue, 23 Jul 2024 10:07:25 +0200 Subject: [PATCH] go back to local copy of ArduinoJson as a single header --- {lib_standalone => lib/ArduinoJson}/ArduinoJson.h | 0 lib/ArduinoJson/README.txt | 7 +++++++ pio_local.ini_example | 1 - platformio.ini | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-) rename {lib_standalone => lib/ArduinoJson}/ArduinoJson.h (100%) create mode 100644 lib/ArduinoJson/README.txt diff --git a/lib_standalone/ArduinoJson.h b/lib/ArduinoJson/ArduinoJson.h similarity index 100% rename from lib_standalone/ArduinoJson.h rename to lib/ArduinoJson/ArduinoJson.h diff --git a/lib/ArduinoJson/README.txt b/lib/ArduinoJson/README.txt new file mode 100644 index 000000000..78892cf61 --- /dev/null +++ b/lib/ArduinoJson/README.txt @@ -0,0 +1,7 @@ +Version 7.1.0 + +From https://github.com/bblanchon/ArduinoJson/releases + +MIT License (MIT) + +Copyright © 2014-2024, Benoit BLANCHON diff --git a/pio_local.ini_example b/pio_local.ini_example index 28a01c6c9..d99543c7d 100644 --- a/pio_local.ini_example +++ b/pio_local.ini_example @@ -38,7 +38,6 @@ custom_password = admin ; rm -rf .pio/libdeps/native/EMS-ESP-Modules; pio run -e native -t clean; pio run -e native -t exec ; lib_deps = ; file://../modules/EMS-ESP-Modules -; bblanchon/ArduinoJson@^7.0.4 [env:native] extra_scripts = diff --git a/platformio.ini b/platformio.ini index 05fd80548..97f4d732a 100644 --- a/platformio.ini +++ b/platformio.ini @@ -81,7 +81,6 @@ check_flags = lib_ldf_mode = chain+ lib_deps = https://github.com/emsesp/EMS-ESP-Modules.git - bblanchon/ArduinoJson@7.1.0 ; build for GitHub Actions CI ; the Web interface is built seperately, so is skipped in extra_scripts @@ -229,6 +228,7 @@ build_src_flags = -I./lib/uuid-log/src -I./lib/semver -I./lib/PButton + -I./lib/ArduinoJson -I./lib/espMqttClient/src -I./lib/espMqttClient/src/Transport build_src_filter = @@ -244,4 +244,4 @@ build_src_filter = +<../lib/espMqttClient/src/Transport> lib_compat_mode = off lib_ldf_mode = off -lib_ignore = ArduinoJson +lib_ignore = Module EMS-ESP-Modules