Compare commits

..

5 Commits
1.0.1 ... 1.1.3

Author SHA1 Message Date
Francois BIOT
f498995aee Enhancement to bump version 2023-09-10 19:56:21 +02:00
Francois BIOT
8e44e610b3 Release 1.1.2 2023-09-10 19:17:56 +02:00
Francois BIOT
e66eb7aa6a Fix json skeleton so IDE could now view new releases 2023-09-10 19:16:16 +02:00
Francois BIOT
4b4e72905e Release 1.1.0 2023-09-10 19:09:28 +02:00
Francois BIOT
a717ecd66d Release 1.0.1 2023-09-10 19:05:44 +02:00
5 changed files with 23 additions and 8 deletions

View File

@@ -1,5 +1,11 @@
#!/bin/bash #!/bin/bash
current_version=$(git describe --tags --abbrev=0) current_version=$(git describe --tags --abbrev=0)
function error
{
echo
echo "ERROR *** $1"
}
if [ "$1" == "-d" ]; then if [ "$1" == "-d" ]; then
do=0 do=0
shift shift
@@ -15,8 +21,14 @@ if [ "$1" == "" ]; then
echo " Current version: $current_version" echo " Current version: $current_version"
echo echo
else else
tm=$(git status --porcelain -- src/TinyMqtt.h | wc -l)
echo "Current version: ($current_version)" echo "Current version: ($current_version)"
echo "New version : ($1)" echo "New version : ($1)"
echo "Take info from : library.properties"
if [ "$tm" == "1" ]; then
error "You cannot bump version if TinyMqtt.h is modified"
exit
fi
echo -n "Do you want to proceed ? " echo -n "Do you want to proceed ? "
read a read a
if [ "$a" == "y" ]; then if [ "$a" == "y" ]; then
@@ -24,6 +36,7 @@ else
grep $current_version library.properties grep $current_version library.properties
if [ "$?" == "0" ]; then if [ "$?" == "0" ]; then
sed -i "s/$current_version/$1/" library.properties sed -i "s/$current_version/$1/" library.properties
sed -i "s/#define TINY_MQTT_REVISION/#define TINY_MQTT_REVISION \"$1\"/" src/TinyMqtt.h
cp library.json.skeleton library.json cp library.json.skeleton library.json
while ifs= read -r line; do while ifs= read -r line; do
@@ -47,15 +60,15 @@ else
sed -i "s/'/\"/g" library.json sed -i "s/'/\"/g" library.json
if [ "$do" == "1" ]; then if [ "$do" == "1" ]; then
echo "Pushing all" echo "Pushing all"
git commit -m "Release $1 $2"
git tag $1 git tag $1
git add library.properties git add library.properties
git add library.json git add library.json
git commit -m "Release $1 $2"
git push git push
git push --tags git push --tags
fi fi
else else
echo "Current version does not match library.property version, aborting" error "Current version does not match library.property version, aborting"
fi fi
fi fi
fi fi

View File

@@ -1,14 +1,14 @@
{ {
"name": "TinyMqtt", "name": "TinyMqtt",
"keywords": "ethernet, mqtt, m2m, iot", "keywords": [ "ethernet, mqtt, m2m, iot" ],
"description": "MQTT is a lightweight messaging protocol. This library allows to host a broker or to use a mqtt client in your ESP 8266 or 32 WROOM. It does support MQTT 3.1.1 with QoS", "description": "A lightweight MQTT library for ESP8266 and ESP32, supporting MQTT 3.1.1 with QoS and allowing to create a Mqtt broker",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/hsaturn/TinyMqtt.git" "url": "https://github.com/hsaturn/TinyMqtt.git"
}, },
"dependencies": "dependencies":
{ "hsaturn/TinyConsole" : "*" }, { "hsaturn/TinyConsole" : "*" },
"version": "1.0.0", "version": "1.1.2",
"exclude": "", "exclude": "",
"examples": "examples/*/*.ino", "examples": "examples/*/*.ino",
"frameworks": "arduino", "frameworks": "arduino",

View File

@@ -1,6 +1,6 @@
{ {
"name": "#name", "name": "#name",
"keywords": "ethernet, mqtt, m2m, iot", "keywords": [ "ethernet, mqtt, m2m, iot" ],
"description": "#paragraph", "description": "#paragraph",
"repository": { "repository": {
"type": "git", "type": "git",

View File

@@ -1,9 +1,9 @@
name=TinyMqtt name=TinyMqtt
version=1.0.0 version=1.1.2
author=Francois BIOT, HSaturn, <hsaturn@gmail.com> author=Francois BIOT, HSaturn, <hsaturn@gmail.com>
maintainer=Francois BIOT <hsaturn@gmail.com> maintainer=Francois BIOT <hsaturn@gmail.com>
sentence=A tiny broker and client library for MQTT messaging. sentence=A tiny broker and client library for MQTT messaging.
paragraph=MQTT is a lightweight messaging protocol. This library allows to host a broker or to use a mqtt client in your ESP 8266 or 32 WROOM. It does support MQTT 3.1.1 with QoS=0, and is intented to be as smallest as possible, keeping a good efficiency (about 1k msg per second on ESP8266 12F). paragraph=A lightweight MQTT library for ESP8266 and ESP32, supporting MQTT 3.1.1 with QoS and allowing to create a Mqtt broker
category=Communication category=Communication
url=https://github.com/hsaturn/TinyMqtt url=https://github.com/hsaturn/TinyMqtt
architectures=* architectures=*

View File

@@ -1,6 +1,8 @@
// vim: ts=2 sw=2 expandtab // vim: ts=2 sw=2 expandtab
#pragma once #pragma once
#define TINY_MQTT_REVISION "1.1.2"
#ifndef TINY_MQTT_DEBUG #ifndef TINY_MQTT_DEBUG
#define TINY_MQTT_DEBUG 0 #define TINY_MQTT_DEBUG 0
#endif #endif