github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-10-31 16:14:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Set version to 6.0.0-beta

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

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

2
library.json
View File

@@ -7,7 +7,7 @@
"type": "git", "type": "git",
"url": "https://github.com/bblanchon/ArduinoJson.git" "url": "https://github.com/bblanchon/ArduinoJson.git"
}, },
"version": "6.0.0", "version": "6.0.0-beta",
"authors": { "authors": {
"name": "Benoit Blanchon", "name": "Benoit Blanchon",
"url": "https://blog.benoitblanchon.fr" "url": "https://blog.benoitblanchon.fr"

2
library.properties
View File

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

8
src/ArduinoJson/version.hpp
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#define ARDUINOJSON_VERSION "5.13.2" #define ARDUINOJSON_VERSION "6.0.0-beta"
#define ARDUINOJSON_VERSION_MAJOR 5 #define ARDUINOJSON_VERSION_MAJOR 6
#define ARDUINOJSON_VERSION_MINOR 13 #define ARDUINOJSON_VERSION_MINOR 0
#define ARDUINOJSON_VERSION_REVISION 2 #define ARDUINOJSON_VERSION_REVISION 0

4
test/Misc/version.cpp
View File

@@ -6,11 +6,13 @@
#include <catch.hpp> #include <catch.hpp>
#include <sstream> #include <sstream>
using Catch::Matchers::StartsWith;
TEST_CASE("ARDUINOJSON_VERSION") { TEST_CASE("ARDUINOJSON_VERSION") {
std::stringstream version; std::stringstream version;
version << ARDUINOJSON_VERSION_MAJOR << "." << ARDUINOJSON_VERSION_MINOR version << ARDUINOJSON_VERSION_MAJOR << "." << ARDUINOJSON_VERSION_MINOR
<< "." << ARDUINOJSON_VERSION_REVISION; << "." << ARDUINOJSON_VERSION_REVISION;
REQUIRE(version.str() == ARDUINOJSON_VERSION); REQUIRE_THAT(ARDUINOJSON_VERSION, StartsWith(version.str()));
} }