From 22f76544441d08113dddd3c4061fa99b15896044 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Wed, 27 Nov 2019 15:35:57 +0100 Subject: [PATCH] bump some version numbers --- debian/changelog | 4 ++ nymea.pri | 2 +- tests/auto/api.json | 103 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 107 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3d9d6ef1..cad447e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,7 @@ +nymea (0.18.0) UNRELEASED; urgency=medium + + -- Michael Zanetti Wed, 27 Nov 2019 15:24:26 +0100 + nymea (0.17.0) xenial; urgency=medium [ Michael Zanetti ] diff --git a/nymea.pri b/nymea.pri index 094a6ce7..4d83f986 100644 --- a/nymea.pri +++ b/nymea.pri @@ -3,7 +3,7 @@ NYMEA_VERSION_STRING=$$system('dpkg-parsechangelog | sed -n -e "s/^Version: //p" # define protocol versions JSON_PROTOCOL_VERSION_MAJOR=4 -JSON_PROTOCOL_VERSION_MINOR=0 +JSON_PROTOCOL_VERSION_MINOR=1 LIBNYMEA_API_VERSION_MAJOR=4 LIBNYMEA_API_VERSION_MINOR=0 LIBNYMEA_API_VERSION_PATCH=0 diff --git a/tests/auto/api.json b/tests/auto/api.json index f78a8b5a..fb351a2f 100644 --- a/tests/auto/api.json +++ b/tests/auto/api.json @@ -1,4 +1,4 @@ -4.0 +4.1 { "enums": { "BasicType": [ @@ -207,6 +207,16 @@ "RuleErrorNoExitActions", "RuleErrorInterfaceNotFound" ], + "ScriptError": [ + "ScriptErrorNoError", + "ScriptErrorScriptNotFound", + "ScriptErrorInvalidScript", + "ScriptErrorHardwareFailure" + ], + "ScriptMessageType": [ + "ScriptMessageTypeLog", + "ScriptMessageTypeWarning" + ], "SetupMethod": [ "SetupMethodJustAdd", "SetupMethodDisplayPin", @@ -1223,6 +1233,57 @@ "ruleError": "$ref:RuleError" } }, + "Scripts.AddScript": { + "description": "Add a script", + "params": { + "content": "String", + "name": "String" + }, + "returns": { + "o:errors": "StringList", + "o:script": "$ref:Script", + "scriptError": "$ref:ScriptError" + } + }, + "Scripts.EditScript": { + "description": "Edit a script", + "params": { + "id": "Uuid", + "o:content": "String", + "o:name": "String" + }, + "returns": { + "o:errors": "StringList", + "scriptError": "$ref:ScriptError" + } + }, + "Scripts.GetScriptContent": { + "description": "Get a scripts content.", + "params": { + "id": "Uuid" + }, + "returns": { + "o:content": "String", + "scriptError": "$ref:ScriptError" + } + }, + "Scripts.GetScripts": { + "description": "Get all script, that is, their names and properties, but no content.", + "params": { + }, + "returns": { + "scripts": "$ref:Scripts" + } + }, + "Scripts.RemoveScript": { + "description": "remove a script", + "params": { + "id": "Uuid" + }, + "returns": { + "scriptError": "$ref:ScriptError" + } + }, "States.GetStateType": { "deprecated": "Please use the Devices namespace instead.", "description": "Get the StateType for the given stateTypeId.", @@ -1606,6 +1667,39 @@ "ruleId": "Uuid" } }, + "Scripts.ScriptAdded": { + "description": "Emitted when a script has been added to the system.", + "params": { + "script": "$ref:Script" + } + }, + "Scripts.ScriptChanged": { + "description": "Emitted when a script has been changed in the system (e.g. renamed).", + "params": { + "name": "String", + "scriptId": "Uuid" + } + }, + "Scripts.ScriptContentChanged": { + "description": "Emitted when a script's content has been changed in the system.", + "params": { + "scriptId": "Uuid" + } + }, + "Scripts.ScriptLogMessage": { + "description": "Emitted when a script produces a console message.", + "params": { + "message": "String", + "scriptId": "Uuid", + "type": "$ref:ScriptMessageType" + } + }, + "Scripts.ScriptRemoved": { + "description": "Emitted when a script has been removed from the system.", + "params": { + "id": "Uuid" + } + }, "System.CapabilitiesChanged": { "description": "Emitted whenever the system capabilities change.", "params": { @@ -1928,6 +2022,13 @@ "Rules": [ "$ref:Rule" ], + "Script": { + "name": "String", + "r:id": "Uuid" + }, + "Scripts": [ + "$ref:Script" + ], "ServerConfiguration": { "address": "String", "authenticationEnabled": "Bool",