Set version to 6.0.0-beta

This commit is contained in:
Benoit Blanchon
2018-06-07 10:47:00 +02:00
parent a9a730fd74
commit e86eb0cfdf
5 changed files with 12 additions and 7 deletions

View File

@ -1,6 +1,9 @@
ArduinoJson: change log
=======================
v6.0.0-beta
-----------
* Added `DynamicJsonDocument` and `StaticJsonDocument`
* Added `deserializeJson()`
* Added `serializeJson()` and `serializeJsonPretty()`

View File

@ -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"

View File

@ -1,5 +1,5 @@
name=ArduinoJson
version=6.0.0
version=6.0.0-beta
author=Benoit Blanchon <blog.benoitblanchon.fr>
maintainer=Benoit Blanchon <blog.benoitblanchon.fr>
sentence=An efficient and elegant JSON library for Arduino.

View File

@ -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

View File

@ -6,11 +6,13 @@
#include <catch.hpp>
#include <sstream>
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()));
}