ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bump api and fix add rule

Browse Source
This commit is contained in:
Simon Stürz 2015-06-09 09:34:34 +02:00 committed by Michael Zanetti
parent 69ca5c4713
commit 8b23cc0167
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
guh.pri
View File

@ -2,7 +2,7 @@
GUH_VERSION_STRING=$$system('dpkg-parsechangelog | sed -n -e "s/^Version: //p"') GUH_VERSION_STRING=$$system('dpkg-parsechangelog | sed -n -e "s/^Version: //p"')
# define JSON protocol version # define JSON protocol version
JSON_PROTOCOL_VERSION=23 JSON_PROTOCOL_VERSION=24
DEFINES += GUH_VERSION_STRING=\\\"$${GUH_VERSION_STRING}\\\" JSON_PROTOCOL_VERSION=\\\"$${JSON_PROTOCOL_VERSION}\\\" DEFINES += GUH_VERSION_STRING=\\\"$${GUH_VERSION_STRING}\\\" JSON_PROTOCOL_VERSION=\\\"$${JSON_PROTOCOL_VERSION}\\\"

1
server/jsonrpc/ruleshandler.cpp
View File

@ -56,7 +56,6 @@ RulesHandler::RulesHandler(QObject *parent) :
params.insert("o:stateEvaluator", JsonTypes::stateEvaluatorRef()); params.insert("o:stateEvaluator", JsonTypes::stateEvaluatorRef());
params.insert("o:exitActions", QVariantList() << JsonTypes::ruleActionRef()); params.insert("o:exitActions", QVariantList() << JsonTypes::ruleActionRef());
params.insert("o:enabled", JsonTypes::basicTypeToString(JsonTypes::Bool)); params.insert("o:enabled", JsonTypes::basicTypeToString(JsonTypes::Bool));
params.insert("o:active", JsonTypes::basicTypeToString(JsonTypes::Bool));
params.insert("name", JsonTypes::basicTypeToString(JsonTypes::String)); params.insert("name", JsonTypes::basicTypeToString(JsonTypes::String));
QVariantList actions; QVariantList actions;
actions.append(JsonTypes::ruleActionRef()); actions.append(JsonTypes::ruleActionRef());

1
tests/auto/api.json
View File

@ -293,7 +293,6 @@
"$ref:RuleAction" "$ref:RuleAction"
], ],
"name": "String", "name": "String",
"o:active": "Bool",
"o:enabled": "Bool", "o:enabled": "Bool",
"o:eventDescriptor": "$ref:EventDescriptor", "o:eventDescriptor": "$ref:EventDescriptor",
"o:eventDescriptorList": [ "o:eventDescriptorList": [