Skip to content

Commit 241da6b

Browse files
authored
Merge pull request #536 from brentru/upgrade-arduinojson-to-v7
Upgrade ArduinoJSON to V7 and refactored JSON handling
2 parents 246c610 + bd0d181 commit 241da6b

18 files changed

+434
-440
lines changed

.github/workflows/build-clang-doxy.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ jobs:
4949
git clone --quiet https://github.com/adafruit/Adafruit_STMPE610.git /home/runner/Arduino/libraries/Adafruit_STMPE610
5050
git clone --quiet https://github.com/adafruit/Adafruit-ST7735-Library.git /home/runner/Arduino/libraries/Adafruit-ST7735-Library
5151
git clone --quiet https://github.com/adafruit/Adafruit_TouchScreen.git /home/runner/Arduino/libraries/Adafruit_TouchScreen
52-
git clone --depth 1 --branch 6.x https://github.com/bblanchon/ArduinoJson.git /home/runner/Arduino/libraries/ArduinoJson
5352
git clone --depth 1 --branch wippersnapper https://github.com/brentru/lvgl.git /home/runner/Arduino/libraries/lvgl
5453
git clone --depth 1 --branch development https://github.com/brentru/Adafruit_LvGL_Glue.git /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library
5554
- name: Download and install stable Nanopb
@@ -118,7 +117,6 @@ jobs:
118117
run: bash ci/actions_install.sh
119118
- name: Install extra Arduino libraries
120119
run: |
121-
git clone --depth 1 --branch 6.x https://github.com/bblanchon/ArduinoJson.git /home/runner/Arduino/libraries/ArduinoJson
122120
git clone --quiet https://github.com/milesburton/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library
123121
git clone --quiet https://github.com/pstolarz/OneWireNg.git /home/runner/Arduino/libraries/OneWireNg
124122
- name: Download and install stable Nanopb
@@ -214,7 +212,6 @@ jobs:
214212
# manually install Adafruit WiFiNINA library fork
215213
- name: Install extra Arduino libraries
216214
run: |
217-
git clone --depth 1 --branch 6.x https://github.com/bblanchon/ArduinoJson.git /home/runner/Arduino/libraries/ArduinoJson
218215
git clone --quiet https://github.com/adafruit/WiFiNINA.git /home/runner/Arduino/libraries/WiFiNINA
219216
git clone --quiet https://github.com/milesburton/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library
220217
git clone --quiet https://github.com/PaulStoffregen/OneWire.git /home/runner/Arduino/libraries/OneWire
@@ -266,7 +263,6 @@ jobs:
266263
# manually install OneWireNG/TempControlLib for OneWireNg (RP2040 Supported OneWire w/backwards compat.)
267264
- name: Install extra Arduino libraries
268265
run: |
269-
git clone --depth 1 --branch 6.x https://github.com/bblanchon/ArduinoJson.git /home/runner/Arduino/libraries/ArduinoJson
270266
git clone --quiet https://github.com/pstolarz/OneWireNg.git /home/runner/Arduino/libraries/OneWireNg
271267
git clone --quiet https://github.com/pstolarz/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library
272268
- name: Download and install stable Nanopb
@@ -316,7 +312,6 @@ jobs:
316312
run: bash ci/actions_install.sh
317313
- name: Install extra Arduino libraries
318314
run: |
319-
git clone --depth 1 --branch 6.x https://github.com/bblanchon/ArduinoJson.git /home/runner/Arduino/libraries/ArduinoJson
320315
git clone --quiet https://github.com/arduino-libraries/WiFiNINA.git /home/runner/Arduino/libraries/WiFiNINA
321316
git clone --quiet https://github.com/arduino-libraries/Servo.git /home/runner/Arduino/libraries/Servo
322317
git clone --quiet https://github.com/milesburton/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library
@@ -357,7 +352,6 @@ jobs:
357352
run: bash ci/actions_install.sh
358353
- name: Install extra Arduino library
359354
run: |
360-
git clone --depth 1 --branch 6.x https://github.com/bblanchon/ArduinoJson.git /home/runner/Arduino/libraries/ArduinoJson
361355
git clone --quiet https://github.com/milesburton/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library
362356
git clone --quiet https://github.com/PaulStoffregen/OneWire.git /home/runner/Arduino/libraries/OneWire
363357
- name: Download and install stable Nanopb
@@ -415,7 +409,6 @@ jobs:
415409
run: bash ci/actions_install.sh
416410
- name: Install extra Arduino libraries
417411
run: |
418-
git clone --depth 1 --branch 6.x https://github.com/bblanchon/ArduinoJson.git /home/runner/Arduino/libraries/ArduinoJson
419412
git clone --quiet https://github.com/milesburton/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library
420413
git clone --quiet https://github.com/pstolarz/OneWireNg.git /home/runner/Arduino/libraries/OneWireNg
421414
git clone --quiet https://github.com/adafruit/Adafruit_HX8357_Library.git /home/runner/Arduino/libraries/Adafruit_HX8357_Library
@@ -482,4 +475,4 @@ jobs:
482475
env:
483476
GH_REPO_TOKEN: ${{ secrets.GH_REPO_TOKEN }}
484477
PRETTYNAME : "Adafruit.io WipperSnapper Library"
485-
run: bash ci/doxy_gen_and_deploy.sh
478+
run: bash ci/doxy_gen_and_deploy.sh

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=Adafruit WipperSnapper
2-
version=1.0.0-beta.74
2+
version=1.0.0-beta.75
33
author=Adafruit
44
maintainer=Adafruit <adafruitio@adafruit.com>
55
sentence=Arduino application for Adafruit.io WipperSnapper

0 commit comments

Comments
 (0)