From f82a227da65cd7ec2a09a985e01c05c8717e7315 Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Tue, 28 Sep 2021 17:18:44 +0200 Subject: [PATCH] Set version to 6.18.5 --- CHANGELOG.md | 4 ++-- CMakeLists.txt | 2 +- README.md | 2 +- appveyor.yml | 2 +- library.json | 2 +- library.properties | 2 +- src/ArduinoJson/version.hpp | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9f84ab27..1d910d2fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ ArduinoJson: change log ======================= -HEAD ----- +v6.18.5 (2021-09-28) +------- * Set `ARDUINOJSON_EMBEDDED_MODE` to `1` on Nios II (issue #1657) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1fbe8f0f5..b14cb0ee0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ if(ESP_PLATFORM) return() endif() -project(ArduinoJson VERSION 6.18.4) +project(ArduinoJson VERSION 6.18.5) if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) include(CTest) diff --git a/README.md b/README.md index cf7ac4553..440fca6ca 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ [![GitHub stars](https://img.shields.io/github/stars/bblanchon/ArduinoJson?style=flat&logo=github)](https://github.com/bblanchon/ArduinoJson/stargazers) [![GitHub Sponsors](https://img.shields.io/github/sponsors/bblanchon?logo=github)](https://github.com/sponsors/bblanchon) -[![arduino-library-badge](https://www.ardu-badge.com/badge/ArduinoJson.svg?version=6.18.4)](https://www.ardu-badge.com/ArduinoJson/6.18.4) +[![arduino-library-badge](https://www.ardu-badge.com/badge/ArduinoJson.svg?version=6.18.5)](https://www.ardu-badge.com/ArduinoJson/6.18.5) ArduinoJson is a C++ JSON library for Arduino and IoT (Internet Of Things). diff --git a/appveyor.yml b/appveyor.yml index 3079de204..2882fda13 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 6.18.4.{build} +version: 6.18.5.{build} environment: matrix: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 diff --git a/library.json b/library.json index 524274278..ec44d2018 100644 --- a/library.json +++ b/library.json @@ -7,7 +7,7 @@ "type": "git", "url": "https://github.com/bblanchon/ArduinoJson.git" }, - "version": "6.18.4", + "version": "6.18.5", "authors": { "name": "Benoit Blanchon", "url": "https://blog.benoitblanchon.fr" diff --git a/library.properties b/library.properties index c59828280..f0002ec4a 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=ArduinoJson -version=6.18.4 +version=6.18.5 author=Benoit Blanchon maintainer=Benoit Blanchon sentence=A simple and efficient JSON library for embedded C++. diff --git a/src/ArduinoJson/version.hpp b/src/ArduinoJson/version.hpp index 2ad469206..6cff6e026 100644 --- a/src/ArduinoJson/version.hpp +++ b/src/ArduinoJson/version.hpp @@ -4,7 +4,7 @@ #pragma once -#define ARDUINOJSON_VERSION "6.18.4" +#define ARDUINOJSON_VERSION "6.18.5" #define ARDUINOJSON_VERSION_MAJOR 6 #define ARDUINOJSON_VERSION_MINOR 18 -#define ARDUINOJSON_VERSION_REVISION 4 +#define ARDUINOJSON_VERSION_REVISION 5