diff --git a/CHANGELOG.md b/CHANGELOG.md index 853ad44c..c859dbad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ ArduinoJson: change log ======================= -HEAD ----- +v6.3.0-beta (2018-08-31) +----------- * Implemented reference semantics for `JsonVariant` * Replace `JsonPair`'s `key` and `value` with `key()` and `value()` diff --git a/library.json b/library.json index 847ff046..5c7850a6 100644 --- a/library.json +++ b/library.json @@ -7,7 +7,7 @@ "type": "git", "url": "https://github.com/bblanchon/ArduinoJson.git" }, - "version": "6.2.3-beta", + "version": "6.3.0-beta", "authors": { "name": "Benoit Blanchon", "url": "https://blog.benoitblanchon.fr" diff --git a/library.properties b/library.properties index 82ae5500..6fd8d242 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=ArduinoJson -version=6.2.3-beta +version=6.3.0-beta author=Benoit Blanchon maintainer=Benoit Blanchon sentence=An efficient and elegant JSON library for Arduino. diff --git a/scripts/publish.sh b/scripts/publish.sh new file mode 100644 index 00000000..466a5c29 --- /dev/null +++ b/scripts/publish.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +set -eux + +cd "$(dirname "$0")/.." + +VERSION="$1" +DATE=$(date +%F) +TAG="v$VERSION" + +update_version_in_source () { + IFS=".-" read MAJOR MINOR REVISION EXTRA < <(echo "$VERSION") + UNDERLINE=$(printf -- '-%.0s' $(seq 1 ${#TAG})) + + sed -i~ -bE "4s/HEAD/$TAG ($DATE)/; 5s/-+/$UNDERLINE/" CHANGELOG.md + rm CHANGELOG.md*~ + sed -i~ -bE "s/\"version\":.*$/\"version\": \"$VERSION\",/" library.json + rm library.json*~ + + sed -i~ -bE "s/version=.*$/version=$VERSION/" library.properties + rm library.properties*~ + + sed -i~ -bE \ + -e "s/ARDUINOJSON_VERSION .*$/ARDUINOJSON_VERSION \"$VERSION\"/" \ + -e "s/ARDUINOJSON_VERSION_MAJOR .*$/ARDUINOJSON_VERSION_MAJOR $MAJOR/" \ + -e "s/ARDUINOJSON_VERSION_MINOR .*$/ARDUINOJSON_VERSION_MINOR $MINOR/" \ + -e "s/ARDUINOJSON_VERSION_REVISION .*$/ARDUINOJSON_VERSION_REVISION $REVISION/" \ + src/ArduinoJson/version.hpp + rm src/ArduinoJson/version.hpp*~ +} + +commit_new_version () { + git add src/ArduinoJson/version.hpp CHANGELOG.md library.json library.properties + git commit -m "Set version to $VERSION" +} + +add_tag () { + CHANGES=$(awk '/\* /{ FOUND=1; print; next } { if (FOUND) exit}' CHANGELOG.md) + git tag -m "ArduinoJson $VERSION\n$CHANGES" $TAG +} + +update_version_in_source +commit_new_version +add_tag diff --git a/scripts/set-version.sh b/scripts/set-version.sh deleted file mode 100644 index 9b4453c5..00000000 --- a/scripts/set-version.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env bash - -set -eu - -cd "$(dirname $0)/.." - -VERSION="$1" -DATE=$(date +%F) -IFS=".-" read MAJOR MINOR REVISION EXTRA < <(echo "$VERSION") -TAG="v$VERSION" -UNDERLINE=$(printf -- '-%.0s' $(seq 1 ${#TAG})) - -sed -i~ -bE "4s/HEAD/$TAG ($DATE)/; 5s/-+/$UNDERLINE/" CHANGELOG.md -rm CHANGELOG.md*~ -sed -i~ -bE "s/\"version\":.*$/\"version\": \"$VERSION\",/" library.json -rm library.json*~ - -sed -i~ -bE "s/version=.*$/version=$VERSION/" library.properties -rm library.properties*~ - -sed -i~ -bE \ - -e "s/ARDUINOJSON_VERSION .*$/ARDUINOJSON_VERSION \"$VERSION\"/" \ - -e "s/ARDUINOJSON_VERSION_MAJOR .*$/ARDUINOJSON_VERSION_MAJOR $MAJOR/" \ - -e "s/ARDUINOJSON_VERSION_MINOR .*$/ARDUINOJSON_VERSION_MINOR $MINOR/" \ - -e "s/ARDUINOJSON_VERSION_REVISION .*$/ARDUINOJSON_VERSION_REVISION $REVISION/" \ - src/ArduinoJson/version.hpp -rm src/ArduinoJson/version.hpp*~ diff --git a/src/ArduinoJson/version.hpp b/src/ArduinoJson/version.hpp index 34f227f0..c169632a 100644 --- a/src/ArduinoJson/version.hpp +++ b/src/ArduinoJson/version.hpp @@ -4,7 +4,7 @@ #pragma once -#define ARDUINOJSON_VERSION "6.2.3-beta" +#define ARDUINOJSON_VERSION "6.3.0-beta" #define ARDUINOJSON_VERSION_MAJOR 6 -#define ARDUINOJSON_VERSION_MINOR 2 -#define ARDUINOJSON_VERSION_REVISION 3 +#define ARDUINOJSON_VERSION_MINOR 3 +#define ARDUINOJSON_VERSION_REVISION 0