Benoit Blanchon 7 лет назад
Родитель
Сommit
e86eb0cfdf
5 измененных файлов с 12 добавлено и 7 удалено
  1. 3 0
      CHANGELOG.md
  2. 1 1
      library.json
  3. 1 1
      library.properties
  4. 4 4
      src/ArduinoJson/version.hpp
  5. 3 1
      test/Misc/version.cpp

+ 3 - 0
CHANGELOG.md

@@ -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()`

+ 1 - 1
library.json

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

+ 1 - 1
library.properties

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

+ 4 - 4
src/ArduinoJson/version.hpp

@@ -4,7 +4,7 @@
 
 
 #pragma once
 #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

+ 3 - 1
test/Misc/version.cpp

@@ -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()));
 }
 }