From 763be4f266acde9a648a69f7283c3422440aed1e Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Sun, 22 Mar 2020 21:02:38 +0100 Subject: [PATCH] Set version to 6.15.0 --- CHANGELOG.md | 4 ++-- README.md | 2 +- appveyor.yml | 2 +- library.json | 2 +- library.properties | 2 +- src/ArduinoJson/version.hpp | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f91b4036e..5ee4ad733 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ ArduinoJson: change log ======================= -HEAD ----- +v6.15.0 (2020-03-22) +------- * Added `DeserializationOption::Filter` (issue #959) * Added example `JsonFilterExample.ino` diff --git a/README.md b/README.md index 20212a42c..57cdd2591 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ --- -[![arduino-library-badge](https://www.ardu-badge.com/badge/ArduinoJson.svg?version=6.14.1)](https://www.ardu-badge.com/ArduinoJson/6.14.1) +[![arduino-library-badge](https://www.ardu-badge.com/badge/ArduinoJson.svg?version=6.15.0)](https://www.ardu-badge.com/ArduinoJson/6.15.0) [![Build Status](https://ci.appveyor.com/api/projects/status/m7s53wav1l0abssg/branch/6.x?svg=true)](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/6.x) [![Build Status](https://travis-ci.org/bblanchon/ArduinoJson.svg?branch=6.x)](https://travis-ci.org/bblanchon/ArduinoJson) [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/arduinojson.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:arduinojson) diff --git a/appveyor.yml b/appveyor.yml index ae1e485c6..e3d3e4520 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 6.14.1.{build} +version: 6.15.0.{build} environment: matrix: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 diff --git a/library.json b/library.json index a0a5f80fd..c05e60a20 100644 --- a/library.json +++ b/library.json @@ -7,7 +7,7 @@ "type": "git", "url": "https://github.com/bblanchon/ArduinoJson.git" }, - "version": "6.14.1", + "version": "6.15.0", "authors": { "name": "Benoit Blanchon", "url": "https://blog.benoitblanchon.fr" diff --git a/library.properties b/library.properties index 0fb3878f7..30b5413f7 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=ArduinoJson -version=6.14.1 +version=6.15.0 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 5e29ad225..bfef06e95 100644 --- a/src/ArduinoJson/version.hpp +++ b/src/ArduinoJson/version.hpp @@ -4,7 +4,7 @@ #pragma once -#define ARDUINOJSON_VERSION "6.14.1" +#define ARDUINOJSON_VERSION "6.15.0" #define ARDUINOJSON_VERSION_MAJOR 6 -#define ARDUINOJSON_VERSION_MINOR 14 -#define ARDUINOJSON_VERSION_REVISION 1 +#define ARDUINOJSON_VERSION_MINOR 15 +#define ARDUINOJSON_VERSION_REVISION 0