From e86eb0cfdfd3fea6edbbe45d37f19d8baf51ac82 Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Thu, 7 Jun 2018 10:47:00 +0200 Subject: [PATCH] Set version to 6.0.0-beta --- CHANGELOG.md | 3 +++ library.json | 2 +- library.properties | 2 +- src/ArduinoJson/version.hpp | 8 ++++---- test/Misc/version.cpp | 4 +++- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e98234f..cee45370 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ ArduinoJson: change log ======================= +v6.0.0-beta +----------- + * Added `DynamicJsonDocument` and `StaticJsonDocument` * Added `deserializeJson()` * Added `serializeJson()` and `serializeJsonPretty()` diff --git a/library.json b/library.json index 4951ee33..aae5625d 100644 --- a/library.json +++ b/library.json @@ -7,7 +7,7 @@ "type": "git", "url": "https://github.com/bblanchon/ArduinoJson.git" }, - "version": "6.0.0", + "version": "6.0.0-beta", "authors": { "name": "Benoit Blanchon", "url": "https://blog.benoitblanchon.fr" diff --git a/library.properties b/library.properties index e0418054..59c473cc 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=ArduinoJson -version=6.0.0 +version=6.0.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 a71c3ab4..ab7e64e0 100644 --- a/src/ArduinoJson/version.hpp +++ b/src/ArduinoJson/version.hpp @@ -4,7 +4,7 @@ #pragma once -#define ARDUINOJSON_VERSION "5.13.2" -#define ARDUINOJSON_VERSION_MAJOR 5 -#define ARDUINOJSON_VERSION_MINOR 13 -#define ARDUINOJSON_VERSION_REVISION 2 +#define ARDUINOJSON_VERSION "6.0.0-beta" +#define ARDUINOJSON_VERSION_MAJOR 6 +#define ARDUINOJSON_VERSION_MINOR 0 +#define ARDUINOJSON_VERSION_REVISION 0 diff --git a/test/Misc/version.cpp b/test/Misc/version.cpp index a9bbbe72..bc47839a 100644 --- a/test/Misc/version.cpp +++ b/test/Misc/version.cpp @@ -6,11 +6,13 @@ #include #include +using Catch::Matchers::StartsWith; + TEST_CASE("ARDUINOJSON_VERSION") { std::stringstream version; version << ARDUINOJSON_VERSION_MAJOR << "." << ARDUINOJSON_VERSION_MINOR << "." << ARDUINOJSON_VERSION_REVISION; - REQUIRE(version.str() == ARDUINOJSON_VERSION); + REQUIRE_THAT(ARDUINOJSON_VERSION, StartsWith(version.str())); }