From 8e9b695eb6c04fdd8eb96bc97ce12a573b59cc87 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Mon, 18 Mar 2019 23:20:24 +0100
Subject: [PATCH] bump jsonrpc version

---
 nymea.pri           |  4 +--
 tests/auto/api.json | 71 +--------------------------------------------
 2 files changed, 3 insertions(+), 72 deletions(-)

diff --git a/nymea.pri b/nymea.pri
index bb18123e..77559dc7 100644
--- a/nymea.pri
+++ b/nymea.pri
@@ -5,8 +5,8 @@ NYMEA_VERSION_STRING=$$system('dpkg-parsechangelog | sed -n -e "s/^Version: //p"
 NYMEA_PLUGINS_PATH=/usr/lib/$$system('dpkg-architecture -q DEB_HOST_MULTIARCH')/nymea/plugins/
 
 # define protocol versions
-JSON_PROTOCOL_VERSION_MAJOR=1
-JSON_PROTOCOL_VERSION_MINOR=15
+JSON_PROTOCOL_VERSION_MAJOR=2
+JSON_PROTOCOL_VERSION_MINOR=0
 REST_API_VERSION=1
 
 DEFINES += NYMEA_VERSION_STRING=\\\"$${NYMEA_VERSION_STRING}\\\" \
diff --git a/tests/auto/api.json b/tests/auto/api.json
index 09637c65..d6df40d4 100644
--- a/tests/auto/api.json
+++ b/tests/auto/api.json
@@ -1,4 +1,4 @@
-1.15
+2.0
 {
     "methods": {
         "Actions.ExecuteAction": {
@@ -1164,26 +1164,6 @@
                 "$ref:ParamType"
             ]
         },
-        "BasicTag": [
-            "BasicTagService",
-            "BasicTagDevice",
-            "BasicTagSensor",
-            "BasicTagActuator",
-            "BasicTagLighting",
-            "BasicTagEnergy",
-            "BasicTagMultimedia",
-            "BasicTagWeather",
-            "BasicTagGateway",
-            "BasicTagHeating",
-            "BasicTagCooling",
-            "BasicTagNotification",
-            "BasicTagSecurity",
-            "BasicTagTime",
-            "BasicTagShading",
-            "BasicTagAppliance",
-            "BasicTagCamera",
-            "BasicTagLock"
-        ],
         "BasicType": [
             "Uuid",
             "String",
@@ -1244,13 +1224,9 @@
             "actionTypes": [
                 "$ref:ActionType"
             ],
-            "basicTags": [
-                "$ref:BasicTag"
-            ],
             "createMethods": [
                 "$ref:CreateMethod"
             ],
-            "deviceIcon": "$ref:DeviceIcon",
             "discoveryParamTypes": [
                 "$ref:ParamType"
             ],
@@ -1263,9 +1239,6 @@
                 "String"
             ],
             "name": "String",
-            "o:criticalStateTypeId": "Uuid",
-            "o:primaryActionTypeId": "Uuid",
-            "o:primaryStateTypeId": "Uuid",
             "paramTypes": [
                 "$ref:ParamType"
             ],
@@ -1311,44 +1284,6 @@
             "DeviceErrorPairingTransactionIdNotFound",
             "DeviceErrorParameterNotWritable"
         ],
-        "DeviceIcon": [
-            "DeviceIconNone",
-            "DeviceIconBed",
-            "DeviceIconBlinds",
-            "DeviceIconCeilingLamp",
-            "DeviceIconCouch",
-            "DeviceIconDeskLamp",
-            "DeviceIconDesk",
-            "DeviceIconHifi",
-            "DeviceIconPower",
-            "DeviceIconEnergy",
-            "DeviceIconRadio",
-            "DeviceIconSmartPhone",
-            "DeviceIconSocket",
-            "DeviceIconStandardLamp",
-            "DeviceIconSun",
-            "DeviceIconTablet",
-            "DeviceIconThermometer",
-            "DeviceIconTune",
-            "DeviceIconTv",
-            "DeviceIconBattery",
-            "DeviceIconDishwasher",
-            "DeviceIconWashingMachine",
-            "DeviceIconLaundryDryer",
-            "DeviceIconIrHeater",
-            "DeviceIconRadiator",
-            "DeviceIconSwitch",
-            "DeviceIconMotionDetectors",
-            "DeviceIconWeather",
-            "DeviceIconTime",
-            "DeviceIconLightBulb",
-            "DeviceIconGateway",
-            "DeviceIconMail",
-            "DeviceIconNetwork",
-            "DeviceIconCloud",
-            "DeviceIconGarage",
-            "DeviceIconRollerShutter"
-        ],
         "Event": {
             "deviceId": "Uuid",
             "eventTypeId": "Uuid",
@@ -1370,8 +1305,6 @@
             "id": "Uuid",
             "index": "Int",
             "name": "String",
-            "o:graphRelevant": "Bool",
-            "o:ruleRelevant": "Bool",
             "paramTypes": [
                 "$ref:ParamType"
             ]
@@ -1628,13 +1561,11 @@
             "id": "Uuid",
             "index": "Int",
             "name": "String",
-            "o:graphRelevant": "Bool",
             "o:maxValue": "Variant",
             "o:minValue": "Variant",
             "o:possibleValues": [
                 "Variant"
             ],
-            "o:ruleRelevant": "Bool",
             "o:unit": "$ref:Unit",
             "type": "$ref:BasicType"
         },