From 04286f32286a6b21bd9ace554010e8a9cad62cc9 Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Tue, 4 Dec 2018 10:50:45 +0100 Subject: [PATCH 1/3] Moved size measurements to github.com/bblanchon/ArduinoJson-size --- scripts/create-size-graph.sh | 42 ------------------------------------ 1 file changed, 42 deletions(-) delete mode 100755 scripts/create-size-graph.sh diff --git a/scripts/create-size-graph.sh b/scripts/create-size-graph.sh deleted file mode 100755 index ed37e863..00000000 --- a/scripts/create-size-graph.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -set -eu - -OUTPUT="$(pwd)/sizes.csv" - -echo "Tag;Date;Parser;Generator" > $OUTPUT - -cd $(dirname $(dirname $0)) - -git tag | while read TAG -do - - git checkout -q tags/$TAG - - DATE=$(git log -1 --date=short --pretty=format:%cd) - PARSER_SIZE=$(arduino --verify examples/JsonParserExample/JsonParserExample.ino 2>/dev/null | grep -e 'Sketch uses' | sed 's/.*uses \([0-9]*\).\([0-9]\+\).*/\1\2/') - - if [ -e 'examples/JsonGeneratorExample/JsonGeneratorExample.ino' ]; then - GENERATOR_SIZE=$(arduino --verify examples/JsonGeneratorExample/JsonGeneratorExample.ino 2>/dev/null | grep -e 'Sketch uses' | sed 's/.*uses \([0-9]*\).\([0-9]\+\).*/\1\2/') - else - GENERATOR_SIZE="" - fi - - echo $TAG - if [ ! -z "$PARSER_SIZE" ] - then - echo "JsonParserExample = $PARSER_SIZE bytes" - else - echo "JsonParserExample compilation failed." - fi - - if [ ! -z "$GENERATOR_SIZE" ] - then - echo "JsonGeneratorExample = $GENERATOR_SIZE bytes" - else - echo "JsonGeneratorExample compilation failed." - fi - - echo "$TAG;$DATE;$PARSER_SIZE;$GENERATOR_SIZE" >> $OUTPUT - -done From 0bc03e8071a74f18d5ef4c361f286b1035516b3d Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Tue, 4 Dec 2018 11:19:22 +0100 Subject: [PATCH 2/3] Removed spurious files in the Particle library --- CHANGELOG.md | 5 +++++ scripts/publish-particle-library.sh | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 scripts/publish-particle-library.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index b2a62624..ebe70440 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ ArduinoJson: change log ======================= +HEAD +---- + +* Removed spurious files in the Particle library + v5.13.3 ------- diff --git a/scripts/publish-particle-library.sh b/scripts/publish-particle-library.sh new file mode 100644 index 00000000..e37e7965 --- /dev/null +++ b/scripts/publish-particle-library.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash + +set -eu + +SOURCE_DIR="$(dirname "$0")/.." +WORK_DIR=$(mktemp -d) +trap 'rm -rf "$WORK_DIR"' EXIT + +cp "$SOURCE_DIR/README.md" "$WORK_DIR/README.md" +cp "$SOURCE_DIR/CHANGELOG.md" "$WORK_DIR/CHANGELOG.md" +cp "$SOURCE_DIR/library.properties" "$WORK_DIR/library.properties" +cp "$SOURCE_DIR/LICENSE.md" "$WORK_DIR/LICENSE.txt" +cp -r "$SOURCE_DIR/src" "$WORK_DIR/" +cp -r "$SOURCE_DIR/examples" "$WORK_DIR/" + +cd "$WORK_DIR" +particle library upload +particle library publish From ef12c74771f1f5b7d183003b24660ad75470568f Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Tue, 4 Dec 2018 11:36:16 +0100 Subject: [PATCH 3/3] Set version to 5.13.4 --- CHANGELOG.md | 4 ++-- appveyor.yml | 2 +- library.json | 2 +- library.properties | 2 +- src/ArduinoJson/version.hpp | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ebe70440..18240dc5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ ArduinoJson: change log ======================= -HEAD ----- +v5.13.4 +------- * Removed spurious files in the Particle library diff --git a/appveyor.yml b/appveyor.yml index cbb7447f..11bf3516 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 5.13.3.{build} +version: 5.13.4.{build} environment: matrix: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 diff --git a/library.json b/library.json index bc4997a7..d616599c 100644 --- a/library.json +++ b/library.json @@ -7,7 +7,7 @@ "type": "git", "url": "https://github.com/bblanchon/ArduinoJson.git" }, - "version": "5.13.3", + "version": "5.13.4", "authors": { "name": "Benoit Blanchon", "url": "https://blog.benoitblanchon.fr" diff --git a/library.properties b/library.properties index f9dd1dd1..67ccbb95 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=ArduinoJson -version=5.13.3 +version=5.13.4 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 e5fa1e2e..34c78461 100644 --- a/src/ArduinoJson/version.hpp +++ b/src/ArduinoJson/version.hpp @@ -4,7 +4,7 @@ #pragma once -#define ARDUINOJSON_VERSION "5.13.3" +#define ARDUINOJSON_VERSION "5.13.4" #define ARDUINOJSON_VERSION_MAJOR 5 #define ARDUINOJSON_VERSION_MINOR 13 -#define ARDUINOJSON_VERSION_REVISION 3 +#define ARDUINOJSON_VERSION_REVISION 4