Set version to 6.21.3

Ported from 23b01a89b1

.devcontainer/clang11/devcontainer.json

@@ -1,18 +0,0 @@
-{
-	"name": "Clang 11",
-	"image": "conanio/clang11",
-	"runArgs": [
-		"--name=ArduinoJson-clang11"
-	],
-	"customizations": {
-		"vscode": {
-			"extensions": [
-				"ms-vscode.cmake-tools"
-			],
-			"settings": {
-				"cmake.generator": "Unix Makefiles",
-				"cmake.buildDirectory": "/tmp/build"
-			}
-		}
-	}
-}

.devcontainer/clang13/Dockerfile

@@ -1,5 +0,0 @@
-FROM ubuntu:22.04
-
-RUN apt-get update
-RUN apt-get install -y cmake git clang-13 libc++-13-dev libc++abi-13-dev
-ENV CC=clang-13 CXX=clang++-13

.devcontainer/clang13/devcontainer.json

@@ -1,20 +0,0 @@
-{
-	"name": "Clang 13",
-	"build": {
-		"dockerfile": "Dockerfile"
-	},
-	"runArgs": [
-		"--name=ArduinoJson-clang13"
-	],
-	"customizations": {
-		"vscode": {
-			"extensions": [
-				"ms-vscode.cmake-tools"
-			],
-			"settings": {
-				"cmake.generator": "Unix Makefiles",
-				"cmake.buildDirectory": "/tmp/build"
-			}
-		}
-	}
-}

.devcontainer/clang14/Dockerfile

@@ -1,5 +0,0 @@
-FROM ubuntu:22.04
-
-RUN apt-get update
-RUN apt-get install -y cmake git clang-14 libc++-14-dev libc++abi-14-dev
-ENV CC=clang-14 CXX=clang++-14

.devcontainer/clang14/devcontainer.json

@@ -1,20 +0,0 @@
-{
-	"name": "Clang 14",
-	"build": {
-		"dockerfile": "Dockerfile"
-	},
-	"runArgs": [
-		"--name=ArduinoJson-clang14"
-	],
-	"customizations": {
-		"vscode": {
-			"extensions": [
-				"ms-vscode.cmake-tools"
-			],
-			"settings": {
-				"cmake.generator": "Unix Makefiles",
-				"cmake.buildDirectory": "/tmp/build"
-			}
-		}
-	}
-}

.devcontainer/clang15/Dockerfile

@@ -1,5 +0,0 @@
-FROM ubuntu:22.04
-
-RUN apt-get update
-RUN apt-get install -y cmake git clang-15 libc++-15-dev libc++abi-15-dev
-ENV CC=clang-15 CXX=clang++-15

.devcontainer/clang15/devcontainer.json

@@ -1,20 +0,0 @@
-{
-	"name": "Clang 15",
-	"build": {
-		"dockerfile": "Dockerfile"
-	},
-	"runArgs": [
-		"--name=ArduinoJson-clang15"
-	],
-	"customizations": {
-		"vscode": {
-			"extensions": [
-				"ms-vscode.cmake-tools"
-			],
-			"settings": {
-				"cmake.generator": "Unix Makefiles",
-				"cmake.buildDirectory": "/tmp/build"
-			}
-		}
-	}
-}

.devcontainer/clang16/Dockerfile

@@ -1,5 +0,0 @@
-FROM ubuntu:22.04
-
-RUN apt-get update
-RUN apt-get install -y cmake git clang-16 libc++-16-dev libc++abi-16-dev
-ENV CC=clang-16 CXX=clang++-16

.devcontainer/clang16/devcontainer.json

@@ -1,20 +0,0 @@
-{
-	"name": "Clang 16",
-	"build": {
-		"dockerfile": "Dockerfile"
-	},
-	"runArgs": [
-		"--name=ArduinoJson-clang16"
-	],
-	"customizations": {
-		"vscode": {
-			"extensions": [
-				"ms-vscode.cmake-tools"
-			],
-			"settings": {
-				"cmake.generator": "Unix Makefiles",
-				"cmake.buildDirectory": "/tmp/build"
-			}
-		}
-	}
-}

.devcontainer/clang17/Dockerfile

@@ -1,5 +0,0 @@
-FROM ubuntu:24.04
-
-RUN apt-get update
-RUN apt-get install -y cmake git clang-17 libc++-17-dev libc++abi-17-dev
-ENV CC=clang-17 CXX=clang++-17

.devcontainer/clang17/devcontainer.json

@@ -1,20 +0,0 @@
-{
-	"name": "Clang 17",
-	"build": {
-		"dockerfile": "Dockerfile"
-	},
-	"runArgs": [
-		"--name=ArduinoJson-clang17"
-	],
-	"customizations": {
-		"vscode": {
-			"extensions": [
-				"ms-vscode.cmake-tools"
-			],
-			"settings": {
-				"cmake.generator": "Unix Makefiles",
-				"cmake.buildDirectory": "/tmp/build"
-			}
-		}
-	}
-}

.devcontainer/gcc12/Dockerfile

@@ -1,4 +0,0 @@
-FROM ubuntu:22.04
-
-RUN apt-get update
-RUN apt-get install -y cmake git g++-12

.devcontainer/gcc12/devcontainer.json

@@ -1,20 +0,0 @@
-{
-	"name": "GCC 12",
-	"build": {
-		"dockerfile": "Dockerfile",
-	},
-	"runArgs": [
-		"--name=ArduinoJson-gcc12"
-	],
-	"customizations": {
-		"vscode": {
-			"extensions": [
-				"ms-vscode.cmake-tools"
-			],
-			"settings": {
-				"cmake.generator": "Unix Makefiles",
-				"cmake.buildDirectory": "/tmp/build"
-			}
-		}
-	}
-}

.devcontainer/gcc48/devcontainer.json

@@ -1,20 +0,0 @@
-{
-	"name": "GCC 4.8",
-	"image": "conanio/gcc48",
-	"runArgs": [
-		"--name=ArduinoJson-gcc48"
-	],
-	"customizations": {
-		"vscode": {
-			"extensions": [
-				"ms-vscode.cmake-tools",
-				"josetr.cmake-language-support-vscode",
-				"ms-vscode.cpptools"
-			],
-			"settings": {
-				"cmake.generator": "Unix Makefiles",
-				"cmake.buildDirectory": "/tmp/build"
-			}
-		}
-	}
-}

.github/ISSUE_TEMPLATE/bug_report.md

@@ -14,7 +14,7 @@ Before opening a bug report, please use the ArduinoJson Troubleshooter as it may
 A clear and concise description of what the bug is.
 
 **Troubleshooter report**  
-Here is the report generated by the [ArduinoJson Troubleshooter](https://arduinojson.org/v7/troubleshooter/):  
+Here is the report generated by the [ArduinoJson Troubleshooter](https://arduinojson.org/v6/troubleshooter/):  
 [Paste the report here]
 
 **Environment**  
@@ -27,7 +27,7 @@ Here is the environment that I used:
 Here is a small snippet that reproduces the issue.
 
 ```c++
-JsonDocument doc;
+DynamicJsonDocument doc(1024);
 
 DeserializationError error = deserializeJson(doc, "{\"hello\":\"world\"}");
 

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,8 @@
 blank_issues_enabled: true
 contact_links:
   - name: 👨‍🏫 ArduinoJson Assistant
-    url: https://arduinojson.org/v7/assistant/
+    url: https://arduinojson.org/v6/assistant/
     about: An online tool that computes memory requirements and generates scaffolding code for your project.
   - name: 👨‍⚕️ ArduinoJson Troubleshooter
-    url: https://arduinojson.org/v7/troubleshooter/
+    url: https://arduinojson.org/v6/troubleshooter/
     about: An online tool that helps you diagnose the most common issues with ArduinoJson.

.github/ISSUE_TEMPLATE/help.md

@@ -15,7 +15,7 @@ A clear and concise description of what you're trying to do.
 You don't need to explain every aspect of your project: focus on the problem you're having.
 
 **Troubleshooter report**  
-Here is the report generated by the [ArduinoJson Troubleshooter](https://arduinojson.org/v7/troubleshooter/):  
+Here is the report generated by the [ArduinoJson Troubleshooter](https://arduinojson.org/v6/troubleshooter/):  
 [Paste the report here]
 
 **Environment**  
@@ -28,7 +28,7 @@ Here is the environment that I'm using':
 Here is a small snippet that demonstrate the problem.
 
 ```c++
-JsonDocument doc;
+DynamicJsonDocument doc(1024);
 
 DeserializationError error = deserializeJson(doc, "{\"hello\":\"world\"}");
 

.github/workflows/ci.yml

@@ -2,19 +2,15 @@ name: Continuous Integration
 
 on: [push, pull_request]
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   lint:
     name: Lint
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Install
         run: sudo apt-get install -y clang-format
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: Symlinks
         run: find * -type l -printf "::error::%p is a symlink. This is forbidden by the Arduino Library Specification." -exec false {} +
       - name: Clang-format
@@ -37,7 +33,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - gcc: "4.8"
           - gcc: "5"
           - gcc: "6"
           - gcc: "7"
@@ -49,97 +44,67 @@ jobs:
           - gcc: "10"
             cxxflags: -funsigned-char # Issue #1715
           - gcc: "11"
-          - gcc: "12"
     steps:
-      - name: Workaround for actions/runner-images#9491
-        run: sudo sysctl vm.mmap_rnd_bits=28
-
       - name: Install
         run: |
           sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 40976EAF437D05B5 3B4FE6ACC0B21F32
-          sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ xenial main universe'
           sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ bionic main universe'
           sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ focal main universe'
           sudo apt-get update
           sudo apt-get install -y gcc-${{ matrix.gcc }} g++-${{ matrix.gcc }}
-        timeout-minutes: 5
-
       - name: Checkout
-        uses: actions/checkout@v4
-        timeout-minutes: 1
-
+        uses: actions/checkout@v3
       - name: Configure
         run: cmake -DCMAKE_BUILD_TYPE=Debug .
         env:
           CC: gcc-${{ matrix.gcc }}
           CXX: g++-${{ matrix.gcc }}
           CXXFLAGS: ${{ matrix.cxxflags }}
-        timeout-minutes: 1
-
       - name: Build
         run: cmake --build .
-        timeout-minutes: 10
-
       - name: Test
-        run: ctest --output-on-failure -C Debug .
+        run: |
+          echo "## CTest output" >> $GITHUB_STEP_SUMMARY
+          echo '```' >> $GITHUB_STEP_SUMMARY
+          ctest --output-on-failure -C Debug . | tee -a $GITHUB_STEP_SUMMARY
+          echo '```' >> $GITHUB_STEP_SUMMARY
         env:
           UBSAN_OPTIONS: print_stacktrace=1
-        timeout-minutes: 2
 
   clang:
     name: Clang
     needs: lint
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
         include:
+          - clang: "3.8"
+            cxxflags: "-stdlib=libc++"
+          - clang: "3.9"
+            cxxflags: "-stdlib=libc++"
+          - clang: "4.0"
+            cxxflags: "-stdlib=libc++"
+          - clang: "5.0"
+          - clang: "6.0"
           - clang: "7"
-            runner: ubuntu-22.04
-            archive: focal
           - clang: "8"
             cxxflags: -fsanitize=leak -fno-sanitize-recover=all
-            runner: ubuntu-22.04
-            archive: focal
           - clang: "9"
             cxxflags: -fsanitize=undefined -fno-sanitize-recover=all
-            runner: ubuntu-22.04
-            archive: focal
           - clang: "10"
             cxxflags: -fsanitize=address -fno-sanitize-recover=all
-            runner: ubuntu-22.04
-            archive: focal
-          - clang: "11"
-            runner: ubuntu-22.04
-          - clang: "12"
-            runner: ubuntu-22.04
-          - clang: "13"
-            runner: ubuntu-22.04
-          - clang: 14
-          - clang: 15
-          - clang: 16
-          - clang: 17
-          - clang: 18
-          - clang: 19
-    runs-on: ${{ matrix.runner || 'ubuntu-latest' }}
     steps:
-      - name: Add archive repositories
-        if: matrix.archive
-        run: |
-          sudo gpg --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32
-          sudo gpg --export 3B4FE6ACC0B21F32 | sudo tee /etc/apt/trusted.gpg.d/ubuntu-keyring.gpg > /dev/null
-          sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ ${{ matrix.archive }} main'
-          sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ ${{ matrix.archive }} universe'
-      - name: Install Clang ${{ matrix.clang }}
+      - name: Install
         run: |
+          sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ xenial main'
+          sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ xenial universe'
+          sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ bionic main'
+          sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ bionic universe'
           sudo apt-get update
           sudo apt-get install -y clang-${{ matrix.clang }}
-      - name: Install libc++ ${{ matrix.clang }}
-        run: sudo apt-get install -y libc++-${{ matrix.clang }}-dev libc++abi-${{ matrix.clang }}-dev
-      - name: Install libunwind ${{ matrix.clang }}
-        if: matrix.clang == 12 # dependency is missing in Ubuntu 22.04
-        run: sudo apt-get install -y libunwind-${{ matrix.clang }}-dev
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: Configure
         run: cmake -DCMAKE_BUILD_TYPE=Debug .
         env:
@@ -147,25 +112,29 @@ jobs:
           CXX: clang++-${{ matrix.clang }}
           CXXFLAGS: >-
             ${{ matrix.cxxflags }}
-            ${{ matrix.clang < 11 && '-I/usr/lib/llvm-10/include/c++/v1/' || '' }}
+            ${{ contains(matrix.cxxflags, 'libc++') && '-I/usr/lib/llvm-10/include/c++/v1/' || '' }}
       - name: Build
         run: cmake --build .
       - name: Test
-        run: ctest --output-on-failure -C Debug .
+        run: |
+          echo "## CTest output" >> $GITHUB_STEP_SUMMARY
+          echo '```' >> $GITHUB_STEP_SUMMARY
+          ctest --output-on-failure -C Debug . | tee -a $GITHUB_STEP_SUMMARY
+          echo '```' >> $GITHUB_STEP_SUMMARY
         env:
           UBSAN_OPTIONS: print_stacktrace=1
 
   conf_test:
     name: Test configuration on Linux
     needs: [gcc, clang]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Install
         run: |
           sudo apt-get update
           sudo apt-get install -y g++-multilib gcc-avr avr-libc
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: AVR
         run: avr-g++ -std=c++11 -Isrc extras/conf_test/avr.cpp
       - name: GCC 32-bit
@@ -183,7 +152,7 @@ jobs:
     needs: [gcc, clang]
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: 32-bit
         run: |
           call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars32.bat"
@@ -198,20 +167,17 @@ jobs:
   xcode:
     name: XCode
     needs: clang
-    runs-on: macos-13
+    runs-on: macos-11
     strategy:
       fail-fast: false
       matrix:
         include:
-          - xcode: "14.1"
-          - xcode: "14.2"
-          - xcode: "14.3.1"
-          - xcode: "15.0.1"
-          - xcode: "15.1"
-          - xcode: "15.2"
+          - xcode: "11.7"
+          - xcode: "12.4"
+          - xcode: "13.2.1"
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: Select XCode version
         run: sudo xcode-select --switch /Applications/Xcode_${{ matrix.xcode }}.app
       - name: Configure
@@ -233,7 +199,7 @@ jobs:
   #   runs-on: ${{ matrix.os }}
   #   steps:
   #     - name: Checkout
-  #       uses: actions/checkout@v4
+  #       uses: actions/checkout@v3
   #     - name: Configure
   #       run: cmake -DCMAKE_BUILD_TYPE=Debug .
   #     - name: Build
@@ -252,10 +218,10 @@ jobs:
             board: arduino:avr:uno
           - core: arduino:samd
             board: arduino:samd:mkr1000
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: Install arduino-cli
         run: curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | BINDIR=/usr/local/bin sh
       - name: Install core
@@ -328,14 +294,14 @@ jobs:
             conf_test: esp8266
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: Set up cache for pip
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip
       - name: Set up Python 3.x
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v4
         with:
           python-version: "3.x"
       - name: Install PlatformIO
@@ -347,7 +313,7 @@ jobs:
         if: ${{ matrix.platform == 'nordicnrf52' }}
         run: find examples/ -name '*.ino' -exec sed -i 's/\(#include <ArduinoJson.h>\)/\1\n#include <Adafruit_TinyUSB.h>/' {} +
       - name: Set up cache for platformio
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: ~/.platformio
           key: ${{ runner.os }}-platformio-${{ matrix.platform }}
@@ -396,7 +362,7 @@ jobs:
           - board: argon
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: Install Particle CLI
         run: sudo npm install -g particle-cli
       - name: Login to Particle
@@ -407,14 +373,14 @@ jobs:
   arm:
     name: GCC for ARM processor
     needs: gcc
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Install
         run: |
           sudo apt-get update
           sudo apt-get install -y g++-arm-linux-gnueabihf
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: Configure
         run: cmake .
         env:
@@ -426,18 +392,18 @@ jobs:
   coverage:
     needs: gcc
     name: Coverage
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Install
         run: sudo apt-get install -y lcov ninja-build
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: Configure
         run: cmake -G Ninja -DCOVERAGE=true .
       - name: Build
         run: ninja
       - name: Test
-        run: ctest --output-on-failure -LE 'WillFail|Fuzzing' -T test
+        run: ctest -LE 'WillFail|Fuzzing' -T test
       - name: lcov --capture
         run: lcov --capture --no-external --directory . --output-file coverage.info
       - name: lcov --remove
@@ -445,12 +411,12 @@ jobs:
       - name: genhtml
         run: mkdir coverage && genhtml coverage_filtered.info -o coverage -t ArduinoJson
       - name: Upload HTML report
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: Coverage report
           path: coverage
       - name: Upload to Coveralls
-        uses: coverallsapp/github-action@v2
+        uses: coverallsapp/github-action@master
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           path-to-lcov: coverage_filtered.info
@@ -458,87 +424,109 @@ jobs:
   valgrind:
     needs: gcc
     name: Valgrind
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Install
         run: |
           sudo apt-get update
           sudo apt-get install -y valgrind ninja-build
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: Configure
         run: cmake -G Ninja -D MEMORYCHECK_COMMAND_OPTIONS="--error-exitcode=1 --leak-check=full"  .
       - name: Build
         run: ninja
       - name: Memcheck
-        run: ctest --output-on-failure -LE WillFail -T memcheck
+        run: ctest -LE WillFail -T memcheck
         id: memcheck
       - name: MemoryChecker.*.log
-        run: cat Testing/Temporary/MemoryChecker.*.log > $GITHUB_STEP_SUMMARY
+        run: cat Testing/Temporary/MemoryChecker.*.log
         if: failure()
 
   clang-tidy:
     needs: clang
     name: Clang-Tidy
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Install
-        run: sudo apt-get install -y clang-tidy libc++-dev libc++abi-dev
+        run: sudo apt-get install -y clang-tidy cmake ninja-build
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: Configure
-        run: cmake -G Ninja -DCMAKE_CXX_CLANG_TIDY="clang-tidy;--warnings-as-errors=*" -DCMAKE_BUILD_TYPE=Debug .
+        run: cmake -G Ninja -DCMAKE_CXX_CLANG_TIDY="clang-tidy-10;--warnings-as-errors=*" -DCMAKE_BUILD_TYPE=Debug .
         env:
-          CC: clang
-          CXX: clang++
+          CC: clang-10
+          CXX: clang++-10
       - name: Check
         run: cmake --build . -- -k 0
 
-  amalgamate:
+  amalgamate-h:
     needs: gcc
     name: Amalgamate ArduinoJson.h
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
-      - name: Setup
+        uses: actions/checkout@v3
+      - name: Amalgamate
+        id: amalgamate
         run: |
           if [[ $GITHUB_REF == refs/tags/* ]]; then
             VERSION=${GITHUB_REF#refs/tags/}
           else
             VERSION=${GITHUB_SHA::7}
           fi
-          echo "ARDUINOJSON_H=ArduinoJson-$VERSION.h" >> $GITHUB_ENV
-          echo "ARDUINOJSON_HPP=ArduinoJson-$VERSION.hpp" >> $GITHUB_ENV
-      - name: Amalgamate ArduinoJson.h
-        run: extras/scripts/build-single-header.sh "src/ArduinoJson.h" "$ARDUINOJSON_H"
-      - name: Amalgamate ArduinoJson.hpp
-        run: extras/scripts/build-single-header.sh "src/ArduinoJson.hpp" "$ARDUINOJSON_HPP"
+          INPUT=src/ArduinoJson.h
+          OUTPUT=ArduinoJson-$VERSION.h
+          extras/scripts/build-single-header.sh "$INPUT" "$OUTPUT"
+          echo "filename=${OUTPUT}" >> $GITHUB_OUTPUT
+      - name: Smoke test
+        run: |
+          g++ -x c++ - <<END
+          #include "${{ steps.amalgamate.outputs.filename }}"
+          int main() {
+            StaticJsonDocument<300> doc;
+            deserializeJson(doc, "{}");
+          }
+          END
       - name: Upload artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: Single headers
-          path: |
-            ${{ env.ARDUINOJSON_H }}
-            ${{ env.ARDUINOJSON_HPP }}
-      - name: Smoke test ArduinoJson.h
+          path: ${{ steps.amalgamate.outputs.filename }}
+
+  amalgamate-hpp:
+    needs: gcc
+    name: Amalgamate ArduinoJson.hpp
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Amalgamate
+        id: amalgamate
+        run: |
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            VERSION=${GITHUB_REF#refs/tags/}
+          else
+            VERSION=${GITHUB_SHA::7}
+          fi
+          INPUT=src/ArduinoJson.hpp
+          OUTPUT=ArduinoJson-$VERSION.hpp
+          extras/scripts/build-single-header.sh "$INPUT" "$OUTPUT"
+          echo "filename=${OUTPUT}" >> $GITHUB_OUTPUT
+      - name: Smoke test
         run: |
           g++ -x c++ - <<END
-          #include "$ARDUINOJSON_H"
+          #include "${{ steps.amalgamate.outputs.filename }}"
           int main() {
-            JsonDocument doc;
-            deserializeJson(doc, "{}");
-          }
-          END
-      - name: Smoke test ArduinoJson.hpp
-        run: |
-          g++ -x c++ - <<END
-          #include "$ARDUINOJSON_HPP"
-          int main() {
-            ArduinoJson::JsonDocument doc;
+            ArduinoJson::StaticJsonDocument<300> doc;
             deserializeJson(doc, "{}");
           }
           END
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: Single headers
+          path: ${{ steps.amalgamate.outputs.filename }}
 
   esp-idf:
     needs: gcc
@@ -546,14 +534,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup cache
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: ~/.espressif
           key: ${{ runner.os }}-esp-idf
       - name: Checkout ArduinoJson
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: Checkout ESP-IDF
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           repository: espressif/esp-idf
           path: esp-idf
@@ -573,7 +561,7 @@ jobs:
 
   codeql:
     name: CodeQL
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     needs: gcc
 
     permissions:
@@ -583,10 +571,10 @@ jobs:
 
     steps:
     - name: Checkout repository
-        uses: actions/checkout@v4
+      uses: actions/checkout@v3
 
     - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v2
       with:
         languages: cpp
 
@@ -596,6 +584,6 @@ jobs:
         cmake --build .
 
     - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v2
       with:
         category: "/language:cpp"

.github/workflows/lock.yml

@@ -8,7 +8,7 @@ jobs:
   lock:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v5
+      - uses: dessant/lock-threads@v4
         with:
           github-token: ${{ github.token }}
           issue-inactive-days: 30

.github/workflows/release.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   release:
     name: Create release
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Set variables
         id: init
@@ -16,18 +16,12 @@ jobs:
           echo "tag=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
           echo "version=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: Write release body
         id: body
         run: |
           FILENAME=RELEASE.md
-          tee $FILENAME <<END
-          ## Changes
-
-          $(extras/scripts/extract_changes.awk CHANGELOG.md)
-
-          [View version history](https://github.com/bblanchon/ArduinoJson/blob/${{ steps.init.outputs.tag }}/CHANGELOG.md)
-          END
+          extras/scripts/get-release-body.sh ${{ steps.init.outputs.tag }} CHANGELOG.md | tee $FILENAME
           echo "filename=$FILENAME" >> $GITHUB_OUTPUT
       - name: Amalgamate ArduinoJson.h
         id: amalgamate_h
@@ -41,12 +35,18 @@ jobs:
           FILENAME=ArduinoJson-${{ steps.init.outputs.tag }}.hpp
           extras/scripts/build-single-header.sh src/ArduinoJson.hpp "$FILENAME"
           echo "filename=$FILENAME" >> $GITHUB_OUTPUT
+      - name: Create Arduino package
+        id: arduino
+        run: |
+          FILENAME=ArduinoJson-${{ steps.init.outputs.tag }}.zip
+          extras/scripts/build-arduino-package.sh . "$FILENAME"
+          echo "filename=$FILENAME" >> $GITHUB_OUTPUT
       - name: Create release
         uses: ncipollo/release-action@v1
         with:
           bodyFile: ${{ steps.body.outputs.filename }}
           name: ArduinoJson ${{ steps.init.outputs.version }}
-          artifacts: ${{ steps.amalgamate_h.outputs.filename }},${{ steps.amalgamate_hpp.outputs.filename }}
+          artifacts: ${{ steps.amalgamate_h.outputs.filename }},${{ steps.amalgamate_hpp.outputs.filename }},${{ steps.arduino.outputs.filename }}
           token: ${{ secrets.GITHUB_TOKEN }}
 
   idf:
@@ -54,7 +54,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: Upload component to the component registry
         uses: espressif/upload-components-ci-action@v1
         with:
@@ -69,25 +69,10 @@ jobs:
       - name: Install
         run: npm install -g particle-cli
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: Login
         run: particle login --token ${{ secrets.PARTICLE_TOKEN }}
+        timeout-minutes: 1
       - name: Publish
         run: bash -eux extras/scripts/publish-particle-library.sh
-
-  platformio:
-    name: PlatformIO
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up Python 3.x
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.x"
-      - name: Install PlatformIO
-        run: pip install platformio
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Publish
-        run: pio pkg publish --no-interactive --no-notify
-        env:
-          PLATFORMIO_AUTH_TOKEN: ${{ secrets.PLATFORMIO_AUTH_TOKEN }}
+        timeout-minutes: 5

ArduinoJson.h

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 
 #include "src/ArduinoJson.h"

CMakeLists.txt

@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2025, Benoit BLANCHON
+# Copyright © 2014-2023, Benoit BLANCHON
 # MIT License
 
 cmake_minimum_required(VERSION 3.15)
@@ -10,7 +10,7 @@ if(ESP_PLATFORM)
 	return()
 endif()
 
-project(ArduinoJson VERSION 7.4.1)
+project(ArduinoJson VERSION 6.21.3)
 
 if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
 	include(CTest)

LICENSE.txt

@@ -1,7 +1,7 @@
 The MIT License (MIT)
 ---------------------
 
-Copyright © 2014-2025, Benoit BLANCHON
+Copyright © 2014-2023, Benoit BLANCHON
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

README.md

@@ -4,10 +4,13 @@
 
 ---
 
-[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/bblanchon/ArduinoJson/ci.yml?branch=7.x&logo=github)](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A7.x)
-[![Continuous Integration](https://ci.appveyor.com/api/projects/status/m7s53wav1l0abssg/branch/7.x?svg=true)](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/7.x)
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/bblanchon/ArduinoJson/ci.yml?branch=6.x&logo=github)](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A6.x)
+[![Continuous Integration](https://ci.appveyor.com/api/projects/status/m7s53wav1l0abssg/branch/6.x?svg=true)](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/6.x)
 [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/arduinojson.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:arduinojson)
-[![Coveralls branch](https://img.shields.io/coveralls/github/bblanchon/ArduinoJson/7.x?logo=coveralls)](https://coveralls.io/github/bblanchon/ArduinoJson?branch=7.x)  
+[![Coveralls branch](https://img.shields.io/coveralls/github/bblanchon/ArduinoJson/6.x?logo=coveralls)](https://coveralls.io/github/bblanchon/ArduinoJson?branch=6.x)  
+[![Arduino Library Manager](https://img.shields.io/static/v1?label=Arduino&message=v6.21.3&logo=arduino&logoColor=white&color=blue)](https://www.ardu-badge.com/ArduinoJson/6.21.3)
+[![PlatformIO Registry](https://badges.registry.platformio.org/packages/bblanchon/library/ArduinoJson.svg?version=6.21.3)](https://registry.platformio.org/packages/libraries/bblanchon/ArduinoJson?version=6.21.3) 
+[![ESP IDF](https://img.shields.io/static/v1?label=ESP+IDF&message=v6.21.3&logo=cpu&logoColor=white&color=blue)](https://components.espressif.com/components/bblanchon/arduinojson)  
 [![GitHub stars](https://img.shields.io/github/stars/bblanchon/ArduinoJson?style=flat&logo=github&color=orange)](https://github.com/bblanchon/ArduinoJson/stargazers)
 [![GitHub Sponsors](https://img.shields.io/github/sponsors/bblanchon?logo=github&color=orange)](https://github.com/sponsors/bblanchon)
 
@@ -15,28 +18,31 @@ ArduinoJson is a C++ JSON library for Arduino and IoT (Internet Of Things).
 
 ## Features
 
-* [JSON deserialization](https://arduinojson.org/v7/api/json/deserializejson/)
-    * [Optionally decodes UTF-16 escape sequences to UTF-8](https://arduinojson.org/v7/api/config/decode_unicode/)
-    * [Optionally supports comments in the input](https://arduinojson.org/v7/api/config/enable_comments/)
-    * [Optionally filters the input to keep only desired values](https://arduinojson.org/v7/api/json/deserializejson/#filtering)
+* [JSON deserialization](https://arduinojson.org/v6/api/json/deserializejson/)
+    * [Optionally decodes UTF-16 escape sequences to UTF-8](https://arduinojson.org/v6/api/config/decode_unicode/)
+    * [Optionally stores links to the input buffer (zero-copy)](https://arduinojson.org/v6/api/json/deserializejson/)
+    * [Optionally supports comments in the input](https://arduinojson.org/v6/api/config/enable_comments/)
+    * [Optionally filters the input to keep only desired values](https://arduinojson.org/v6/api/json/deserializejson/#filtering)
     * Supports single quotes as a string delimiter
     * Compatible with [NDJSON](http://ndjson.org/) and [JSON Lines](https://jsonlines.org/)
-* [JSON serialization](https://arduinojson.org/v7/api/json/serializejson/)
-    * [Can write to a buffer or a stream](https://arduinojson.org/v7/api/json/serializejson/)
-    * [Optionally indents the document (prettified JSON)](https://arduinojson.org/v7/api/json/serializejsonpretty/)
-* [MessagePack serialization](https://arduinojson.org/v7/api/msgpack/serializemsgpack/)
-* [MessagePack deserialization](https://arduinojson.org/v7/api/msgpack/deserializemsgpack/)
+* [JSON serialization](https://arduinojson.org/v6/api/json/serializejson/)
+    * [Can write to a buffer or a stream](https://arduinojson.org/v6/api/json/serializejson/)
+    * [Optionally indents the document (prettified JSON)](https://arduinojson.org/v6/api/json/serializejsonpretty/)
+* [MessagePack serialization](https://arduinojson.org/v6/api/msgpack/serializemsgpack/)
+* [MessagePack deserialization](https://arduinojson.org/v6/api/msgpack/deserializemsgpack/)
 * Efficient
     * [Twice smaller than the "official" Arduino_JSON library](https://arduinojson.org/2019/11/19/arduinojson-vs-arduino_json/)
     * [Almost 10% faster than the "official" Arduino_JSON library](https://arduinojson.org/2019/11/19/arduinojson-vs-arduino_json/)
     * [Consumes roughly 10% less RAM than the "official" Arduino_JSON library](https://arduinojson.org/2019/11/19/arduinojson-vs-arduino_json/)
+    * [Fixed memory allocation, no heap fragmentation](https://arduinojson.org/v6/api/jsondocument/)
+    * [Optionally works without heap memory (zero malloc)](https://arduinojson.org/v6/api/staticjsondocument/)
     * [Deduplicates strings](https://arduinojson.org/news/2020/08/01/version-6-16-0/)
 * Versatile
-    * Supports [custom allocators (to use external RAM chip, for example)](https://arduinojson.org/v7/how-to/use-external-ram-on-esp32/)
-    * Supports [`String`](https://arduinojson.org/v7/api/config/enable_arduino_string/), [`std::string`](https://arduinojson.org/v7/api/config/enable_std_string/), and [`std::string_view`](https://arduinojson.org/v7/api/config/enable_string_view/)
-    * Supports [`Stream`](https://arduinojson.org/v7/api/config/enable_arduino_stream/) and [`std::istream`/`std::ostream`](https://arduinojson.org/v7/api/config/enable_std_stream/)
-    * Supports [Flash strings](https://arduinojson.org/v7/api/config/enable_progmem/)
-    * Supports [custom readers](https://arduinojson.org/v7/api/json/deserializejson/#custom-reader) and [custom writers](https://arduinojson.org/v7/api/json/serializejson/#custom-writer)
+    * Supports [custom allocators (to use external RAM chip, for example)](https://arduinojson.org/v6/how-to/use-external-ram-on-esp32/)
+    * Supports [`String`](https://arduinojson.org/v6/api/config/enable_arduino_string/), [`std::string`](https://arduinojson.org/v6/api/config/enable_std_string/), and [`std::string_view`](https://arduinojson.org/v6/api/config/enable_string_view/)
+    * Supports [`Stream`](https://arduinojson.org/v6/api/config/enable_arduino_stream/) and [`std::istream`/`std::ostream`](https://arduinojson.org/v6/api/config/enable_std_stream/)
+    * Supports [Flash strings](https://arduinojson.org/v6/api/config/enable_progmem/)
+    * Supports [custom readers](https://arduinojson.org/v6/api/json/deserializejson/#custom-reader) and [custom writers](https://arduinojson.org/v6/api/json/serializejson/#custom-writer)
     * Supports [custom converters](https://arduinojson.org/news/2021/05/04/version-6-18-0/)
 * Portable
     * Usable on any C++ project (not limited to Arduino)
@@ -66,29 +72,29 @@ ArduinoJson is a C++ JSON library for Arduino and IoT (Internet Of Things).
         * [Visual Micro](http://www.visualmicro.com/)
         * [Visual Studio](https://www.visualstudio.com/)
     * [Even works with online compilers like wandbox.org](https://wandbox.org/permlink/RlZSKy17DjJ6HcdN)
-    * [CMake friendly](https://arduinojson.org/v7/how-to/use-arduinojson-with-cmake/)
+    * [CMake friendly](https://arduinojson.org/v6/how-to/use-arduinojson-with-cmake/)
 * Well designed
-    * [Elegant API](http://arduinojson.org/v7/example/)
+    * [Elegant API](http://arduinojson.org/v6/example/)
     * [Thread-safe](https://en.wikipedia.org/wiki/Thread_safety)
     * Self-contained (no external dependency)
     * `const` friendly
-    * [`for` friendly](https://arduinojson.org/v7/api/jsonobject/begin_end/)
+    * [`for` friendly](https://arduinojson.org/v6/api/jsonobject/begin_end/)
     * [TMP friendly](https://en.wikipedia.org/wiki/Template_metaprogramming)
-    * Handles [integer overflows](https://arduinojson.org/v7/api/jsonvariant/as/#integer-overflows)
+    * Handles [integer overflows](https://arduinojson.org/v6/api/jsonvariant/as/#integer-overflows)
 * Well tested
-    * [Unit test coverage close to 100%](https://coveralls.io/github/bblanchon/ArduinoJson?branch=7.x)
+    * [Unit test coverage close to 100%](https://coveralls.io/github/bblanchon/ArduinoJson?branch=6.x)
     * Continuously tested on
-        * [Visual Studio 2017, 2019, 2022](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/7.x)
-        * [GCC 4.8, 5, 6, 7, 8, 9, 10, 11, 12](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22)
-        * [Clang 7 to 19](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22)
+        * [Visual Studio 2017, 2019, 2022](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/6.x)
+        * [GCC 5, 6, 7, 8, 9, 10, 11](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22)
+        * [Clang 3.8, 3.9, 4.0, 5.0, 6.0, 7, 8, 9, 10](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22)
     * [Continuously fuzzed with Google OSS Fuzz](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:arduinojson)
     * Passes all default checks of [clang-tidy](https://releases.llvm.org/10.0.0/tools/clang/tools/extra/docs/clang-tidy/)
 * Well documented
-    * [Tutorials](https://arduinojson.org/v7/doc/deserialization/)
-    * [Examples](https://arduinojson.org/v7/example/)
-    * [How-tos](https://arduinojson.org/v7/example/)
-    * [FAQ](https://arduinojson.org/v7/faq/)
-    * [Troubleshooter](https://arduinojson.org/v7/troubleshooter/)
+    * [Tutorials](https://arduinojson.org/v6/doc/deserialization/)
+    * [Examples](https://arduinojson.org/v6/example/)
+    * [How-tos](https://arduinojson.org/v6/example/)
+    * [FAQ](https://arduinojson.org/v6/faq/)
+    * [Troubleshooter](https://arduinojson.org/v6/troubleshooter/)
     * [Book](https://arduinojson.org/book/)
     * [Changelog](CHANGELOG.md)
 * Vibrant user community
@@ -103,9 +109,9 @@ ArduinoJson is a C++ JSON library for Arduino and IoT (Internet Of Things).
 Here is a program that parses a JSON document with ArduinoJson.
 
 ```c++
-const char* json = "{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}";
+char json[] = "{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}";
 
-JsonDocument doc;
+DynamicJsonDocument doc(1024);
 deserializeJson(doc, json);
 
 const char* sensor = doc["sensor"];
@@ -114,14 +120,14 @@ double latitude    = doc["data"][0];
 double longitude   = doc["data"][1];
 ```
 
-See the [tutorial on arduinojson.org](https://arduinojson.org/v7/doc/deserialization/)
+See the [tutorial on arduinojson.org](https://arduinojson.org/v6/doc/deserialization/)
 
 ### Serialization
 
 Here is a program that generates a JSON document with ArduinoJson:
 
 ```c++
-JsonDocument doc;
+DynamicJsonDocument doc(1024);
 
 doc["sensor"] = "gps";
 doc["time"]   = 1351824120;
@@ -133,7 +139,7 @@ serializeJson(doc, Serial);
 // {"sensor":"gps","time":1351824120,"data":[48.756080,2.302038]}
 ```
 
-See the [tutorial on arduinojson.org](https://arduinojson.org/v7/doc/serialization/)
+See the [tutorial on arduinojson.org](https://arduinojson.org/v6/doc/serialization/)
 
 ## Sponsors
 
@@ -148,9 +154,6 @@ ArduinoJson is thankful to its sponsors. Please give them a visit; they deserve
   <a href="https://github.com/1technophile" rel="sponsored">
     <img alt="1technophile" src="https://avatars.githubusercontent.com/u/12672732?s=40&v=4">
   </a>
-  <a href="https://github.com/LArkema" rel="sponsored">
-    <img alt="LArkema" src="https://avatars.githubusercontent.com/u/38381313?s=40&v=4">
-  </a>
 </p>
 
 If you run a commercial project that embeds ArduinoJson, think about [sponsoring the library's development](https://github.com/sponsors/bblanchon): it ensures the code that your products rely on stays actively maintained. It can also give your project some exposure to the makers' community.

appveyor.yml

@@ -1,4 +1,4 @@
-version: 7.4.1.{build}
+version: 6.21.3.{build}
 environment:
   matrix:
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022

examples/JsonConfigFile/JsonConfigFile.ino

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to store your project configuration in a file.
@@ -17,28 +17,35 @@
 // * CLK  <-> pin 13
 // * CS   <-> pin 4
 //
-// https://arduinojson.org/v7/example/config/
+// https://arduinojson.org/v6/example/config/
 
 #include <ArduinoJson.h>
 #include <SD.h>
 #include <SPI.h>
 
 // Our configuration structure.
+//
+// Never use a JsonDocument to store the configuration!
+// A JsonDocument is *not* a permanent storage; it's only a temporary storage
+// used during the serialization phase. See:
+// https://arduinojson.org/v6/faq/why-must-i-create-a-separate-config-object/
 struct Config {
   char hostname[64];
   int port;
 };
 
-const char* filename = "/config.txt";  // <- SD library uses 8.3 filenames
+const char *filename = "/config.txt";  // <- SD library uses 8.3 filenames
 Config config;                         // <- global configuration object
 
 // Loads the configuration from a file
-void loadConfiguration(const char* filename, Config& config) {
+void loadConfiguration(const char *filename, Config &config) {
   // Open file for reading
   File file = SD.open(filename);
 
   // Allocate a temporary JsonDocument
-  JsonDocument doc;
+  // Don't forget to change the capacity to match your requirements.
+  // Use https://arduinojson.org/v6/assistant to compute the capacity.
+  StaticJsonDocument<512> doc;
 
   // Deserialize the JSON document
   DeserializationError error = deserializeJson(doc, file);
@@ -56,7 +63,7 @@ void loadConfiguration(const char* filename, Config& config) {
 }
 
 // Saves the configuration to a file
-void saveConfiguration(const char* filename, const Config& config) {
+void saveConfiguration(const char *filename, const Config &config) {
   // Delete existing file, otherwise the configuration is appended to the file
   SD.remove(filename);
 
@@ -68,7 +75,9 @@ void saveConfiguration(const char* filename, const Config& config) {
   }
 
   // Allocate a temporary JsonDocument
-  JsonDocument doc;
+  // Don't forget to change the capacity to match your requirements.
+  // Use https://arduinojson.org/assistant to compute the capacity.
+  StaticJsonDocument<256> doc;
 
   // Set the values in the document
   doc["hostname"] = config.hostname;
@@ -84,7 +93,7 @@ void saveConfiguration(const char* filename, const Config& config) {
 }
 
 // Prints the content of a file to the Serial
-void printFile(const char* filename) {
+void printFile(const char *filename) {
   // Open file for reading
   File file = SD.open(filename);
   if (!file) {
@@ -105,8 +114,7 @@ void printFile(const char* filename) {
 void setup() {
   // Initialize serial port
   Serial.begin(9600);
-  while (!Serial)
-    continue;
+  while (!Serial) continue;
 
   // Initialize SD library
   const int chipSelect = 4;
@@ -136,7 +144,7 @@ void loop() {
 // ------------------
 //
 // File is an unbuffered stream, which is not optimal for ArduinoJson.
-// See: https://arduinojson.org/v7/how-to/improve-speed/
+// See: https://arduinojson.org/v6/how-to/improve-speed/
 
 // See also
 // --------

examples/JsonFilterExample/JsonFilterExample.ino

@@ -1,18 +1,17 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to use DeserializationOption::Filter
 //
-// https://arduinojson.org/v7/example/filter/
+// https://arduinojson.org/v6/example/filter/
 
 #include <ArduinoJson.h>
 
 void setup() {
   // Initialize serial port
   Serial.begin(9600);
-  while (!Serial)
-    continue;
+  while (!Serial) continue;
 
   // The huge input: an extract from OpenWeatherMap response
   auto input_json = F(
@@ -34,12 +33,12 @@ void setup() {
       "1000000,\"timezone\":0,\"sunrise\":1581492085,\"sunset\":1581527294}}");
 
   // The filter: it contains "true" for each value we want to keep
-  JsonDocument filter;
+  StaticJsonDocument<200> filter;
   filter["list"][0]["dt"] = true;
   filter["list"][0]["main"]["temp"] = true;
 
   // Deserialize the document
-  JsonDocument doc;
+  StaticJsonDocument<400> doc;
   deserializeJson(doc, input_json, DeserializationOption::Filter(filter));
 
   // Print the result

examples/JsonGeneratorExample/JsonGeneratorExample.ino

@@ -1,32 +1,43 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to generate a JSON document with ArduinoJson.
 //
-// https://arduinojson.org/v7/example/generator/
+// https://arduinojson.org/v6/example/generator/
 
 #include <ArduinoJson.h>
 
 void setup() {
   // Initialize Serial port
   Serial.begin(9600);
-  while (!Serial)
-    continue;
+  while (!Serial) continue;
 
   // Allocate the JSON document
-  JsonDocument doc;
+  //
+  // Inside the brackets, 200 is the RAM allocated to this document.
+  // Don't forget to change this value to match your requirement.
+  // Use https://arduinojson.org/v6/assistant to compute the capacity.
+  StaticJsonDocument<200> doc;
+
+  // StaticJsonObject allocates memory on the stack, it can be
+  // replaced by DynamicJsonDocument which allocates in the heap.
+  //
+  // DynamicJsonDocument  doc(200);
 
   // Add values in the document
+  //
   doc["sensor"] = "gps";
   doc["time"] = 1351824120;
 
-  // Add an array
-  JsonArray data = doc["data"].to<JsonArray>();
+  // Add an array.
+  //
+  JsonArray data = doc.createNestedArray("data");
   data.add(48.756080);
   data.add(2.302038);
 
-  // Generate the minified JSON and send it to the Serial port
+  // Generate the minified JSON and send it to the Serial port.
+  //
   serializeJson(doc, Serial);
   // The above line prints:
   // {"sensor":"gps","time":1351824120,"data":[48.756080,2.302038]}
@@ -34,7 +45,8 @@ void setup() {
   // Start a new line
   Serial.println();
 
-  // Generate the prettified JSON and send it to the Serial port
+  // Generate the prettified JSON and send it to the Serial port.
+  //
   serializeJsonPretty(doc, Serial);
   // The above line prints:
   // {

examples/JsonHttpClient/JsonHttpClient.ino

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to parse a JSON document in an HTTP response.
@@ -16,7 +16,7 @@
 //   ]
 // }
 //
-// https://arduinojson.org/v7/example/http-client/
+// https://arduinojson.org/v6/example/http-client/
 
 #include <ArduinoJson.h>
 #include <Ethernet.h>
@@ -25,8 +25,7 @@
 void setup() {
   // Initialize Serial port
   Serial.begin(9600);
-  while (!Serial)
-    continue;
+  while (!Serial) continue;
 
   // Initialize Ethernet library
   byte mac[] = {0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED};
@@ -78,7 +77,9 @@ void setup() {
   }
 
   // Allocate the JSON document
-  JsonDocument doc;
+  // Use https://arduinojson.org/v6/assistant to compute the capacity.
+  const size_t capacity = JSON_OBJECT_SIZE(3) + JSON_ARRAY_SIZE(2) + 60;
+  DynamicJsonDocument doc(capacity);
 
   // Parse JSON object
   DeserializationError error = deserializeJson(doc, client);
@@ -108,7 +109,7 @@ void loop() {
 // ------------------
 //
 // EthernetClient is an unbuffered stream, which is not optimal for ArduinoJson.
-// See: https://arduinojson.org/v7/how-to/improve-speed/
+// See: https://arduinojson.org/v6/how-to/improve-speed/
 
 // See also
 // --------

examples/JsonParserExample/JsonParserExample.ino

@@ -1,37 +1,52 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to deserialize a JSON document with ArduinoJson.
 //
-// https://arduinojson.org/v7/example/parser/
+// https://arduinojson.org/v6/example/parser/
 
 #include <ArduinoJson.h>
 
 void setup() {
   // Initialize serial port
   Serial.begin(9600);
-  while (!Serial)
-    continue;
+  while (!Serial) continue;
 
   // Allocate the JSON document
-  JsonDocument doc;
+  //
+  // Inside the brackets, 200 is the capacity of the memory pool in bytes.
+  // Don't forget to change this value to match your JSON document.
+  // Use https://arduinojson.org/v6/assistant to compute the capacity.
+  StaticJsonDocument<200> doc;
+
+  // StaticJsonDocument<N> allocates memory on the stack, it can be
+  // replaced by DynamicJsonDocument which allocates in the heap.
+  //
+  // DynamicJsonDocument doc(200);
 
   // JSON input string.
-  const char* json =
+  //
+  // Using a char[], as shown here, enables the "zero-copy" mode. This mode uses
+  // the minimal amount of memory because the JsonDocument stores pointers to
+  // the input buffer.
+  // If you use another type of input, ArduinoJson must copy the strings from
+  // the input to the JsonDocument, so you need to increase the capacity of the
+  // JsonDocument.
+  char json[] =
       "{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}";
 
   // Deserialize the JSON document
   DeserializationError error = deserializeJson(doc, json);
 
-  // Test if parsing succeeds
+  // Test if parsing succeeds.
   if (error) {
     Serial.print(F("deserializeJson() failed: "));
     Serial.println(error.f_str());
     return;
   }
 
-  // Fetch the values
+  // Fetch values.
   //
   // Most of the time, you can rely on the implicit casts.
   // In other case, you can do doc["time"].as<long>();
@@ -40,7 +55,7 @@ void setup() {
   double latitude = doc["data"][0];
   double longitude = doc["data"][1];
 
-  // Print the values
+  // Print values.
   Serial.println(sensor);
   Serial.println(time);
   Serial.println(latitude, 6);

examples/JsonServer/JsonServer.ino

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to implement an HTTP server that sends a JSON document
@@ -13,7 +13,7 @@
 //   "digital": [1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0]
 // }
 //
-// https://arduinojson.org/v7/example/http-server/
+// https://arduinojson.org/v6/example/http-server/
 
 #include <ArduinoJson.h>
 #include <Ethernet.h>
@@ -25,8 +25,7 @@ EthernetServer server(80);
 void setup() {
   // Initialize serial port
   Serial.begin(9600);
-  while (!Serial)
-    continue;
+  while (!Serial) continue;
 
   // Initialize Ethernet libary
   if (!Ethernet.begin(mac)) {
@@ -53,14 +52,14 @@ void loop() {
   Serial.println(F("New client"));
 
   // Read the request (we ignore the content in this example)
-  while (client.available())
-    client.read();
+  while (client.available()) client.read();
 
   // Allocate a temporary JsonDocument
-  JsonDocument doc;
+  // Use https://arduinojson.org/v6/assistant to compute the capacity.
+  StaticJsonDocument<500> doc;
 
   // Create the "analog" array
-  JsonArray analogValues = doc["analog"].to<JsonArray>();
+  JsonArray analogValues = doc.createNestedArray("analog");
   for (int pin = 0; pin < 6; pin++) {
     // Read the analog input
     int value = analogRead(pin);
@@ -70,7 +69,7 @@ void loop() {
   }
 
   // Create the "digital" array
-  JsonArray digitalValues = doc["digital"].to<JsonArray>();
+  JsonArray digitalValues = doc.createNestedArray("digital");
   for (int pin = 0; pin < 14; pin++) {
     // Read the digital input
     int value = digitalRead(pin);
@@ -102,7 +101,7 @@ void loop() {
 // ------------------
 //
 // EthernetClient is an unbuffered stream, which is not optimal for ArduinoJson.
-// See: https://arduinojson.org/v7/how-to/improve-speed/
+// See: https://arduinojson.org/v6/how-to/improve-speed/
 
 // See also
 // --------

examples/JsonUdpBeacon/JsonUdpBeacon.ino

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to send a JSON document to a UDP socket.
@@ -17,7 +17,7 @@
 // $ ncat -ulp 8888
 // See https://nmap.org/ncat/
 //
-// https://arduinojson.org/v7/example/udp-beacon/
+// https://arduinojson.org/v6/example/udp-beacon/
 
 #include <ArduinoJson.h>
 #include <Ethernet.h>
@@ -32,8 +32,7 @@ EthernetUDP udp;
 void setup() {
   // Initialize serial port
   Serial.begin(9600);
-  while (!Serial)
-    continue;
+  while (!Serial) continue;
 
   // Initialize Ethernet libary
   if (!Ethernet.begin(mac)) {
@@ -47,10 +46,11 @@ void setup() {
 
 void loop() {
   // Allocate a temporary JsonDocument
-  JsonDocument doc;
+  // Use https://arduinojson.org/v6/assistant to compute the capacity.
+  StaticJsonDocument<500> doc;
 
   // Create the "analog" array
-  JsonArray analogValues = doc["analog"].to<JsonArray>();
+  JsonArray analogValues = doc.createNestedArray("analog");
   for (int pin = 0; pin < 6; pin++) {
     // Read the analog input
     int value = analogRead(pin);
@@ -60,7 +60,7 @@ void loop() {
   }
 
   // Create the "digital" array
-  JsonArray digitalValues = doc["digital"].to<JsonArray>();
+  JsonArray digitalValues = doc.createNestedArray("digital");
   for (int pin = 0; pin < 14; pin++) {
     // Read the digital input
     int value = digitalRead(pin);
@@ -90,7 +90,7 @@ void loop() {
 // ------------------
 //
 // EthernetUDP is an unbuffered stream, which is not optimal for ArduinoJson.
-// See: https://arduinojson.org/v7/how-to/improve-speed/
+// See: https://arduinojson.org/v6/how-to/improve-speed/
 
 // See also
 // --------

examples/MsgPackParser/MsgPackParser.ino

@@ -1,24 +1,39 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to deserialize a MessagePack document with
 // ArduinoJson.
 //
-// https://arduinojson.org/v7/example/msgpack-parser/
+// https://arduinojson.org/v6/example/msgpack-parser/
 
 #include <ArduinoJson.h>
 
 void setup() {
   // Initialize serial port
   Serial.begin(9600);
-  while (!Serial)
-    continue;
+  while (!Serial) continue;
 
   // Allocate the JSON document
-  JsonDocument doc;
+  //
+  // Inside the brackets, 200 is the capacity of the memory pool in bytes.
+  // Don't forget to change this value to match your JSON document.
+  // Use https://arduinojson.org/v6/assistant to compute the capacity.
+  StaticJsonDocument<200> doc;
 
-  // The MessagePack input string
+  // StaticJsonObject allocates memory on the stack, it can be
+  // replaced by DynamicJsonObject which allocates in the heap.
+  //
+  // DynamicJsonObject doc(200);
+
+  // MessagePack input string.
+  //
+  // Using a char[], as shown here, enables the "zero-copy" mode. This mode uses
+  // the minimal amount of memory because the JsonDocument stores pointers to
+  // the input buffer.
+  // If you use another type of input, ArduinoJson must copy the strings from
+  // the input to the JsonDocument, so you need to increase the capacity of the
+  // JsonDocument.
   uint8_t input[] = {131, 166, 115, 101, 110, 115, 111, 114, 163, 103, 112, 115,
                      164, 116, 105, 109, 101, 206, 80,  147, 50,  248, 164, 100,
                      97,  116, 97,  146, 203, 64,  72,  96,  199, 58,  188, 148,
@@ -30,17 +45,16 @@ void setup() {
   //   "data": [48.75608, 2.302038]
   // }
 
-  // Parse the input
   DeserializationError error = deserializeMsgPack(doc, input);
 
-  // Test if parsing succeeded
+  // Test if parsing succeeded.
   if (error) {
     Serial.print("deserializeMsgPack() failed: ");
     Serial.println(error.f_str());
     return;
   }
 
-  // Fetch the values
+  // Fetch values.
   //
   // Most of the time, you can rely on the implicit casts.
   // In other case, you can do doc["time"].as<long>();
@@ -49,7 +63,7 @@ void setup() {
   double latitude = doc["data"][0];
   double longitude = doc["data"][1];
 
-  // Print the values
+  // Print values.
   Serial.println(sensor);
   Serial.println(time);
   Serial.println(latitude, 6);

examples/ProgmemExample/ProgmemExample.ino

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 //
 // This example shows the different ways you can use Flash strings with
@@ -9,12 +9,12 @@
 // JsonDocument. Prefer plain old char*, as they are more efficient in term of
 // code size, speed, and memory usage.
 //
-// https://arduinojson.org/v7/example/progmem/
+// https://arduinojson.org/v6/example/progmem/
 
 #include <ArduinoJson.h>
 
 void setup() {
-  JsonDocument doc;
+  DynamicJsonDocument doc(1024);
 
   // You can use a Flash String as your JSON input.
   // WARNING: the strings in the input will be duplicated in the JsonDocument.

examples/StringExample/StringExample.ino

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 //
 // This example shows the different ways you can use String with ArduinoJson.
@@ -8,12 +8,12 @@
 // JsonDocument. Prefer plain old char[], as they are more efficient in term of
 // code size, speed, and memory usage.
 //
-// https://arduinojson.org/v7/example/string/
+// https://arduinojson.org/v6/example/string/
 
 #include <ArduinoJson.h>
 
 void setup() {
-  JsonDocument doc;
+  DynamicJsonDocument doc(1024);
 
   // You can use a String as your JSON input.
   // WARNING: the string in the input  will be duplicated in the JsonDocument.
@@ -55,6 +55,7 @@ void setup() {
   }
 
   // Lastly, you can print the resulting JSON to a String
+  // WARNING: it doesn't replace the content but appends to it
   String output;
   serializeJson(doc, output);
 }

extras/CompileOptions.cmake

@@ -1,7 +1,3 @@
-if(NOT DEFINED COVERAGE)
-	set(COVERAGE OFF)
-endif()
-
 if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
 	add_compile_options(
 		-pedantic
@@ -34,20 +30,10 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
 endif()
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-	if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.9) AND(NOT ${COVERAGE}))
+	if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.8) AND(NOT ${COVERAGE}))
 		add_compile_options(-g -Og)
-	else() # GCC 4.8
-		add_compile_options(
-			-g
-			-O0 # GCC 4.8 doesn't support -Og
-			-Wno-shadow  # allow the same name for a function parameter and a member functions
-			-Wp,-w  # Disable preprocessing warnings (see below)
-		)
-		# GCC 4.8 doesn't support __has_include, so we need to help him
-		add_definitions(
-			-DARDUINOJSON_ENABLE_STD_STRING=1
-			-DARDUINOJSON_ENABLE_STD_STREAM=1
-		)
+	else()
+		add_compile_options(-g -O0)
 	endif()
 
 	add_compile_options(
@@ -78,9 +64,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 endif()
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-	add_compile_options(-stdlib=libc++)
-	link_libraries(c++ m)
-
 	if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.0) AND(NOT ${COVERAGE}))
 		add_compile_options(-g -Og)
 	else()

extras/ci/espidf/CMakeLists.txt

@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2025, Benoit BLANCHON
+# Copyright © 2014-2023, Benoit BLANCHON
 # MIT License
 
 cmake_minimum_required(VERSION 3.5)

extras/ci/espidf/main/CMakeLists.txt

@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2025, Benoit BLANCHON
+# Copyright © 2014-2023, Benoit BLANCHON
 # MIT License
 
 idf_component_register(

extras/ci/espidf/main/main.cpp

@@ -1,12 +1,12 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
 
 extern "C" void app_main() {
   char buffer[256];
-  JsonDocument doc;
+  StaticJsonDocument<200> doc;
 
   doc["hello"] = "world";
   serializeJson(doc, buffer);

extras/conf_test/avr.cpp

@@ -4,15 +4,15 @@ static_assert(ARDUINOJSON_ENABLE_PROGMEM == 1, "ARDUINOJSON_ENABLE_PROGMEM");
 
 static_assert(ARDUINOJSON_USE_LONG_LONG == 0, "ARDUINOJSON_USE_LONG_LONG");
 
-static_assert(ARDUINOJSON_SLOT_ID_SIZE == 1, "ARDUINOJSON_SLOT_ID_SIZE");
-
-static_assert(ARDUINOJSON_POOL_CAPACITY == 16, "ARDUINOJSON_POOL_CAPACITY");
+static_assert(ARDUINOJSON_SLOT_OFFSET_SIZE == 1,
+              "ARDUINOJSON_SLOT_OFFSET_SIZE");
 
 static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN");
 
-static_assert(ARDUINOJSON_USE_DOUBLE == 0, "ARDUINOJSON_USE_DOUBLE");
+static_assert(ARDUINOJSON_USE_DOUBLE == 1, "ARDUINOJSON_USE_DOUBLE");
 
-static_assert(sizeof(ArduinoJson::detail::VariantData) == 6, "slot size");
+static_assert(sizeof(ArduinoJson::detail::VariantSlot) == 8,
+              "sizeof(VariantSlot)");
 
 void setup() {}
 void loop() {}

extras/conf_test/esp8266.cpp

@@ -2,15 +2,15 @@
 
 static_assert(ARDUINOJSON_USE_LONG_LONG == 1, "ARDUINOJSON_USE_LONG_LONG");
 
-static_assert(ARDUINOJSON_SLOT_ID_SIZE == 2, "ARDUINOJSON_SLOT_ID_SIZE");
-
-static_assert(ARDUINOJSON_POOL_CAPACITY == 128, "ARDUINOJSON_POOL_CAPACITY");
+static_assert(ARDUINOJSON_SLOT_OFFSET_SIZE == 2,
+              "ARDUINOJSON_SLOT_OFFSET_SIZE");
 
 static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN");
 
 static_assert(ARDUINOJSON_USE_DOUBLE == 1, "ARDUINOJSON_USE_DOUBLE");
 
-static_assert(sizeof(VariantData) == 8, "slot size");
+static_assert(sizeof(ArduinoJson::detail::VariantSlot) == 16,
+              "sizeof(VariantSlot)");
 
 void setup() {}
 void loop() {}

extras/conf_test/x64.cpp

@@ -2,14 +2,14 @@
 
 static_assert(ARDUINOJSON_USE_LONG_LONG == 1, "ARDUINOJSON_USE_LONG_LONG");
 
-static_assert(ARDUINOJSON_SLOT_ID_SIZE == 4, "ARDUINOJSON_SLOT_ID_SIZE");
-
-static_assert(ARDUINOJSON_POOL_CAPACITY == 256, "ARDUINOJSON_POOL_CAPACITY");
+static_assert(ARDUINOJSON_SLOT_OFFSET_SIZE == 4,
+              "ARDUINOJSON_SLOT_OFFSET_SIZE");
 
 static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN");
 
 static_assert(ARDUINOJSON_USE_DOUBLE == 1, "ARDUINOJSON_USE_DOUBLE");
 
-static_assert(sizeof(ArduinoJson::detail::VariantData) == 16, "slot size");
+static_assert(sizeof(ArduinoJson::detail::VariantSlot) == 32,
+              "sizeof(VariantSlot)");
 
 int main() {}

extras/conf_test/x86.cpp

@@ -2,14 +2,14 @@
 
 static_assert(ARDUINOJSON_USE_LONG_LONG == 1, "ARDUINOJSON_USE_LONG_LONG");
 
-static_assert(ARDUINOJSON_SLOT_ID_SIZE == 2, "ARDUINOJSON_SLOT_ID_SIZE");
-
-static_assert(ARDUINOJSON_POOL_CAPACITY == 128, "ARDUINOJSON_POOL_CAPACITY");
+static_assert(ARDUINOJSON_SLOT_OFFSET_SIZE == 2,
+              "ARDUINOJSON_SLOT_OFFSET_SIZE");
 
 static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN");
 
 static_assert(ARDUINOJSON_USE_DOUBLE == 1, "ARDUINOJSON_USE_DOUBLE");
 
-static_assert(sizeof(ArduinoJson::detail::VariantData) == 8, "slot size");
+static_assert(sizeof(ArduinoJson::detail::VariantSlot) == 16,
+              "sizeof(VariantSlot)");
 
 int main() {}

extras/fuzzing/CMakeLists.txt

@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2025, Benoit BLANCHON
+# Copyright © 2014-2023, Benoit BLANCHON
 # MIT License
 
 set(CMAKE_CXX_STANDARD 11)
@@ -52,16 +52,7 @@ macro(add_fuzzer name)
 	)
 endmacro()
 
-# Needs Clang 6+ to compile
-if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 6)
-	if(DEFINED ENV{GITHUB_ACTIONS} AND CMAKE_CXX_COMPILER_VERSION MATCHES "^11\\.")
-		# Clang 11 fails on GitHub Actions with the following error:
-		# > ERROR: UndefinedBehaviorSanitizer failed to allocate 0x0 (0) bytes of SetAlternateSignalStack (error code: 22)
-		# > Sanitizer CHECK failed: /build/llvm-toolchain-11-mnvtwk/llvm-toolchain-11-11.1.0/compiler-rt/lib/sanitizer_common/sanitizer_common.cpp:54 ((0 && "unable to mmap")) != (0) (0, 0)
-		message(WARNING "Fuzzing is disabled on GitHub Actions to workaround a bug in Clang 11")
-		return()
-	endif()
-
+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6)
 	add_fuzzer(json)
 	add_fuzzer(msgpack)
 endif()

extras/fuzzing/json_fuzzer.cpp

@@ -1,7 +1,7 @@
 #include <ArduinoJson.h>
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
-  JsonDocument doc;
+  DynamicJsonDocument doc(4096);
   DeserializationError error = deserializeJson(doc, data, size);
   if (!error) {
     std::string json;

extras/fuzzing/msgpack_fuzzer.cpp

@@ -1,7 +1,7 @@
 #include <ArduinoJson.h>
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
-  JsonDocument doc;
+  DynamicJsonDocument doc(4096);
   DeserializationError error = deserializeMsgPack(doc, data, size);
   if (!error) {
     std::string json;

extras/fuzzing/reproducer.cpp

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 
 // This file is NOT use by Google's OSS fuzz

extras/scripts/build-arduino-package.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -eu
+
+INPUT=$1
+OUTPUT=$2
+
+cd "$INPUT"
+
+# remove existing file
+rm -f "$OUTPUT"
+
+# create zip
+7z a "$OUTPUT" \
+	-xr!.vs \
+	CHANGELOG.md \
+	examples \
+	src \
+	keywords.txt \
+	library.properties \
+	LICENSE.txt \
+	README.md \
+	ArduinoJson.h

extras/scripts/extract_changes.awk

@@ -1,29 +0,0 @@
-#!/usr/bin/awk -f
-
-# Start echoing after the first list item
-/\* / {
-    STARTED=1
-    EMPTY_LINE=0
-}
-
-# Remember if we have seen an empty line
-/^[[:space:]]*$/ {
-    EMPTY_LINE=1
-}
-
-# Exit when seeing a new version number
-/^v[[:digit:]]/ {
-    if (STARTED) exit
-}
-
-# Print if the line is not empty
-# and restore the empty line we have skipped
-!/^[[:space:]]*$/ {
-    if (STARTED) {
-        if (EMPTY_LINE) {
-            print ""
-            EMPTY_LINE=0
-        }
-        print
-    }
-}

extras/scripts/get-release-body.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -eu
+
+TAG="$1"
+CHANGELOG="$2"
+
+cat << END
+## Changes
+
+$(awk '/\* /{ FOUND=1 } /^[[:space:]]*$/ { if(FOUND) exit } { if(FOUND) print }' "$CHANGELOG")
+
+[View version history](https://github.com/bblanchon/ArduinoJson/blob/$TAG/CHANGELOG.md)
+END

extras/scripts/get-release-page.sh

@@ -8,11 +8,11 @@ ARDUINOJSON_H="$3"
 
 cat << END
 ---
-branch: v7
+branch: v6
 version: $VERSION
 date: '$(date +'%Y-%m-%d')'
 $(extras/scripts/wandbox/publish.sh "$ARDUINOJSON_H")
 ---
 
-$(extras/scripts/extract_changes.awk "$CHANGELOG")
+$(awk '/\* /{ FOUND=1; print; next } { if (FOUND) exit}' "$CHANGELOG")
 END

extras/scripts/publish-particle-library.sh

@@ -14,5 +14,5 @@ cp -r "$SOURCE_DIR/src" "$WORK_DIR/"
 cp -r "$SOURCE_DIR/examples" "$WORK_DIR/"
 
 cd "$WORK_DIR"
-particle library upload
-particle library publish
+particle library upload -v
+particle library publish -v

extras/scripts/publish.sh

@@ -2,7 +2,7 @@
 
 set -eu
 
-which awk sed jq curl perl >/dev/null
+which awk sed jq 7z curl perl >/dev/null
 
 cd "$(dirname "$0")/../.."
 
@@ -15,7 +15,6 @@ VERSION="$1"
 DATE=$(date +%F)
 TAG="v$VERSION"
 VERSION_REGEX='[0-9]+\.[0-9]+\.[0-9]+(-[a-z0-9]+)?'
-STARS=$(curl -s https://api.github.com/repos/bblanchon/ArduinoJson | jq '.stargazers_count')
 
 update_version_in_source () {
 	IFS=".-" read MAJOR MINOR REVISION EXTRA < <(echo "$VERSION")
@@ -30,25 +29,16 @@ update_version_in_source () {
 	sed -i~ -bE "s/(project\\s*\\(ArduinoJson\\s+VERSION\\s+).*?\\)/\\1$MAJOR.$MINOR.$REVISION)/" CMakeLists.txt
 	rm CMakeLists.txt~
 
-	sed -i~ -bE \
-		-e "s/\"version\":.*$/\"version\": \"$VERSION\",/" \
-		-e "s/[0-9]+ stars/$STARS stars/" \
-		library.json
+	sed -i~ -bE "s/\"version\":.*$/\"version\": \"$VERSION\",/" library.json
 	rm library.json~
 
-	sed -i~ -bE \
-		-e "s/version=.*$/version=$VERSION/" \
-		-e "s/[0-9]+ stars/$STARS stars/" \
-		library.properties
+	sed -i~ -bE "s/version=.*$/version=$VERSION/" library.properties
 	rm library.properties~
 
 	sed -i~ -bE "s/version: .*$/version: $VERSION.{build}/" appveyor.yml
 	rm appveyor.yml~
 
-	sed -i~ -bE \
-		-e "s/^version: .*$/version: \"$VERSION\"/" \
-		-e "s/[0-9]+ stars/$STARS stars/" \
-		idf_component.yml
+	sed -i~ -bE "s/^version: .*$/version: \"$VERSION\"/" idf_component.yml
 	rm idf_component.yml~
 
 	sed -i~ -bE \
@@ -80,6 +70,7 @@ commit_new_version
 add_tag
 push
 
+extras/scripts/build-arduino-package.sh . "../ArduinoJson-$TAG.zip"
 extras/scripts/build-single-header.sh "src/ArduinoJson.h" "../ArduinoJson-$TAG.h"
 extras/scripts/build-single-header.sh "src/ArduinoJson.hpp" "../ArduinoJson-$TAG.hpp"
 extras/scripts/get-release-page.sh "$VERSION" "CHANGELOG.md" "../ArduinoJson-$TAG.h" > "../ArduinoJson-$TAG.md"

extras/scripts/wandbox/JsonGeneratorExample.cpp

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to generate a JSON document with ArduinoJson.
@@ -9,18 +9,35 @@
 
 int main() {
   // Allocate the JSON document
-  JsonDocument doc;
+  //
+  // Inside the brackets, 200 is the RAM allocated to this document.
+  // Don't forget to change this value to match your requirement.
+  // Use https://arduinojson.org/v6/assistant to compute the capacity.
+  StaticJsonDocument<200> doc;
 
-  // Add values in the document.
+  // StaticJsonObject allocates memory on the stack, it can be
+  // replaced by DynamicJsonDocument which allocates in the heap.
+  //
+  // DynamicJsonDocument  doc(200);
+
+  // StaticJsonObject allocates memory on the stack, it can be
+  // replaced by DynamicJsonDocument which allocates in the heap.
+  //
+  // DynamicJsonDocument  doc(200);
+
+  // Add values in the document
+  //
   doc["sensor"] = "gps";
   doc["time"] = 1351824120;
 
-  // Add an array
-  JsonArray data = doc["data"].to<JsonArray>();
+  // Add an array.
+  //
+  JsonArray data = doc.createNestedArray("data");
   data.add(48.756080);
   data.add(2.302038);
 
   // Generate the minified JSON and send it to STDOUT
+  //
   serializeJson(doc, std::cout);
   // The above line prints:
   // {"sensor":"gps","time":1351824120,"data":[48.756080,2.302038]}
@@ -29,6 +46,7 @@ int main() {
   std::cout << std::endl;
 
   // Generate the prettified JSON and send it to STDOUT
+  //
   serializeJsonPretty(doc, std::cout);
   // The above line prints:
   // {

extras/scripts/wandbox/JsonParserExample.cpp

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to deserialize a JSON document with ArduinoJson.
@@ -9,22 +9,38 @@
 
 int main() {
   // Allocate the JSON document
-  JsonDocument doc;
+  //
+  // Inside the brackets, 200 is the capacity of the memory pool in bytes.
+  // Don't forget to change this value to match your JSON document.
+  // Use https://arduinojson.org/v6/assistant to compute the capacity.
+  StaticJsonDocument<300> doc;
 
-  // JSON input string
-  const char* json =
+  // StaticJsonDocument<N> allocates memory on the stack, it can be
+  // replaced by DynamicJsonDocument which allocates in the heap.
+  //
+  // DynamicJsonDocument doc(200);
+
+  // JSON input string.
+  //
+  // Using a char[], as shown here, enables the "zero-copy" mode. This mode uses
+  // the minimal amount of memory because the JsonDocument stores pointers to
+  // the input buffer.
+  // If you use another type of input, ArduinoJson must copy the strings from
+  // the input to the JsonDocument, so you need to increase the capacity of the
+  // JsonDocument.
+  char json[] =
       "{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}";
 
   // Deserialize the JSON document
   DeserializationError error = deserializeJson(doc, json);
 
-  // Test if parsing succeeds
+  // Test if parsing succeeds.
   if (error) {
     std::cerr << "deserializeJson() failed: " << error.c_str() << std::endl;
     return 1;
   }
 
-  // Fetch the values
+  // Fetch values.
   //
   // Most of the time, you can rely on the implicit casts.
   // In other case, you can do doc["time"].as<long>();
@@ -33,7 +49,7 @@ int main() {
   double latitude = doc["data"][0];
   double longitude = doc["data"][1];
 
-  // Print the values
+  // Print values.
   std::cout << sensor << std::endl;
   std::cout << time << std::endl;
   std::cout << latitude << std::endl;

extras/scripts/wandbox/MsgPackParserExample.cpp

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to generate a JSON document with ArduinoJson.
@@ -9,9 +9,22 @@
 
 int main() {
   // Allocate the JSON document
-  JsonDocument doc;
+  //
+  // Inside the brackets, 300 is the size of the memory pool in bytes.
+  // Don't forget to change this value to match your JSON document.
+  // Use https://arduinojson.org/assistant to compute the capacity.
+  StaticJsonDocument<300> doc;
 
-  // The MessagePack input string
+  // StaticJsonObject allocates memory on the stack, it can be
+  // replaced by DynamicJsonObject which allocates in the heap.
+  //
+  // DynamicJsonObject doc(200);
+
+  // MessagePack input string.
+  //
+  // It's better to use a char[] as shown here.
+  // If you use a const char* or a String, ArduinoJson will
+  // have to make a copy of the input in the JsonBuffer.
   uint8_t input[] = {131, 166, 115, 101, 110, 115, 111, 114, 163, 103, 112, 115,
                      164, 116, 105, 109, 101, 206, 80,  147, 50,  248, 164, 100,
                      97,  116, 97,  146, 203, 64,  72,  96,  199, 58,  188, 148,
@@ -23,16 +36,20 @@ int main() {
   //   "data": [48.75608, 2.302038]
   // }
 
-  // Parse the input
+  // doc of the object tree.
+  //
+  // It's a reference to the JsonObject, the actual bytes are inside the
+  // JsonBuffer with all the other nodes of the object tree.
+  // Memory is freed when jsonBuffer goes out of scope.
   DeserializationError error = deserializeMsgPack(doc, input);
 
-  // Test if parsing succeeds
+  // Test if parsing succeeds.
   if (error) {
     std::cerr << "deserializeMsgPack() failed: " << error.c_str() << std::endl;
     return 1;
   }
 
-  // Fetch the values
+  // Fetch values.
   //
   // Most of the time, you can rely on the implicit casts.
   // In other case, you can do doc["time"].as<long>();
@@ -41,7 +58,7 @@ int main() {
   double latitude = doc["data"][0];
   double longitude = doc["data"][1];
 
-  // Print the values
+  // Print values.
   std::cout << sensor << std::endl;
   std::cout << time << std::endl;
   std::cout << latitude << std::endl;

extras/scripts/wandbox/publish.sh

@@ -15,7 +15,7 @@ compile() {
   "code":$(read_string "$FILE_PATH"),
   "codes": [{"file":"ArduinoJson.h","code":$(read_string "$ARDUINOJSON_H")}],
   "options": "warning,c++11",
-  "compiler": "gcc-head",
+  "compiler": "gcc-5.5.0",
   "save": true
 }
 END

extras/tests/CMakeLists.txt

@@ -1,33 +1,26 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2025, Benoit BLANCHON
+# Copyright © 2014-2023, Benoit BLANCHON
 # MIT License
 
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-link_libraries(ArduinoJson)
-
-# Failing builds should only link with ArduinoJson, not catch
-add_subdirectory(FailingBuilds)
-
 add_subdirectory(catch)
-link_libraries(catch)
+
+link_libraries(ArduinoJson catch)
 
 include_directories(Helpers)
 add_subdirectory(Cpp17)
 add_subdirectory(Cpp20)
-add_subdirectory(Deprecated)
+add_subdirectory(FailingBuilds)
 add_subdirectory(IntegrationTests)
 add_subdirectory(JsonArray)
-add_subdirectory(JsonArrayConst)
 add_subdirectory(JsonDeserializer)
 add_subdirectory(JsonDocument)
 add_subdirectory(JsonObject)
-add_subdirectory(JsonObjectConst)
 add_subdirectory(JsonSerializer)
 add_subdirectory(JsonVariant)
-add_subdirectory(JsonVariantConst)
-add_subdirectory(ResourceManager)
+add_subdirectory(MemoryPool)
 add_subdirectory(Misc)
 add_subdirectory(MixedConfiguration)
 add_subdirectory(MsgPackDeserializer)

extras/tests/Cpp17/CMakeLists.txt

@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2025, Benoit BLANCHON
+# Copyright © 2014-2023, Benoit BLANCHON
 # MIT License
 
 if(MSVC_VERSION LESS 1910)

extras/tests/Cpp17/string_view.cpp

@@ -1,28 +1,14 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
-// MIT License
-
-// we expect ArduinoJson.h to include <string_view>
-// but we don't want it to included accidentally
-#undef ARDUINO
-#define ARDUINOJSON_ENABLE_STD_STREAM 0
-#define ARDUINOJSON_ENABLE_STD_STRING 0
-
 #include <ArduinoJson.h>
 #include <catch.hpp>
 
-#include "Allocators.hpp"
-#include "Literals.hpp"
+#include <string_view>
 
 #if !ARDUINOJSON_ENABLE_STRING_VIEW
 #  error ARDUINOJSON_ENABLE_STRING_VIEW must be set to 1
 #endif
 
-using ArduinoJson::detail::sizeofArray;
-
 TEST_CASE("string_view") {
-  SpyingAllocator spy;
-  JsonDocument doc(&spy);
+  StaticJsonDocument<256> doc;
   JsonVariant variant = doc.to<JsonVariant>();
 
   SECTION("deserializeJson()") {
@@ -33,7 +19,7 @@ TEST_CASE("string_view") {
 
   SECTION("JsonDocument::set()") {
     doc.set(std::string_view("123", 2));
-    REQUIRE(doc.as<std::string_view>() == "12");
+    REQUIRE(doc.as<std::string>() == "12");
   }
 
   SECTION("JsonDocument::operator[]() const") {
@@ -67,15 +53,16 @@ TEST_CASE("string_view") {
 
   SECTION("String deduplication") {
     doc.add(std::string_view("example one", 7));
-    doc.add(std::string_view("example two", 7));
-    doc.add(std::string_view("example\0tree", 12));
-    doc.add(std::string_view("example\0tree and a half", 12));
+    REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(1) + 8);
 
-    REQUIRE(spy.log() == AllocatorLog{
-                             Allocate(sizeofPool()),
-                             Allocate(sizeofString("example")),
-                             Allocate(sizeofString("example tree")),
-                         });
+    doc.add(std::string_view("example two", 7));
+    REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(2) + 8);
+
+    doc.add(std::string_view("example\0tree", 12));
+    REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(3) + 21);
+
+    doc.add(std::string_view("example\0tree and a half", 12));
+    REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(4) + 21);
   }
 
   SECTION("as<std::string_view>()") {
@@ -93,7 +80,7 @@ TEST_CASE("string_view") {
   }
 
   SECTION("String containing NUL") {
-    doc.set("hello\0world"_s);
+    doc.set(std::string("hello\0world", 11));
     REQUIRE(doc.as<std::string_view>().size() == 11);
     REQUIRE(doc.as<std::string_view>() == std::string_view("hello\0world", 11));
   }

extras/tests/Cpp20/CMakeLists.txt

@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2025, Benoit BLANCHON
+# Copyright © 2014-2023, Benoit BLANCHON
 # MIT License
 
 if(MSVC_VERSION LESS 1910)

extras/tests/Cpp20/smoke_test.cpp

@@ -4,7 +4,7 @@
 #include <string>
 
 TEST_CASE("C++20 smoke test") {
-  JsonDocument doc;
+  StaticJsonDocument<128> doc;
 
   deserializeJson(doc, "{\"hello\":\"world\"}");
   REQUIRE(doc["hello"] == "world");

extras/tests/Deprecated/BasicJsonDocument.cpp

@@ -1,69 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
-// MIT License
-
-#include <ArduinoJson.h>
-#include <catch.hpp>
-
-#include <string>
-
-using ArduinoJson::detail::is_base_of;
-
-static std::string allocatorLog;
-
-struct CustomAllocator {
-  CustomAllocator() {
-    allocatorLog = "";
-  }
-
-  void* allocate(size_t n) {
-    allocatorLog += "A";
-    return malloc(n);
-  }
-
-  void deallocate(void* p) {
-    free(p);
-    allocatorLog += "D";
-  }
-
-  void* reallocate(void* p, size_t n) {
-    allocatorLog += "R";
-    return realloc(p, n);
-  }
-};
-
-TEST_CASE("BasicJsonDocument") {
-  allocatorLog.clear();
-
-  SECTION("is a JsonDocument") {
-    REQUIRE(
-        is_base_of<JsonDocument, BasicJsonDocument<CustomAllocator>>::value ==
-        true);
-  }
-
-  SECTION("deserialize / serialize") {
-    BasicJsonDocument<CustomAllocator> doc(256);
-    deserializeJson(doc, "{\"hello\":\"world\"}");
-    REQUIRE(doc.as<std::string>() == "{\"hello\":\"world\"}");
-    doc.clear();
-    REQUIRE(allocatorLog == "AARARDDD");
-  }
-
-  SECTION("copy") {
-    BasicJsonDocument<CustomAllocator> doc(256);
-    doc["hello"] = "world";
-    auto copy = doc;
-    REQUIRE(copy.as<std::string>() == "{\"hello\":\"world\"}");
-    REQUIRE(allocatorLog == "AAAA");
-  }
-
-  SECTION("capacity") {
-    BasicJsonDocument<CustomAllocator> doc(256);
-    REQUIRE(doc.capacity() == 256);
-  }
-
-  SECTION("garbageCollect()") {
-    BasicJsonDocument<CustomAllocator> doc(256);
-    doc.garbageCollect();
-  }
-}

extras/tests/Deprecated/CMakeLists.txt

@@ -1,35 +0,0 @@
-# ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2025, Benoit BLANCHON
-# MIT License
-
-if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
-	add_compile_options(
-		-w
-	)
-endif()
-
-if(MSVC)
-	add_compile_options(
-		/wd4996
-	)
-endif()
-
-add_executable(DeprecatedTests
-	add.cpp
-	BasicJsonDocument.cpp
-	containsKey.cpp
-	createNestedArray.cpp
-	createNestedObject.cpp
-	DynamicJsonDocument.cpp
-	macros.cpp
-	memoryUsage.cpp
-	shallowCopy.cpp
-	StaticJsonDocument.cpp
-)
-
-add_test(Deprecated DeprecatedTests)
-
-set_tests_properties(Deprecated
-	PROPERTIES
-	LABELS "Catch"
-)

extras/tests/Deprecated/DynamicJsonDocument.cpp

@@ -1,37 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
-// MIT License
-
-#include <ArduinoJson.h>
-#include <catch.hpp>
-
-using ArduinoJson::detail::is_base_of;
-
-TEST_CASE("DynamicJsonDocument") {
-  SECTION("is a JsonDocument") {
-    REQUIRE(is_base_of<JsonDocument, DynamicJsonDocument>::value == true);
-  }
-
-  SECTION("deserialize / serialize") {
-    DynamicJsonDocument doc(256);
-    deserializeJson(doc, "{\"hello\":\"world\"}");
-    REQUIRE(doc.as<std::string>() == "{\"hello\":\"world\"}");
-  }
-
-  SECTION("copy") {
-    DynamicJsonDocument doc(256);
-    doc["hello"] = "world";
-    auto copy = doc;
-    REQUIRE(copy.as<std::string>() == "{\"hello\":\"world\"}");
-  }
-
-  SECTION("capacity") {
-    DynamicJsonDocument doc(256);
-    REQUIRE(doc.capacity() == 256);
-  }
-
-  SECTION("garbageCollect()") {
-    DynamicJsonDocument doc(256);
-    doc.garbageCollect();
-  }
-}

extras/tests/Deprecated/StaticJsonDocument.cpp

@@ -1,32 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
-// MIT License
-
-#include <ArduinoJson.h>
-#include <catch.hpp>
-
-using ArduinoJson::detail::is_base_of;
-
-TEST_CASE("StaticJsonDocument") {
-  SECTION("is a JsonDocument") {
-    REQUIRE(is_base_of<JsonDocument, StaticJsonDocument<256>>::value == true);
-  }
-
-  SECTION("deserialize / serialize") {
-    StaticJsonDocument<256> doc;
-    deserializeJson(doc, "{\"hello\":\"world\"}");
-    REQUIRE(doc.as<std::string>() == "{\"hello\":\"world\"}");
-  }
-
-  SECTION("copy") {
-    StaticJsonDocument<256> doc;
-    doc["hello"] = "world";
-    auto copy = doc;
-    REQUIRE(copy.as<std::string>() == "{\"hello\":\"world\"}");
-  }
-
-  SECTION("capacity") {
-    StaticJsonDocument<256> doc;
-    REQUIRE(doc.capacity() == 256);
-  }
-}

extras/tests/Deprecated/add.cpp

@@ -1,38 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
-// MIT License
-
-#include <ArduinoJson.h>
-#include <catch.hpp>
-
-TEST_CASE("JsonArray::add()") {
-  JsonDocument doc;
-  JsonArray array = doc.to<JsonArray>();
-  array.add().set(42);
-  REQUIRE(doc.as<std::string>() == "[42]");
-}
-
-TEST_CASE("JsonDocument::add()") {
-  JsonDocument doc;
-  doc.add().set(42);
-  REQUIRE(doc.as<std::string>() == "[42]");
-}
-
-TEST_CASE("ElementProxy::add()") {
-  JsonDocument doc;
-  doc[0].add().set(42);
-  REQUIRE(doc.as<std::string>() == "[[42]]");
-}
-
-TEST_CASE("MemberProxy::add()") {
-  JsonDocument doc;
-  doc["x"].add().set(42);
-  REQUIRE(doc.as<std::string>() == "{\"x\":[42]}");
-}
-
-TEST_CASE("JsonVariant::add()") {
-  JsonDocument doc;
-  JsonVariant v = doc.add();
-  v.add().set(42);
-  REQUIRE(doc.as<std::string>() == "[[42]]");
-}

extras/tests/Deprecated/containsKey.cpp

@@ -1,246 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
-// MIT License
-
-#include <ArduinoJson.h>
-#include <catch.hpp>
-
-#include "Literals.hpp"
-
-TEST_CASE("JsonDocument::containsKey()") {
-  JsonDocument doc;
-
-  SECTION("returns true on object") {
-    doc["hello"] = "world";
-
-    REQUIRE(doc.containsKey("hello") == true);
-  }
-
-  SECTION("returns true when value is null") {
-    doc["hello"] = static_cast<const char*>(0);
-
-    REQUIRE(doc.containsKey("hello") == true);
-  }
-
-  SECTION("returns true when key is a std::string") {
-    doc["hello"] = "world";
-
-    REQUIRE(doc.containsKey("hello"_s) == true);
-  }
-
-  SECTION("returns false  on object") {
-    doc["world"] = "hello";
-
-    REQUIRE(doc.containsKey("hello") == false);
-  }
-
-  SECTION("returns false on array") {
-    doc.add("hello");
-
-    REQUIRE(doc.containsKey("hello") == false);
-  }
-
-  SECTION("returns false on null") {
-    REQUIRE(doc.containsKey("hello") == false);
-  }
-
-  SECTION("supports JsonVariant") {
-    doc["hello"] = "world";
-    doc["key"] = "hello";
-
-    REQUIRE(doc.containsKey(doc["key"]) == true);
-    REQUIRE(doc.containsKey(doc["foo"]) == false);
-  }
-
-#ifdef HAS_VARIABLE_LENGTH_ARRAY
-  SECTION("supports VLAs") {
-    size_t i = 16;
-    char vla[i];
-    strcpy(vla, "hello");
-
-    doc["hello"] = "world";
-
-    REQUIRE(doc.containsKey(vla) == true);
-  }
-#endif
-}
-
-TEST_CASE("MemberProxy::containsKey()") {
-  JsonDocument doc;
-  const auto& mp = doc["hello"];
-
-  SECTION("containsKey(const char*)") {
-    mp["key"] = "value";
-
-    REQUIRE(mp.containsKey("key") == true);
-    REQUIRE(mp.containsKey("key") == true);
-  }
-
-  SECTION("containsKey(std::string)") {
-    mp["key"] = "value";
-
-    REQUIRE(mp.containsKey("key"_s) == true);
-    REQUIRE(mp.containsKey("key"_s) == true);
-  }
-
-#ifdef HAS_VARIABLE_LENGTH_ARRAY
-  SECTION("supports VLAs") {
-    size_t i = 16;
-    char vla[i];
-    strcpy(vla, "hello");
-
-    mp["hello"] = "world";
-
-    REQUIRE(mp.containsKey(vla) == true);
-  }
-#endif
-}
-
-TEST_CASE("JsonObject::containsKey()") {
-  JsonDocument doc;
-  JsonObject obj = doc.to<JsonObject>();
-  obj["hello"] = 42;
-
-  SECTION("returns true only if key is present") {
-    REQUIRE(false == obj.containsKey("world"));
-    REQUIRE(true == obj.containsKey("hello"));
-  }
-
-  SECTION("returns false after remove()") {
-    obj.remove("hello");
-
-    REQUIRE(false == obj.containsKey("hello"));
-  }
-
-#ifdef HAS_VARIABLE_LENGTH_ARRAY
-  SECTION("key is a VLA") {
-    size_t i = 16;
-    char vla[i];
-    strcpy(vla, "hello");
-
-    REQUIRE(true == obj.containsKey(vla));
-  }
-#endif
-
-  SECTION("key is a JsonVariant") {
-    doc["key"] = "hello";
-    REQUIRE(true == obj.containsKey(obj["key"]));
-    REQUIRE(false == obj.containsKey(obj["hello"]));
-  }
-
-  SECTION("std::string") {
-    REQUIRE(true == obj.containsKey("hello"_s));
-  }
-
-  SECTION("unsigned char[]") {
-    unsigned char key[] = "hello";
-    REQUIRE(true == obj.containsKey(key));
-  }
-}
-
-TEST_CASE("JsonObjectConst::containsKey()") {
-  JsonDocument doc;
-  doc["hello"] = 42;
-  auto obj = doc.as<JsonObjectConst>();
-
-  SECTION("supports const char*") {
-    REQUIRE(false == obj.containsKey("world"));
-    REQUIRE(true == obj.containsKey("hello"));
-  }
-
-  SECTION("supports std::string") {
-    REQUIRE(false == obj.containsKey("world"_s));
-    REQUIRE(true == obj.containsKey("hello"_s));
-  }
-
-#ifdef HAS_VARIABLE_LENGTH_ARRAY
-  SECTION("supports VLA") {
-    size_t i = 16;
-    char vla[i];
-    strcpy(vla, "hello");
-
-    REQUIRE(true == obj.containsKey(vla));
-  }
-#endif
-
-  SECTION("supports JsonVariant") {
-    doc["key"] = "hello";
-    REQUIRE(true == obj.containsKey(obj["key"]));
-    REQUIRE(false == obj.containsKey(obj["hello"]));
-  }
-}
-
-TEST_CASE("JsonVariant::containsKey()") {
-  JsonDocument doc;
-  JsonVariant var = doc.to<JsonVariant>();
-
-  SECTION("returns false is unbound") {
-    CHECK_FALSE(JsonVariant().containsKey("hello"));
-  }
-
-  SECTION("containsKey(const char*)") {
-    var["hello"] = "world";
-
-    REQUIRE(var.containsKey("hello") == true);
-    REQUIRE(var.containsKey("world") == false);
-  }
-
-  SECTION("containsKey(std::string)") {
-    var["hello"] = "world";
-
-    REQUIRE(var.containsKey("hello"_s) == true);
-    REQUIRE(var.containsKey("world"_s) == false);
-  }
-
-  SECTION("containsKey(JsonVariant)") {
-    var["hello"] = "world";
-    var["key"] = "hello";
-
-    REQUIRE(var.containsKey(doc["key"]) == true);
-    REQUIRE(var.containsKey(doc["foo"]) == false);
-  }
-
-#ifdef HAS_VARIABLE_LENGTH_ARRAY
-  SECTION("supports VLAs") {
-    size_t i = 16;
-    char vla[i];
-    strcpy(vla, "hello");
-
-    var["hello"] = "world";
-
-    REQUIRE(var.containsKey(vla) == true);
-  }
-#endif
-}
-
-TEST_CASE("JsonVariantConst::containsKey()") {
-  JsonDocument doc;
-  doc["hello"] = "world";
-  JsonVariantConst var = doc.as<JsonVariant>();
-
-  SECTION("support const char*") {
-    REQUIRE(var.containsKey("hello") == true);
-    REQUIRE(var.containsKey("world") == false);
-  }
-
-  SECTION("support std::string") {
-    REQUIRE(var.containsKey("hello"_s) == true);
-    REQUIRE(var.containsKey("world"_s) == false);
-  }
-
-#ifdef HAS_VARIABLE_LENGTH_ARRAY
-  SECTION("supports VLA") {
-    size_t i = 16;
-    char vla[i];
-    strcpy(vla, "hello");
-
-    REQUIRE(true == var.containsKey(vla));
-  }
-#endif
-
-  SECTION("support JsonVariant") {
-    doc["key"] = "hello";
-    REQUIRE(var.containsKey(var["key"]) == true);
-    REQUIRE(var.containsKey(var["foo"]) == false);
-  }
-}

extras/tests/Deprecated/createNestedArray.cpp

@@ -1,113 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
-// MIT License
-
-#include <ArduinoJson.h>
-#include <catch.hpp>
-
-#include <string>
-
-#include "Literals.hpp"
-
-TEST_CASE("JsonDocument::createNestedArray()") {
-  JsonDocument doc;
-
-  SECTION("createNestedArray()") {
-    JsonArray array = doc.createNestedArray();
-    array.add(42);
-    REQUIRE(doc.as<std::string>() == "[[42]]");
-  }
-
-  SECTION("createNestedArray(const char*)") {
-    JsonArray array = doc.createNestedArray("key");
-    array.add(42);
-    REQUIRE(doc.as<std::string>() == "{\"key\":[42]}");
-  }
-
-  SECTION("createNestedArray(std::string)") {
-    JsonArray array = doc.createNestedArray("key"_s);
-    array.add(42);
-    REQUIRE(doc.as<std::string>() == "{\"key\":[42]}");
-  }
-
-#ifdef HAS_VARIABLE_LENGTH_ARRAY
-  SECTION("createNestedArray(VLA)") {
-    size_t i = 16;
-    char vla[i];
-    strcpy(vla, "key");
-    JsonArray array = doc.createNestedArray(vla);
-    array.add(42);
-    REQUIRE(doc.as<std::string>() == "{\"key\":[42]}");
-  }
-#endif
-}
-
-TEST_CASE("JsonArray::createNestedArray()") {
-  JsonDocument doc;
-  JsonArray array = doc.to<JsonArray>();
-  JsonArray nestedArray = array.createNestedArray();
-  nestedArray.add(42);
-  REQUIRE(doc.as<std::string>() == "[[42]]");
-}
-
-TEST_CASE("JsonObject::createNestedArray()") {
-  JsonDocument doc;
-  JsonObject object = doc.to<JsonObject>();
-
-  SECTION("createNestedArray(const char*)") {
-    JsonArray array = object.createNestedArray("key");
-    array.add(42);
-    REQUIRE(doc.as<std::string>() == "{\"key\":[42]}");
-  }
-
-  SECTION("createNestedArray(std::string)") {
-    JsonArray array = object.createNestedArray("key"_s);
-    array.add(42);
-    REQUIRE(doc.as<std::string>() == "{\"key\":[42]}");
-  }
-
-#ifdef HAS_VARIABLE_LENGTH_ARRAY
-  SECTION("createNestedArray(VLA)") {
-    size_t i = 16;
-    char vla[i];
-    strcpy(vla, "key");
-    JsonArray array = object.createNestedArray(vla);
-    array.add(42);
-    REQUIRE(doc.as<std::string>() == "{\"key\":[42]}");
-  }
-#endif
-}
-
-TEST_CASE("JsonVariant::createNestedArray()") {
-  JsonDocument doc;
-  JsonVariant variant = doc.to<JsonVariant>();
-
-  SECTION("createNestedArray()") {
-    JsonArray array = variant.createNestedArray();
-    array.add(42);
-    REQUIRE(doc.as<std::string>() == "[[42]]");
-  }
-
-  SECTION("createNestedArray(const char*)") {
-    JsonArray array = variant.createNestedArray("key");
-    array.add(42);
-    REQUIRE(doc.as<std::string>() == "{\"key\":[42]}");
-  }
-
-  SECTION("createNestedArray(std::string)") {
-    JsonArray array = variant.createNestedArray("key"_s);
-    array.add(42);
-    REQUIRE(doc.as<std::string>() == "{\"key\":[42]}");
-  }
-
-#ifdef HAS_VARIABLE_LENGTH_ARRAY
-  SECTION("createNestedArray(VLA)") {
-    size_t i = 16;
-    char vla[i];
-    strcpy(vla, "key");
-    JsonArray array = variant.createNestedArray(vla);
-    array.add(42);
-    REQUIRE(doc.as<std::string>() == "{\"key\":[42]}");
-  }
-#endif
-}

extras/tests/Deprecated/createNestedObject.cpp

@@ -1,113 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
-// MIT License
-
-#include <ArduinoJson.h>
-#include <catch.hpp>
-
-#include <string>
-
-#include "Literals.hpp"
-
-TEST_CASE("JsonDocument::createNestedObject()") {
-  JsonDocument doc;
-
-  SECTION("createNestedObject()") {
-    JsonObject object = doc.createNestedObject();
-    object["hello"] = "world";
-    REQUIRE(doc.as<std::string>() == "[{\"hello\":\"world\"}]");
-  }
-
-  SECTION("createNestedObject(const char*)") {
-    JsonObject object = doc.createNestedObject("key");
-    object["hello"] = "world";
-    REQUIRE(doc.as<std::string>() == "{\"key\":{\"hello\":\"world\"}}");
-  }
-
-  SECTION("createNestedObject(std::string)") {
-    JsonObject object = doc.createNestedObject("key"_s);
-    object["hello"] = "world";
-    REQUIRE(doc.as<std::string>() == "{\"key\":{\"hello\":\"world\"}}");
-  }
-
-#ifdef HAS_VARIABLE_LENGTH_ARRAY
-  SECTION("createNestedObject(VLA)") {
-    size_t i = 16;
-    char vla[i];
-    strcpy(vla, "key");
-    JsonObject object = doc.createNestedObject(vla);
-    object["hello"] = "world";
-    REQUIRE(doc.as<std::string>() == "{\"key\":{\"hello\":\"world\"}}");
-  }
-#endif
-}
-
-TEST_CASE("JsonArray::createNestedObject()") {
-  JsonDocument doc;
-  JsonArray array = doc.to<JsonArray>();
-  JsonObject object = array.createNestedObject();
-  object["hello"] = "world";
-  REQUIRE(doc.as<std::string>() == "[{\"hello\":\"world\"}]");
-}
-
-TEST_CASE("JsonObject::createNestedObject()") {
-  JsonDocument doc;
-  JsonObject object = doc.to<JsonObject>();
-
-  SECTION("createNestedObject(const char*)") {
-    JsonObject nestedObject = object.createNestedObject("key");
-    nestedObject["hello"] = "world";
-    REQUIRE(doc.as<std::string>() == "{\"key\":{\"hello\":\"world\"}}");
-  }
-
-  SECTION("createNestedObject(std::string)") {
-    JsonObject nestedObject = object.createNestedObject("key"_s);
-    nestedObject["hello"] = "world";
-    REQUIRE(doc.as<std::string>() == "{\"key\":{\"hello\":\"world\"}}");
-  }
-
-#ifdef HAS_VARIABLE_LENGTH_ARRAY
-  SECTION("createNestedObject(VLA)") {
-    size_t i = 16;
-    char vla[i];
-    strcpy(vla, "key");
-    JsonObject nestedObject = object.createNestedObject(vla);
-    nestedObject["hello"] = "world";
-    REQUIRE(doc.as<std::string>() == "{\"key\":{\"hello\":\"world\"}}");
-  }
-#endif
-}
-
-TEST_CASE("JsonVariant::createNestedObject()") {
-  JsonDocument doc;
-  JsonVariant variant = doc.to<JsonVariant>();
-
-  SECTION("createNestedObject()") {
-    JsonObject object = variant.createNestedObject();
-    object["hello"] = "world";
-    REQUIRE(doc.as<std::string>() == "[{\"hello\":\"world\"}]");
-  }
-
-  SECTION("createNestedObject(const char*)") {
-    JsonObject object = variant.createNestedObject("key");
-    object["hello"] = "world";
-    REQUIRE(doc.as<std::string>() == "{\"key\":{\"hello\":\"world\"}}");
-  }
-
-  SECTION("createNestedObject(std::string)") {
-    JsonObject object = variant.createNestedObject("key"_s);
-    object["hello"] = "world";
-    REQUIRE(doc.as<std::string>() == "{\"key\":{\"hello\":\"world\"}}");
-  }
-
-#ifdef HAS_VARIABLE_LENGTH_ARRAY
-  SECTION("createNestedObject(VLA)") {
-    size_t i = 16;
-    char vla[i];
-    strcpy(vla, "key");
-    JsonObject object = variant.createNestedObject(vla);
-    object["hello"] = "world";
-    REQUIRE(doc.as<std::string>() == "{\"key\":{\"hello\":\"world\"}}");
-  }
-#endif
-}

extras/tests/Deprecated/macros.cpp

@@ -1,18 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
-// MIT License
-
-#include <ArduinoJson.h>
-#include <catch.hpp>
-
-TEST_CASE("JSON_ARRAY_SIZE") {
-  REQUIRE(JSON_ARRAY_SIZE(10) == ArduinoJson::detail::sizeofArray(10));
-}
-
-TEST_CASE("JSON_OBJECT_SIZE") {
-  REQUIRE(JSON_OBJECT_SIZE(10) == ArduinoJson::detail::sizeofObject(10));
-}
-
-TEST_CASE("JSON_STRING_SIZE") {
-  REQUIRE(JSON_STRING_SIZE(10) == 11);  // issue #2054
-}

extras/tests/Deprecated/memoryUsage.cpp

@@ -1,51 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
-// MIT License
-
-#include <ArduinoJson.h>
-#include <catch.hpp>
-
-TEST_CASE("JsonArray::memoryUsage()") {
-  JsonArray array;
-  REQUIRE(array.memoryUsage() == 0);
-}
-
-TEST_CASE("JsonArrayConst::memoryUsage()") {
-  JsonArrayConst array;
-  REQUIRE(array.memoryUsage() == 0);
-}
-
-TEST_CASE("JsonDocument::memoryUsage()") {
-  JsonDocument doc;
-  REQUIRE(doc.memoryUsage() == 0);
-}
-
-TEST_CASE("JsonObject::memoryUsage()") {
-  JsonObject array;
-  REQUIRE(array.memoryUsage() == 0);
-}
-
-TEST_CASE("JsonObjectConst::memoryUsage()") {
-  JsonObjectConst array;
-  REQUIRE(array.memoryUsage() == 0);
-}
-
-TEST_CASE("JsonVariant::memoryUsage()") {
-  JsonVariant doc;
-  REQUIRE(doc.memoryUsage() == 0);
-}
-
-TEST_CASE("JsonVariantConst::memoryUsage()") {
-  JsonVariantConst doc;
-  REQUIRE(doc.memoryUsage() == 0);
-}
-
-TEST_CASE("ElementProxy::memoryUsage()") {
-  JsonDocument doc;
-  REQUIRE(doc[0].memoryUsage() == 0);
-}
-
-TEST_CASE("MemberProxy::memoryUsage()") {
-  JsonDocument doc;
-  REQUIRE(doc["hello"].memoryUsage() == 0);
-}

extras/tests/Deprecated/shallowCopy.cpp

@@ -1,14 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
-// MIT License
-
-#include <ArduinoJson.h>
-#include <catch.hpp>
-
-TEST_CASE("shallowCopy()") {
-  JsonDocument doc1, doc2;
-  doc1["b"] = "c";
-  doc2["a"].shallowCopy(doc1);
-
-  REQUIRE(doc2.as<std::string>() == "{\"a\":{\"b\":\"c\"}}");
-}

extras/tests/FailingBuilds/CMakeLists.txt

@@ -1,12 +1,8 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2025, Benoit BLANCHON
+# Copyright © 2014-2023, Benoit BLANCHON
 # MIT License
 
-macro(add_failing_build source_file)
-	get_filename_component(target ${source_file} NAME_WE)
-
-	add_executable(${target} ${source_file})
-
+macro(build_should_fail target)
 	set_target_properties(${target}
 		PROPERTIES
 			EXCLUDE_FROM_ALL TRUE
@@ -20,13 +16,27 @@ macro(add_failing_build source_file)
 	set_tests_properties(${target}
 		PROPERTIES
 			WILL_FAIL TRUE
-			LABELS "WillFail"
+			LABELS "WillFail;Catch"
 	)
 endmacro()
 
-add_failing_build(Issue978.cpp)
-add_failing_build(read_long_long.cpp)
-add_failing_build(write_long_long.cpp)
-add_failing_build(variant_as_char.cpp)
-add_failing_build(assign_char.cpp)
-add_failing_build(deserialize_object.cpp)
+add_executable(Issue978 Issue978.cpp)
+build_should_fail(Issue978)
+
+add_executable(Issue1189 Issue1189.cpp)
+build_should_fail(Issue1189)
+
+add_executable(read_long_long read_long_long.cpp)
+build_should_fail(read_long_long)
+
+add_executable(write_long_long write_long_long.cpp)
+build_should_fail(write_long_long)
+
+add_executable(delete_jsondocument delete_jsondocument.cpp)
+build_should_fail(delete_jsondocument)
+
+add_executable(variant_as_char variant_as_char.cpp)
+build_should_fail(variant_as_char)
+
+add_executable(assign_char assign_char.cpp)
+build_should_fail(assign_char)

extras/tests/FailingBuilds/Issue1189.cpp

@@ -0,0 +1,13 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2023, Benoit BLANCHON
+// MIT License
+
+#include <ArduinoJson.h>
+
+// a function should not be able to get a JsonDocument by value
+void f(JsonDocument) {}
+
+int main() {
+  DynamicJsonDocument doc(1024);
+  f(doc);
+}

extras/tests/FailingBuilds/Issue978.cpp

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
@@ -8,6 +8,6 @@ struct Stream {};
 
 int main() {
   Stream* stream = 0;
-  JsonDocument doc;
+  DynamicJsonDocument doc(1024);
   deserializeJson(doc, stream);
 }

extras/tests/FailingBuilds/assign_char.cpp

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
@@ -7,6 +7,6 @@
 // See issue #1498
 
 int main() {
-  JsonDocument doc;
+  DynamicJsonDocument doc(1024);
   doc["dummy"] = 'A';
 }

extras/tests/FailingBuilds/delete_jsondocument.cpp

@@ -0,0 +1,12 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2023, Benoit BLANCHON
+// MIT License
+
+#include <ArduinoJson.h>
+
+struct Stream {};
+
+int main() {
+  JsonDocument* doc = new DynamicJsonDocument(42);
+  delete doc;
+}

extras/tests/FailingBuilds/deserialize_object.cpp

@@ -1,12 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
-// MIT License
-
-#include <ArduinoJson.h>
-
-// See issue #2135
-
-int main() {
-  JsonObject obj;
-  deserializeJson(obj, "");
-}

extras/tests/FailingBuilds/read_long_long.cpp

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 
 #define ARDUINOJSON_USE_LONG_LONG 0
@@ -11,6 +11,6 @@
 
 ARDUINOJSON_ASSERT_INTEGER_TYPE_IS_SUPPORTED(long long)
 int main() {
-  JsonDocument doc;
+  DynamicJsonDocument doc(1024);
   doc["dummy"].as<long long>();
 }

extras/tests/FailingBuilds/variant_as_char.cpp

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
@@ -7,6 +7,6 @@
 // See issue #1498
 
 int main() {
-  JsonDocument doc;
+  DynamicJsonDocument doc(1024);
   doc["dummy"].as<char>();
 }

extras/tests/FailingBuilds/write_long_long.cpp

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 
 #define ARDUINOJSON_USE_LONG_LONG 0
@@ -10,6 +10,6 @@
 #endif
 
 int main() {
-  JsonDocument doc;
+  DynamicJsonDocument doc(1024);
   doc["dummy"] = static_cast<long long>(42);
 }

extras/tests/Helpers/Allocators.hpp

@@ -1,294 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
-// MIT License
-
-#pragma once
-
-#include <ArduinoJson/Memory/Allocator.hpp>
-#include <ArduinoJson/Memory/MemoryPool.hpp>
-#include <ArduinoJson/Memory/StringBuilder.hpp>
-
-#include <sstream>
-
-namespace {
-
-struct FailingAllocator : ArduinoJson::Allocator {
-  static FailingAllocator* instance() {
-    static FailingAllocator allocator;
-    return &allocator;
-  }
-
- private:
-  FailingAllocator() = default;
-  ~FailingAllocator() = default;
-
-  void* allocate(size_t) override {
-    return nullptr;
-  }
-
-  void deallocate(void*) override {}
-
-  void* reallocate(void*, size_t) override {
-    return nullptr;
-  }
-};
-
-class AllocatorLogEntry {
- public:
-  AllocatorLogEntry(std::string s, size_t n = 1) : str_(s), count_(n) {}
-
-  const std::string& str() const {
-    return str_;
-  }
-
-  size_t count() const {
-    return count_;
-  }
-
-  AllocatorLogEntry operator*(size_t n) const {
-    return AllocatorLogEntry(str_, n);
-  }
-
- private:
-  std::string str_;
-  size_t count_;
-};
-
-inline AllocatorLogEntry Allocate(size_t s) {
-  char buffer[32];
-  snprintf(buffer, sizeof(buffer), "allocate(%zu)", s);
-  return AllocatorLogEntry(buffer);
-}
-
-inline AllocatorLogEntry AllocateFail(size_t s) {
-  char buffer[32];
-  snprintf(buffer, sizeof(buffer), "allocate(%zu) -> nullptr", s);
-  return AllocatorLogEntry(buffer);
-}
-
-inline AllocatorLogEntry Reallocate(size_t s1, size_t s2) {
-  char buffer[32];
-  snprintf(buffer, sizeof(buffer), "reallocate(%zu, %zu)", s1, s2);
-  return AllocatorLogEntry(buffer);
-}
-
-inline AllocatorLogEntry ReallocateFail(size_t s1, size_t s2) {
-  char buffer[32];
-  snprintf(buffer, sizeof(buffer), "reallocate(%zu, %zu) -> nullptr", s1, s2);
-  return AllocatorLogEntry(buffer);
-}
-
-inline AllocatorLogEntry Deallocate(size_t s) {
-  char buffer[32];
-  snprintf(buffer, sizeof(buffer), "deallocate(%zu)", s);
-  return AllocatorLogEntry(buffer);
-}
-
-class AllocatorLog {
- public:
-  AllocatorLog() = default;
-  AllocatorLog(std::initializer_list<AllocatorLogEntry> list) {
-    for (auto& entry : list)
-      append(entry);
-  }
-
-  void clear() {
-    log_.str("");
-  }
-
-  void append(const AllocatorLogEntry& entry) {
-    for (size_t i = 0; i < entry.count(); i++)
-      log_ << entry.str() << "\n";
-  }
-
-  std::string str() const {
-    auto s = log_.str();
-    if (s.empty())
-      return "(empty)";
-    s.pop_back();  // remove the trailing '\n'
-    return s;
-  }
-
-  bool operator==(const AllocatorLog& other) const {
-    return str() == other.str();
-  }
-
-  friend std::ostream& operator<<(std::ostream& os, const AllocatorLog& log) {
-    os << log.str();
-    return os;
-  }
-
- private:
-  std::ostringstream log_;
-};
-
-class SpyingAllocator : public ArduinoJson::Allocator {
- public:
-  SpyingAllocator(
-      Allocator* upstream = ArduinoJson::detail::DefaultAllocator::instance())
-      : upstream_(upstream) {}
-  virtual ~SpyingAllocator() {}
-
-  size_t allocatedBytes() const {
-    return allocatedBytes_;
-  }
-
-  void* allocate(size_t n) override {
-    auto block = reinterpret_cast<AllocatedBlock*>(
-        upstream_->allocate(sizeof(AllocatedBlock) + n - 1));
-    if (block) {
-      log_.append(Allocate(n));
-      allocatedBytes_ += n;
-      block->size = n;
-      return block->payload;
-    } else {
-      log_.append(AllocateFail(n));
-      return nullptr;
-    }
-  }
-
-  void deallocate(void* p) override {
-    auto block = AllocatedBlock::fromPayload(p);
-    allocatedBytes_ -= block->size;
-    log_.append(Deallocate(block ? block->size : 0));
-    upstream_->deallocate(block);
-  }
-
-  void* reallocate(void* p, size_t n) override {
-    auto block = AllocatedBlock::fromPayload(p);
-    auto oldSize = block ? block->size : 0;
-    block = reinterpret_cast<AllocatedBlock*>(
-        upstream_->reallocate(block, sizeof(AllocatedBlock) + n - 1));
-    if (block) {
-      log_.append(Reallocate(oldSize, n));
-      block->size = n;
-      allocatedBytes_ += n - oldSize;
-      return block->payload;
-    } else {
-      log_.append(ReallocateFail(oldSize, n));
-      return nullptr;
-    }
-  }
-
-  void clearLog() {
-    log_.clear();
-  }
-
-  const AllocatorLog& log() const {
-    return log_;
-  }
-
- private:
-  struct AllocatedBlock {
-    size_t size;
-    char payload[1];
-
-    static AllocatedBlock* fromPayload(void* p) {
-      if (!p)
-        return nullptr;
-      return reinterpret_cast<AllocatedBlock*>(
-          // Cast to void* to silence "cast increases required alignment of
-          // target type [-Werror=cast-align]"
-          reinterpret_cast<void*>(reinterpret_cast<char*>(p) -
-                                  offsetof(AllocatedBlock, payload)));
-    }
-  };
-
-  AllocatorLog log_;
-  Allocator* upstream_;
-  size_t allocatedBytes_ = 0;
-};
-
-class KillswitchAllocator : public ArduinoJson::Allocator {
- public:
-  KillswitchAllocator(
-      Allocator* upstream = ArduinoJson::detail::DefaultAllocator::instance())
-      : working_(true), upstream_(upstream) {}
-  virtual ~KillswitchAllocator() {}
-
-  void* allocate(size_t n) override {
-    return working_ ? upstream_->allocate(n) : 0;
-  }
-
-  void deallocate(void* p) override {
-    upstream_->deallocate(p);
-  }
-
-  void* reallocate(void* ptr, size_t n) override {
-    return working_ ? upstream_->reallocate(ptr, n) : 0;
-  }
-
-  // Turn the killswitch on, so all allocation fail
-  void on() {
-    working_ = false;
-  }
-
- private:
-  bool working_;
-  Allocator* upstream_;
-};
-
-class TimebombAllocator : public ArduinoJson::Allocator {
- public:
-  TimebombAllocator(
-      size_t initialCountdown,
-      Allocator* upstream = ArduinoJson::detail::DefaultAllocator::instance())
-      : countdown_(initialCountdown), upstream_(upstream) {}
-  virtual ~TimebombAllocator() {}
-
-  void* allocate(size_t n) override {
-    if (!countdown_)
-      return nullptr;
-    countdown_--;
-    return upstream_->allocate(n);
-  }
-
-  void deallocate(void* p) override {
-    upstream_->deallocate(p);
-  }
-
-  void* reallocate(void* ptr, size_t n) override {
-    if (!countdown_)
-      return nullptr;
-    countdown_--;
-    return upstream_->reallocate(ptr, n);
-  }
-
-  void setCountdown(size_t value) {
-    countdown_ = value;
-  }
-
- private:
-  size_t countdown_ = 0;
-  Allocator* upstream_;
-};
-}  // namespace
-
-inline size_t sizeofPoolList(size_t n = ARDUINOJSON_INITIAL_POOL_COUNT) {
-  using namespace ArduinoJson::detail;
-  return sizeof(MemoryPool<VariantData>) * n;
-}
-
-template <typename T = ArduinoJson::detail::VariantData>
-inline size_t sizeofPool(
-    ArduinoJson::detail::SlotCount n = ARDUINOJSON_POOL_CAPACITY) {
-  return ArduinoJson::detail::MemoryPool<T>::slotsToBytes(n);
-}
-
-inline size_t sizeofStaticStringPool(
-    ArduinoJson::detail::SlotCount n = ARDUINOJSON_POOL_CAPACITY) {
-  using namespace ArduinoJson::detail;
-  return MemoryPool<const char*>::slotsToBytes(n);
-}
-
-inline size_t sizeofStringBuffer(size_t iteration = 1) {
-  // returns 31, 63, 127, 255, etc.
-  auto capacity = ArduinoJson::detail::StringBuilder::initialCapacity;
-  for (size_t i = 1; i < iteration; i++)
-    capacity = capacity * 2 + 1;
-  return ArduinoJson::detail::sizeofString(capacity);
-}
-
-inline size_t sizeofString(const char* s) {
-  return ArduinoJson::detail::sizeofString(strlen(s));
-}

extras/tests/Helpers/Arduino.h

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 
 #pragma once

extras/tests/Helpers/CustomReader.hpp

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 
 #pragma once

extras/tests/Helpers/Literals.hpp

@@ -1,12 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
-// MIT License
-
-#pragma once
-
-#include <string>
-
-// the space before _s is required by GCC 4.8
-inline std::string operator"" _s(const char* str, size_t len) {
-  return std::string(str, len);
-}

extras/tests/Helpers/api/Print.h

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -13,21 +13,21 @@ class Print {
   virtual ~Print() {}
 
   virtual size_t write(uint8_t) = 0;
-  virtual size_t write(const uint8_t* buffer, size_t size) = 0;
+  virtual size_t write(const uint8_t *buffer, size_t size) = 0;
 
-  size_t write(const char* str) {
+  size_t write(const char *str) {
     if (!str)
       return 0;
-    return write(reinterpret_cast<const uint8_t*>(str), strlen(str));
+    return write(reinterpret_cast<const uint8_t *>(str), strlen(str));
   }
 
-  size_t write(const char* buffer, size_t size) {
-    return write(reinterpret_cast<const uint8_t*>(buffer), size);
+  size_t write(const char *buffer, size_t size) {
+    return write(reinterpret_cast<const uint8_t *>(buffer), size);
   }
 };
 
 class Printable {
  public:
   virtual ~Printable() {}
-  virtual size_t printTo(Print& p) const = 0;
+  virtual size_t printTo(Print &p) const = 0;
 };

extras/tests/Helpers/api/Stream.h

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -10,5 +10,5 @@ class Stream  // : public Print
  public:
   virtual ~Stream() {}
   virtual int read() = 0;
-  virtual size_t readBytes(char* buffer, size_t length) = 0;
+  virtual size_t readBytes(char *buffer, size_t length) = 0;
 };

extras/tests/Helpers/api/String.h

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -9,14 +9,11 @@
 // Reproduces Arduino's String class
 class String {
  public:
-  String() = default;
-  String(const char* s) {
-    if (s)
-      str_.assign(s);
-  }
+  String() : _maxCapacity(1024) {}
+  explicit String(const char* s) : _str(s), _maxCapacity(1024) {}
 
   void limitCapacityTo(size_t maxCapacity) {
-    maxCapacity_ = maxCapacity;
+    _maxCapacity = maxCapacity;
   }
 
   unsigned char concat(const char* s) {
@@ -24,48 +21,45 @@ class String {
   }
 
   size_t length() const {
-    return str_.size();
+    return _str.size();
   }
 
   const char* c_str() const {
-    return str_.c_str();
+    return _str.c_str();
   }
 
   bool operator==(const char* s) const {
-    return str_ == s;
+    return _str == s;
   }
 
   String& operator=(const char* s) {
-    if (s)
-      str_.assign(s);
-    else
-      str_.clear();
+    _str.assign(s);
     return *this;
   }
 
   char operator[](unsigned int index) const {
-    if (index >= str_.size())
+    if (index >= _str.size())
       return 0;
-    return str_[index];
+    return _str[index];
   }
 
   friend std::ostream& operator<<(std::ostream& lhs, const ::String& rhs) {
-    lhs << rhs.str_;
+    lhs << rhs._str;
     return lhs;
   }
 
  protected:
   // This function is protected in most Arduino cores
   unsigned char concat(const char* s, size_t n) {
-    if (str_.size() + n > maxCapacity_)
+    if (_str.size() + n > _maxCapacity)
       return 0;
-    str_.append(s, n);
+    _str.append(s, n);
     return 1;
   }
 
  private:
-  std::string str_;
-  size_t maxCapacity_ = 1024;
+  std::string _str;
+  size_t _maxCapacity;
 };
 
 class StringSumHelper : public ::String {};

extras/tests/Helpers/avr/pgmspace.h

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 
 #pragma once

extras/tests/IntegrationTests/CMakeLists.txt

@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2025, Benoit BLANCHON
+# Copyright © 2014-2023, Benoit BLANCHON
 # MIT License
 
 add_executable(IntegrationTests

extras/tests/IntegrationTests/gbathree.cpp

@@ -1,12 +1,12 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
 
 TEST_CASE("Gbathree") {
-  JsonDocument doc;
+  DynamicJsonDocument doc(4096);
 
   DeserializationError error = deserializeJson(
       doc,

extras/tests/IntegrationTests/issue772.cpp

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
@@ -8,8 +8,8 @@
 // https://github.com/bblanchon/ArduinoJson/issues/772
 
 TEST_CASE("Issue772") {
-  JsonDocument doc1;
-  JsonDocument doc2;
+  DynamicJsonDocument doc1(4096);
+  DynamicJsonDocument doc2(4096);
   DeserializationError err;
   std::string data =
       "{\"state\":{\"reported\":{\"timestamp\":\"2018-07-02T09:40:12Z\","

extras/tests/IntegrationTests/openweathermap.cpp

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
@@ -53,12 +53,12 @@ TEST_CASE("OpenWeatherMap") {
       "]}";
   // clang-format on
 
-  JsonDocument filter;
+  StaticJsonDocument<512> filter;
   filter["list"][0]["dt"] = true;
   filter["list"][0]["main"]["temp"] = true;
   filter["list"][0]["weather"][0]["description"] = true;
 
-  JsonDocument doc;
+  DynamicJsonDocument doc(16384);
 
   REQUIRE(
       deserializeJson(doc, input_json, DeserializationOption::Filter(filter)) ==

extras/tests/IntegrationTests/round_trip.cpp

@@ -1,12 +1,12 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
 
 void check(std::string originalJson) {
-  JsonDocument doc;
+  DynamicJsonDocument doc(16384);
 
   std::string prettyJson;
   deserializeJson(doc, originalJson);

extras/tests/JsonArray/CMakeLists.txt

@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2025, Benoit BLANCHON
+# Copyright © 2014-2023, Benoit BLANCHON
 # MIT License
 
 add_executable(JsonArrayTests
@@ -7,12 +7,15 @@ add_executable(JsonArrayTests
 	clear.cpp
 	compare.cpp
 	copyArray.cpp
+	createNested.cpp
 	equals.cpp
 	isNull.cpp
 	iterator.cpp
+	memoryUsage.cpp
 	nesting.cpp
 	remove.cpp
 	size.cpp
+	std_string.cpp
 	subscript.cpp
 	unbound.cpp
 )

extras/tests/JsonArray/add.cpp

@@ -1,130 +1,41 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
 
-#include "Allocators.hpp"
-#include "Literals.hpp"
-
-using namespace ArduinoJson::detail;
-
-TEST_CASE("JsonArray::add(T)") {
-  SpyingAllocator spy;
-  JsonDocument doc(&spy);
+TEST_CASE("JsonArray::add()") {
+  DynamicJsonDocument doc(4096);
   JsonArray array = doc.to<JsonArray>();
 
   SECTION("int") {
     array.add(123);
-
     REQUIRE(123 == array[0].as<int>());
     REQUIRE(array[0].is<int>());
     REQUIRE(array[0].is<double>());
-    REQUIRE(spy.log() == AllocatorLog{
-                             Allocate(sizeofPool()),
-                         });
   }
 
   SECTION("double") {
     array.add(123.45);
-
     REQUIRE(123.45 == array[0].as<double>());
     REQUIRE(array[0].is<double>());
     REQUIRE_FALSE(array[0].is<bool>());
-    REQUIRE(spy.log() == AllocatorLog{
-                             Allocate(sizeofPool<VariantData>()),
-                             Allocate(sizeofPool<EightByteValue>()),
-                         });
   }
 
   SECTION("bool") {
     array.add(true);
-
-    REQUIRE(array[0].as<bool>() == true);
+    REQUIRE(true == array[0].as<bool>());
     REQUIRE(array[0].is<bool>());
     REQUIRE_FALSE(array[0].is<int>());
-    REQUIRE(spy.log() == AllocatorLog{
-                             Allocate(sizeofPool()),
-                         });
-  }
-
-  SECTION("string literal") {
-    array.add("hello");
-
-    REQUIRE(array[0].as<std::string>() == "hello");
-    REQUIRE(array[0].is<const char*>());
-    REQUIRE(array[0].is<int>() == false);
-    REQUIRE(spy.log() == AllocatorLog{
-                             Allocate(sizeofPool()),
-                             Allocate(sizeofStaticStringPool()),
-                         });
-  }
-
-  SECTION("std::string") {
-    array.add("hello"_s);
-
-    REQUIRE(array[0].as<std::string>() == "hello");
-    REQUIRE(array[0].is<const char*>() == true);
-    REQUIRE(array[0].is<int>() == false);
-    REQUIRE(spy.log() == AllocatorLog{
-                             Allocate(sizeofPool()),
-                             Allocate(sizeofString("hello")),
-                         });
   }
 
   SECTION("const char*") {
     const char* str = "hello";
     array.add(str);
-
-    REQUIRE(array[0].as<std::string>() == "hello");
-    REQUIRE(array[0].as<const char*>() != str);
-    REQUIRE(array[0].is<const char*>() == true);
-    REQUIRE(array[0].is<int>() == false);
-    REQUIRE(spy.log() == AllocatorLog{
-                             Allocate(sizeofPool()),
-                             Allocate(sizeofString("hello")),
-                         });
-  }
-
-  SECTION("serialized(const char*)") {
-    array.add(serialized("{}"));
-
-    REQUIRE(doc.as<std::string>() == "[{}]");
-    REQUIRE(spy.log() == AllocatorLog{
-                             Allocate(sizeofPool()),
-                             Allocate(sizeofString("{}")),
-                         });
-  }
-
-  SECTION("serialized(char*)") {
-    array.add(serialized(const_cast<char*>("{}")));
-
-    REQUIRE(doc.as<std::string>() == "[{}]");
-    REQUIRE(spy.log() == AllocatorLog{
-                             Allocate(sizeofPool()),
-                             Allocate(sizeofString("{}")),
-                         });
-  }
-
-  SECTION("serialized(std::string)") {
-    array.add(serialized("{}"_s));
-
-    REQUIRE(doc.as<std::string>() == "[{}]");
-    REQUIRE(spy.log() == AllocatorLog{
-                             Allocate(sizeofPool()),
-                             Allocate(sizeofString("{}")),
-                         });
-  }
-
-  SECTION("serialized(std::string)") {
-    array.add(serialized("\0XX"_s));
-
-    REQUIRE(doc.as<std::string>() == "[\0XX]"_s);
-    REQUIRE(spy.log() == AllocatorLog{
-                             Allocate(sizeofPool()),
-                             Allocate(sizeofString(" XX")),
-                         });
+    REQUIRE(str == array[0].as<std::string>());
+    REQUIRE(array[0].is<const char*>());
+    REQUIRE_FALSE(array[0].is<int>());
   }
 
 #ifdef HAS_VARIABLE_LENGTH_ARRAY
@@ -135,17 +46,12 @@ TEST_CASE("JsonArray::add(T)") {
 
     array.add(vla);
 
-    strcpy(vla, "hello");
-    REQUIRE(array[0] == "world"_s);
-    REQUIRE(spy.log() == AllocatorLog{
-                             Allocate(sizeofPool()),
-                             Allocate(sizeofString("hello")),
-                         });
+    REQUIRE(std::string("world") == array[0]);
   }
 #endif
 
   SECTION("nested array") {
-    JsonDocument doc2;
+    DynamicJsonDocument doc2(4096);
     JsonArray arr = doc2.to<JsonArray>();
 
     array.add(arr);
@@ -156,7 +62,7 @@ TEST_CASE("JsonArray::add(T)") {
   }
 
   SECTION("nested object") {
-    JsonDocument doc2;
+    DynamicJsonDocument doc2(4096);
     JsonObject obj = doc2.to<JsonObject>();
 
     array.add(obj);
@@ -168,7 +74,7 @@ TEST_CASE("JsonArray::add(T)") {
 
   SECTION("array subscript") {
     const char* str = "hello";
-    JsonDocument doc2;
+    DynamicJsonDocument doc2(4096);
     JsonArray arr = doc2.to<JsonArray>();
     arr.add(str);
 
@@ -179,7 +85,7 @@ TEST_CASE("JsonArray::add(T)") {
 
   SECTION("object subscript") {
     const char* str = "hello";
-    JsonDocument doc2;
+    DynamicJsonDocument doc2(4096);
     JsonObject obj = doc2.to<JsonObject>();
     obj["x"] = str;
 
@@ -187,78 +93,46 @@ TEST_CASE("JsonArray::add(T)") {
 
     REQUIRE(str == array[0]);
   }
-}
 
-TEST_CASE("JsonArray::add<T>()") {
-  JsonDocument doc;
-  JsonArray array = doc.to<JsonArray>();
-
-  SECTION("add<JsonArray>()") {
-    JsonArray nestedArray = array.add<JsonArray>();
-    nestedArray.add(1);
-    nestedArray.add(2);
-    REQUIRE(doc.as<std::string>() == "[[1,2]]");
+  SECTION("should not duplicate const char*") {
+    array.add("world");
+    const size_t expectedSize = JSON_ARRAY_SIZE(1);
+    REQUIRE(expectedSize == doc.memoryUsage());
   }
 
-  SECTION("add<JsonObject>()") {
-    JsonObject nestedObject = array.add<JsonObject>();
-    nestedObject["a"] = 1;
-    nestedObject["b"] = 2;
-    REQUIRE(doc.as<std::string>() == "[{\"a\":1,\"b\":2}]");
+  SECTION("should duplicate char*") {
+    array.add(const_cast<char*>("world"));
+    const size_t expectedSize = JSON_ARRAY_SIZE(1) + JSON_STRING_SIZE(5);
+    REQUIRE(expectedSize == doc.memoryUsage());
   }
 
-  SECTION("add<JsonVariant>()") {
-    JsonVariant nestedVariant = array.add<JsonVariant>();
-    nestedVariant.set(42);
-    REQUIRE(doc.as<std::string>() == "[42]");
-  }
-}
-
-TEST_CASE("JsonObject::add(JsonObject) ") {
-  JsonDocument doc1;
-  doc1["key1"_s] = "value1"_s;
-
-  TimebombAllocator allocator(10);
-  SpyingAllocator spy(&allocator);
-  JsonDocument doc2(&spy);
-  JsonArray array = doc2.to<JsonArray>();
-
-  SECTION("success") {
-    bool result = array.add(doc1.as<JsonObject>());
-
-    REQUIRE(result == true);
-    REQUIRE(doc2.as<std::string>() == "[{\"key1\":\"value1\"}]");
-    REQUIRE(spy.log() == AllocatorLog{
-                             Allocate(sizeofPool()),
-                             Allocate(sizeofString("key1")),
-                             Allocate(sizeofString("value1")),
-                         });
-  }
-
-  SECTION("partial failure") {  // issue #2081
-    allocator.setCountdown(2);
-
-    bool result = array.add(doc1.as<JsonObject>());
-
-    REQUIRE(result == false);
-    REQUIRE(doc2.as<std::string>() == "[]");
-    REQUIRE(spy.log() == AllocatorLog{
-                             Allocate(sizeofPool()),
-                             Allocate(sizeofString("key1")),
-                             AllocateFail(sizeofString("value1")),
-                             Deallocate(sizeofString("key1")),
-                         });
-  }
-
-  SECTION("complete failure") {
-    allocator.setCountdown(0);
-
-    bool result = array.add(doc1.as<JsonObject>());
-
-    REQUIRE(result == false);
-    REQUIRE(doc2.as<std::string>() == "[]");
-    REQUIRE(spy.log() == AllocatorLog{
-                             AllocateFail(sizeofPool()),
-                         });
+  SECTION("should duplicate std::string") {
+    array.add(std::string("world"));
+    const size_t expectedSize = JSON_ARRAY_SIZE(1) + JSON_STRING_SIZE(5);
+    REQUIRE(expectedSize == doc.memoryUsage());
+  }
+
+  SECTION("should not duplicate serialized(const char*)") {
+    array.add(serialized("{}"));
+    const size_t expectedSize = JSON_ARRAY_SIZE(1);
+    REQUIRE(expectedSize == doc.memoryUsage());
+  }
+
+  SECTION("should duplicate serialized(char*)") {
+    array.add(serialized(const_cast<char*>("{}")));
+    const size_t expectedSize = JSON_ARRAY_SIZE(1) + JSON_STRING_SIZE(2);
+    REQUIRE(expectedSize == doc.memoryUsage());
+  }
+
+  SECTION("should duplicate serialized(std::string)") {
+    array.add(serialized(std::string("{}")));
+    const size_t expectedSize = JSON_ARRAY_SIZE(1) + JSON_STRING_SIZE(2);
+    REQUIRE(expectedSize == doc.memoryUsage());
+  }
+
+  SECTION("should duplicate serialized(std::string)") {
+    array.add(serialized(std::string("\0XX", 3)));
+    const size_t expectedSize = JSON_ARRAY_SIZE(1) + JSON_STRING_SIZE(3);
+    REQUIRE(expectedSize == doc.memoryUsage());
   }
 }

extras/tests/JsonArray/clear.cpp

@@ -1,12 +1,10 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
 
-#include "Allocators.hpp"
-
 TEST_CASE("JsonArray::clear()") {
   SECTION("No-op on null JsonArray") {
     JsonArray array;
@@ -16,7 +14,7 @@ TEST_CASE("JsonArray::clear()") {
   }
 
   SECTION("Removes all elements") {
-    JsonDocument doc;
+    StaticJsonDocument<64> doc;
     JsonArray array = doc.to<JsonArray>();
     array.add(1);
     array.add(2);
@@ -24,23 +22,4 @@ TEST_CASE("JsonArray::clear()") {
     REQUIRE(array.size() == 0);
     REQUIRE(array.isNull() == false);
   }
-
-  SECTION("Removed elements are recycled") {
-    SpyingAllocator spy;
-    JsonDocument doc(&spy);
-    JsonArray array = doc.to<JsonArray>();
-
-    // fill the pool entirely
-    for (int i = 0; i < ARDUINOJSON_POOL_CAPACITY; i++)
-      array.add(i);
-
-    // clear and fill again
-    array.clear();
-    for (int i = 0; i < ARDUINOJSON_POOL_CAPACITY; i++)
-      array.add(i);
-
-    REQUIRE(spy.log() == AllocatorLog{
-                             Allocate(sizeofPool()),
-                         });
-  }
 }

extras/tests/JsonArray/compare.cpp

@@ -1,12 +1,12 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2025, Benoit BLANCHON
+// Copyright © 2014-2023, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
 
 TEST_CASE("Compare JsonArray with JsonArray") {
-  JsonDocument doc;
+  StaticJsonDocument<256> doc;
 
   SECTION("Compare with unbound") {
     JsonArray array = doc.to<JsonArray>();
@@ -43,15 +43,15 @@ TEST_CASE("Compare JsonArray with JsonArray") {
   }
 
   SECTION("Compare with identical array") {
-    JsonArray array1 = doc.add<JsonArray>();
+    JsonArray array1 = doc.createNestedArray();
     array1.add(1);
     array1.add("hello");
-    array1.add<JsonObject>();
+    array1.createNestedObject();
 
-    JsonArray array2 = doc.add<JsonArray>();
+    JsonArray array2 = doc.createNestedArray();
     array2.add(1);
     array2.add("hello");
-    array2.add<JsonObject>();
+    array2.createNestedObject();
 
     CHECK(array1 == array2);
     CHECK(array1 <= array2);
@@ -62,15 +62,15 @@ TEST_CASE("Compare JsonArray with JsonArray") {
   }
 
   SECTION("Compare with different array") {
-    JsonArray array1 = doc.add<JsonArray>();
+    JsonArray array1 = doc.createNestedArray();
     array1.add(1);
     array1.add("hello1");
-    array1.add<JsonObject>();
+    array1.createNestedObject();
 
-    JsonArray array2 = doc.add<JsonArray>();
+    JsonArray array2 = doc.createNestedArray();
     array2.add(1);
     array2.add("hello2");
-    array2.add<JsonObject>();
+    array2.createNestedObject();
 
     CHECK(array1 != array2);
     CHECK_FALSE(array1 == array2);
@@ -82,7 +82,7 @@ TEST_CASE("Compare JsonArray with JsonArray") {
 }
 
 TEST_CASE("Compare JsonArray with JsonVariant") {
-  JsonDocument doc;
+  StaticJsonDocument<256> doc;
 
   SECTION("Compare with self") {
     JsonArray array = doc.to<JsonArray>();
@@ -107,15 +107,15 @@ TEST_CASE("Compare JsonArray with JsonVariant") {
   }
 
   SECTION("Compare with identical array") {
-    JsonArray array = doc.add<JsonArray>();
+    JsonArray array = doc.createNestedArray();
     array.add(1);
     array.add("hello");
-    array.add<JsonObject>();
+    array.createNestedObject();
 
-    JsonVariant variant = doc.add<JsonArray>();
+    JsonVariant variant = doc.createNestedArray();
     variant.add(1);
     variant.add("hello");
-    variant.add<JsonObject>();
+    variant.createNestedObject();
 
     CHECK(array == variant);
     CHECK(array <= variant);
@@ -133,15 +133,15 @@ TEST_CASE("Compare JsonArray with JsonVariant") {
   }
 
   SECTION("Compare with different array") {
-    JsonArray array = doc.add<JsonArray>();
+    JsonArray array = doc.createNestedArray();
     array.add(1);
     array.add("hello1");
-    array.add<JsonObject>();
+    array.createNestedObject();
 
-    JsonVariant variant = doc.add<JsonArray>();
+    JsonVariant variant = doc.createNestedArray();
     variant.add(1);
     variant.add("hello2");
-    variant.add<JsonObject>();
+    variant.createNestedObject();
 
     CHECK(array != variant);
     CHECK_FALSE(array == variant);
@@ -153,7 +153,7 @@ TEST_CASE("Compare JsonArray with JsonVariant") {
 }
 
 TEST_CASE("Compare JsonArray with JsonVariantConst") {
-  JsonDocument doc;
+  StaticJsonDocument<256> doc;
 
   SECTION("Compare with unbound") {
     JsonArray array = doc.to<JsonArray>();
@@ -199,15 +199,15 @@ TEST_CASE("Compare JsonArray with JsonVariantConst") {
   }
 
   SECTION("Compare with identical array") {
-    JsonArray array = doc.add<JsonArray>();
+    JsonArray array = doc.createNestedArray();
     array.add(1);
     array.add("hello");
-    array.add<JsonObject>();
+    array.createNestedObject();
 
-    JsonArray array2 = doc.add<JsonArray>();
+    JsonArray array2 = doc.createNestedArray();
     array2.add(1);
     array2.add("hello");
-    array2.add<JsonObject>();
+    array2.createNestedObject();
     JsonVariantConst variant = array2;
 
     CHECK(array == variant);
@@ -226,15 +226,15 @@ TEST_CASE("Compare JsonArray with JsonVariantConst") {
   }
 
   SECTION("Compare with different array") {
-    JsonArray array = doc.add<JsonArray>();
+    JsonArray array = doc.createNestedArray();
     array.add(1);
     array.add("hello1");
-    array.add<JsonObject>();
+    array.createNestedObject();
 
-    JsonArray array2 = doc.add<JsonArray>();
+    JsonArray array2 = doc.createNestedArray();
     array2.add(1);
     array2.add("hello2");
-    array2.add<JsonObject>();
+    array2.createNestedObject();
     JsonVariantConst variant = array2;
 
     CHECK(array != variant);
@@ -247,7 +247,7 @@ TEST_CASE("Compare JsonArray with JsonVariantConst") {
 }
 
 TEST_CASE("Compare JsonArray with JsonArrayConst") {
-  JsonDocument doc;
+  StaticJsonDocument<256> doc;
 
   SECTION("Compare with unbound") {
     JsonArray array = doc.to<JsonArray>();
@@ -292,15 +292,15 @@ TEST_CASE("Compare JsonArray with JsonArrayConst") {
   }
 
   SECTION("Compare with identical array") {
-    JsonArray array1 = doc.add<JsonArray>();
+    JsonArray array1 = doc.createNestedArray();
     array1.add(1);
     array1.add("hello");
-    array1.add<JsonObject>();
+    array1.createNestedObject();
 
-    JsonArray array2 = doc.add<JsonArray>();
+    JsonArray array2 = doc.createNestedArray();
     array2.add(1);
     array2.add("hello");
-    array2.add<JsonObject>();
+    array2.createNestedObject();
     JsonArrayConst carray2 = array2;
 
     CHECK(array1 == carray2);
@@ -319,15 +319,15 @@ TEST_CASE("Compare JsonArray with JsonArrayConst") {
   }
 
   SECTION("Compare with different array") {
-    JsonArray array1 = doc.add<JsonArray>();
+    JsonArray array1 = doc.createNestedArray();
     array1.add(1);
     array1.add("hello1");
-    array1.add<JsonObject>();
+    array1.createNestedObject();
 
-    JsonArray array2 = doc.add<JsonArray>();
+    JsonArray array2 = doc.createNestedArray();
     array2.add(1);
     array2.add("hello2");
-    array2.add<JsonObject>();
+    array2.createNestedObject();
     JsonArrayConst carray2 = array2;
 
     CHECK(array1 != carray2);
@@ -347,7 +347,7 @@ TEST_CASE("Compare JsonArray with JsonArrayConst") {
 }
 
 TEST_CASE("Compare JsonArrayConst with JsonArrayConst") {
-  JsonDocument doc;
+  StaticJsonDocument<256> doc;
 
   SECTION("Compare with unbound") {
     JsonArray array = doc.to<JsonArray>();
@@ -387,16 +387,16 @@ TEST_CASE("Compare JsonArrayConst with JsonArrayConst") {
   }
 
   SECTION("Compare with identical array") {
-    JsonArray array1 = doc.add<JsonArray>();
+    JsonArray array1 = doc.createNestedArray();
     array1.add(1);
     array1.add("hello");
-    array1.add<JsonObject>();
+    array1.createNestedObject();
     JsonArrayConst carray1 = array1;
 
-    JsonArray array2 = doc.add<JsonArray>();
+    JsonArray array2 = doc.createNestedArray();
     array2.add(1);
     array2.add("hello");
-    array2.add<JsonObject>();
+    array2.createNestedObject();
     JsonArrayConst carray2 = array2;
 
     CHECK(carray1 == carray2);
@@ -408,16 +408,16 @@ TEST_CASE("Compare JsonArrayConst with JsonArrayConst") {
   }
 
   SECTION("Compare with different array") {
-    JsonArray array1 = doc.add<JsonArray>();
+    JsonArray array1 = doc.createNestedArray();
     array1.add(1);
     array1.add("hello1");
-    array1.add<JsonObject>();
+    array1.createNestedObject();
     JsonArrayConst carray1 = array1;
 
-    JsonArray array2 = doc.add<JsonArray>();
+    JsonArray array2 = doc.createNestedArray();
     array2.add(1);
     array2.add("hello2");
-    array2.add<JsonObject>();
+    array2.createNestedObject();
     JsonArrayConst carray2 = array2;
 
     CHECK(carray1 != carray2);
@@ -430,7 +430,7 @@ TEST_CASE("Compare JsonArrayConst with JsonArrayConst") {
 }
 
 TEST_CASE("Compare JsonArrayConst with JsonVariant") {
-  JsonDocument doc;
+  StaticJsonDocument<256> doc;
 
   SECTION("Compare with self") {
     JsonArray array = doc.to<JsonArray>();
@@ -455,16 +455,16 @@ TEST_CASE("Compare JsonArrayConst with JsonVariant") {
   }
 
   SECTION("Compare with identical array") {
-    JsonArray array1 = doc.add<JsonArray>();
+    JsonArray array1 = doc.createNestedArray();
     array1.add(1);
     array1.add("hello");
-    array1.add<JsonObject>();
+    array1.createNestedObject();
     JsonArrayConst carray1 = array1;
 
-    JsonArray array2 = doc.add<JsonArray>();
+    JsonArray array2 = doc.createNestedArray();
     array2.add(1);
     array2.add("hello");
-    array2.add<JsonObject>();
+    array2.createNestedObject();
     JsonVariant variant2 = array2;
 
     CHECK(carray1 == variant2);
@@ -483,16 +483,16 @@ TEST_CASE("Compare JsonArrayConst with JsonVariant") {
   }
 
   SECTION("Compare with different array") {
-    JsonArray array1 = doc.add<JsonArray>();
+    JsonArray array1 = doc.createNestedArray();
     array1.add(1);
     array1.add("hello1");
-    array1.add<JsonObject>();
+    array1.createNestedObject();
     JsonArrayConst carray1 = array1;
 
-    JsonArray array2 = doc.add<JsonArray>();
+    JsonArray array2 = doc.createNestedArray();
     array2.add(1);
     array2.add("hello2");
-    array2.add<JsonObject>();
+    array2.createNestedObject();
     JsonVariant variant2 = array2;
 
     CHECK(carray1 != variant2);