Bump versions

This commit is contained in:
Michael Zanetti 2019-09-24 22:32:53 +02:00
parent fe5af9a0f5
commit e7a0d63570
4 changed files with 25 additions and 13 deletions

4
debian/changelog vendored
View File

@ -1,3 +1,7 @@
nymea (0.16.0) UNRELEASED; urgency=medium
-- Michael Zanetti <michael.zanetti@guh.io> Fri, 20 Sep 2019 12:39:23 +0200
nymea (0.15.1) xenial; urgency=medium nymea (0.15.1) xenial; urgency=medium
[ Michael Zanetti ] [ Michael Zanetti ]

2
debian/control vendored
View File

@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 9.0.0),
libqt5sql5-sqlite, libqt5sql5-sqlite,
libqt5dbus5, libqt5dbus5,
libssl-dev, libssl-dev,
libnymea-mqtt-dev, libnymea-mqtt-dev (>= 0.1.2),
dbus-test-runner, dbus-test-runner,
Package: nymea Package: nymea

View File

@ -2,8 +2,8 @@
NYMEA_VERSION_STRING=$$system('dpkg-parsechangelog | sed -n -e "s/^Version: //p"') NYMEA_VERSION_STRING=$$system('dpkg-parsechangelog | sed -n -e "s/^Version: //p"')
# define protocol versions # define protocol versions
JSON_PROTOCOL_VERSION_MAJOR=2 JSON_PROTOCOL_VERSION_MAJOR=3
JSON_PROTOCOL_VERSION_MINOR=4 JSON_PROTOCOL_VERSION_MINOR=0
REST_API_VERSION=1 REST_API_VERSION=1
LIBNYMEA_API_VERSION_MAJOR=3 LIBNYMEA_API_VERSION_MAJOR=3
LIBNYMEA_API_VERSION_MINOR=0 LIBNYMEA_API_VERSION_MINOR=0

View File

@ -1,4 +1,4 @@
2.3 3.0
{ {
"methods": { "methods": {
"Actions.ExecuteAction": { "Actions.ExecuteAction": {
@ -11,7 +11,8 @@
] ]
}, },
"returns": { "returns": {
"deviceError": "$ref:DeviceError" "deviceError": "$ref:DeviceError",
"o:displayMessage": "String"
} }
}, },
"Actions.ExecuteBrowserItem": { "Actions.ExecuteBrowserItem": {
@ -270,7 +271,8 @@
}, },
"returns": { "returns": {
"deviceError": "$ref:DeviceError", "deviceError": "$ref:DeviceError",
"o:deviceId": "Uuid" "o:deviceId": "Uuid",
"o:displayMessage": "String"
} }
}, },
"Devices.BrowseDevice": { "Devices.BrowseDevice": {
@ -287,14 +289,16 @@
} }
}, },
"Devices.ConfirmPairing": { "Devices.ConfirmPairing": {
"description": "Confirm an ongoing pairing. In case of SetupMethodEnterPin also provide the pin in the params.", "description": "Confirm an ongoing pairing. For SetupMethodUserAndPassword, provide the username in the \"username\" field and the password in the \"secret\" field. For SetupMethodEnterPin and provide the PIN in the \"secret\" field. For SetupMethodOAuth, return the entire unmodified callback URL containing the code parameter back in the secret field.",
"params": { "params": {
"o:secret": "String", "o:secret": "String",
"o:username": "String",
"pairingTransactionId": "Uuid" "pairingTransactionId": "Uuid"
}, },
"returns": { "returns": {
"deviceError": "$ref:DeviceError", "deviceError": "$ref:DeviceError",
"o:deviceId": "Uuid" "o:deviceId": "Uuid",
"o:displayMessage": "String"
} }
}, },
"Devices.EditDevice": { "Devices.EditDevice": {
@ -352,7 +356,8 @@
"deviceError": "$ref:DeviceError", "deviceError": "$ref:DeviceError",
"o:deviceDescriptors": [ "o:deviceDescriptors": [
"$ref:DeviceDescriptor" "$ref:DeviceDescriptor"
] ],
"o:displayMessage": "String"
} }
}, },
"Devices.GetEventTypes": { "Devices.GetEventTypes": {
@ -459,6 +464,7 @@
"returns": { "returns": {
"deviceError": "$ref:DeviceError", "deviceError": "$ref:DeviceError",
"o:displayMessage": "String", "o:displayMessage": "String",
"o:oAuthUrl": "String",
"o:pairingTransactionId": "Uuid", "o:pairingTransactionId": "Uuid",
"o:setupMethod": "$ref:SetupMethod" "o:setupMethod": "$ref:SetupMethod"
} }
@ -473,7 +479,8 @@
] ]
}, },
"returns": { "returns": {
"deviceError": "$ref:DeviceError" "deviceError": "$ref:DeviceError",
"o:displayMessage": "String"
} }
}, },
"Devices.RemoveConfiguredDevice": { "Devices.RemoveConfiguredDevice": {
@ -1523,8 +1530,7 @@
"DeviceErrorSetupMethodNotSupported", "DeviceErrorSetupMethodNotSupported",
"DeviceErrorHardwareNotAvailable", "DeviceErrorHardwareNotAvailable",
"DeviceErrorHardwareFailure", "DeviceErrorHardwareFailure",
"DeviceErrorAuthentificationFailure", "DeviceErrorAuthenticationFailure",
"DeviceErrorAsync",
"DeviceErrorDeviceInUse", "DeviceErrorDeviceInUse",
"DeviceErrorDeviceInRule", "DeviceErrorDeviceInRule",
"DeviceErrorDeviceIsChild", "DeviceErrorDeviceIsChild",
@ -1801,7 +1807,9 @@
"SetupMethodJustAdd", "SetupMethodJustAdd",
"SetupMethodDisplayPin", "SetupMethodDisplayPin",
"SetupMethodEnterPin", "SetupMethodEnterPin",
"SetupMethodPushButton" "SetupMethodPushButton",
"SetupMethodUserAndPassword",
"SetupMethodOAuth"
], ],
"State": { "State": {
"deviceId": "Uuid", "deviceId": "Uuid",