Set version to 6.0.0-beta

bblanchon · Jun 7, 2018 · e86eb0c · e86eb0c
1 parent a9a730f
commit e86eb0c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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.

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