From 9f1421e0a67f0470d14de8ac8ea03d22f1499207 Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Sat, 13 Oct 2018 13:23:34 +0200 Subject: [PATCH] Set version to 6.5.0-beta --- CHANGELOG.md | 4 ++-- library.json | 2 +- library.properties | 2 +- src/ArduinoJson/version.hpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 750c09f2..f46577aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ ArduinoJson: change log ======================= -HEAD ----- +v6.5.0-beta (2018-10-13) +----------- * Added implicit conversion from `JsonArray` and `JsonObject` to `JsonVariant` * Allow mixed configuration in compilation units (issue #809) diff --git a/library.json b/library.json index 80035775..53d820cc 100644 --- a/library.json +++ b/library.json @@ -7,7 +7,7 @@ "type": "git", "url": "https://github.com/bblanchon/ArduinoJson.git" }, - "version": "6.4.0-beta", + "version": "6.5.0-beta", "authors": { "name": "Benoit Blanchon", "url": "https://blog.benoitblanchon.fr" diff --git a/library.properties b/library.properties index cf565fba..2fb64f20 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=ArduinoJson -version=6.4.0-beta +version=6.5.0-beta author=Benoit Blanchon maintainer=Benoit Blanchon sentence=An efficient and elegant JSON library for Arduino. diff --git a/src/ArduinoJson/version.hpp b/src/ArduinoJson/version.hpp index 548b0726..225ce883 100644 --- a/src/ArduinoJson/version.hpp +++ b/src/ArduinoJson/version.hpp @@ -4,7 +4,7 @@ #pragma once -#define ARDUINOJSON_VERSION "6.4.0-beta" +#define ARDUINOJSON_VERSION "6.5.0-beta" #define ARDUINOJSON_VERSION_MAJOR 6 -#define ARDUINOJSON_VERSION_MINOR 4 +#define ARDUINOJSON_VERSION_MINOR 5 #define ARDUINOJSON_VERSION_REVISION 0