From e7a0d63570738275945aa398a66f2992b3bca653 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Tue, 24 Sep 2019 22:32:53 +0200
Subject: [PATCH] Bump versions

---
 debian/changelog    |  4 ++++
 debian/control      |  2 +-
 nymea.pri           |  4 ++--
 tests/auto/api.json | 28 ++++++++++++++++++----------
 4 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 784e7948..cb28baa9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
 
   [ Michael Zanetti ]
diff --git a/debian/control b/debian/control
index 71d9d022..d7806291 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 9.0.0),
                libqt5sql5-sqlite,
                libqt5dbus5,
                libssl-dev,
-               libnymea-mqtt-dev,
+               libnymea-mqtt-dev (>= 0.1.2),
                dbus-test-runner,
 
 Package: nymea
diff --git a/nymea.pri b/nymea.pri
index 99b08753..9196a1fe 100644
--- a/nymea.pri
+++ b/nymea.pri
@@ -2,8 +2,8 @@
 NYMEA_VERSION_STRING=$$system('dpkg-parsechangelog | sed -n -e "s/^Version: //p"')
 
 # define protocol versions
-JSON_PROTOCOL_VERSION_MAJOR=2
-JSON_PROTOCOL_VERSION_MINOR=4
+JSON_PROTOCOL_VERSION_MAJOR=3
+JSON_PROTOCOL_VERSION_MINOR=0
 REST_API_VERSION=1
 LIBNYMEA_API_VERSION_MAJOR=3
 LIBNYMEA_API_VERSION_MINOR=0
diff --git a/tests/auto/api.json b/tests/auto/api.json
index 35343857..0a1a6309 100644
--- a/tests/auto/api.json
+++ b/tests/auto/api.json
@@ -1,4 +1,4 @@
-2.3
+3.0
 {
     "methods": {
         "Actions.ExecuteAction": {
@@ -11,7 +11,8 @@
                 ]
             },
             "returns": {
-                "deviceError": "$ref:DeviceError"
+                "deviceError": "$ref:DeviceError",
+                "o:displayMessage": "String"
             }
         },
         "Actions.ExecuteBrowserItem": {
@@ -270,7 +271,8 @@
             },
             "returns": {
                 "deviceError": "$ref:DeviceError",
-                "o:deviceId": "Uuid"
+                "o:deviceId": "Uuid",
+                "o:displayMessage": "String"
             }
         },
         "Devices.BrowseDevice": {
@@ -287,14 +289,16 @@
             }
         },
         "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": {
                 "o:secret": "String",
+                "o:username": "String",
                 "pairingTransactionId": "Uuid"
             },
             "returns": {
                 "deviceError": "$ref:DeviceError",
-                "o:deviceId": "Uuid"
+                "o:deviceId": "Uuid",
+                "o:displayMessage": "String"
             }
         },
         "Devices.EditDevice": {
@@ -352,7 +356,8 @@
                 "deviceError": "$ref:DeviceError",
                 "o:deviceDescriptors": [
                     "$ref:DeviceDescriptor"
-                ]
+                ],
+                "o:displayMessage": "String"
             }
         },
         "Devices.GetEventTypes": {
@@ -459,6 +464,7 @@
             "returns": {
                 "deviceError": "$ref:DeviceError",
                 "o:displayMessage": "String",
+                "o:oAuthUrl": "String",
                 "o:pairingTransactionId": "Uuid",
                 "o:setupMethod": "$ref:SetupMethod"
             }
@@ -473,7 +479,8 @@
                 ]
             },
             "returns": {
-                "deviceError": "$ref:DeviceError"
+                "deviceError": "$ref:DeviceError",
+                "o:displayMessage": "String"
             }
         },
         "Devices.RemoveConfiguredDevice": {
@@ -1523,8 +1530,7 @@
             "DeviceErrorSetupMethodNotSupported",
             "DeviceErrorHardwareNotAvailable",
             "DeviceErrorHardwareFailure",
-            "DeviceErrorAuthentificationFailure",
-            "DeviceErrorAsync",
+            "DeviceErrorAuthenticationFailure",
             "DeviceErrorDeviceInUse",
             "DeviceErrorDeviceInRule",
             "DeviceErrorDeviceIsChild",
@@ -1801,7 +1807,9 @@
             "SetupMethodJustAdd",
             "SetupMethodDisplayPin",
             "SetupMethodEnterPin",
-            "SetupMethodPushButton"
+            "SetupMethodPushButton",
+            "SetupMethodUserAndPassword",
+            "SetupMethodOAuth"
         ],
         "State": {
             "deviceId": "Uuid",