From e53d9c910cbfc0522b8f8850f43e2d9044ed01f1 Mon Sep 17 00:00:00 2001 From: Donald Kirker Date: Wed, 14 Jun 2017 17:35:11 -0700 Subject: [PATCH 1/4] DVCSMP-2698 Temporary bandage to properly show valve states in the device tile of local running devices --- .../fortrezz-water-valve.src/fortrezz-water-valve.groovy | 8 ++++---- .../smartthings/zigbee-valve.src/zigbee-valve.groovy | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/devicetypes/smartthings/fortrezz-water-valve.src/fortrezz-water-valve.groovy b/devicetypes/smartthings/fortrezz-water-valve.src/fortrezz-water-valve.groovy index b50c7df..418b9f6 100644 --- a/devicetypes/smartthings/fortrezz-water-valve.src/fortrezz-water-valve.groovy +++ b/devicetypes/smartthings/fortrezz-water-valve.src/fortrezz-water-valve.groovy @@ -35,8 +35,8 @@ metadata { // tile definitions tiles(scale: 2) { - multiAttributeTile(name:"valve", type: "generic", width: 6, height: 4, canChangeIcon: true){ - tileAttribute ("device.valve", key: "PRIMARY_CONTROL") { + multiAttributeTile(name:"contact", type: "generic", width: 6, height: 4, canChangeIcon: true){ + tileAttribute ("device.contact", key: "PRIMARY_CONTROL") { attributeState "open", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC", nextState:"closing" attributeState "closed", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#ffffff", nextState:"opening" attributeState "opening", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC" @@ -48,8 +48,8 @@ metadata { state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh" } - main "valve" - details(["valve","refresh"]) + main "contact" + details(["contact","refresh"]) } } diff --git a/devicetypes/smartthings/zigbee-valve.src/zigbee-valve.groovy b/devicetypes/smartthings/zigbee-valve.src/zigbee-valve.groovy index 2dab99f..ff9c7eb 100644 --- a/devicetypes/smartthings/zigbee-valve.src/zigbee-valve.groovy +++ b/devicetypes/smartthings/zigbee-valve.src/zigbee-valve.groovy @@ -38,8 +38,8 @@ metadata { } tiles(scale: 2) { - multiAttributeTile(name:"valve", type: "generic", width: 6, height: 4, canChangeIcon: true){ - tileAttribute ("device.valve", key: "PRIMARY_CONTROL") { + multiAttributeTile(name:"contact", type: "generic", width: 6, height: 4, canChangeIcon: true){ + tileAttribute ("device.contact", key: "PRIMARY_CONTROL") { attributeState "open", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC", nextState:"closing" attributeState "closed", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#ffffff", nextState:"opening" attributeState "opening", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC", nextState:"closing" @@ -58,8 +58,8 @@ metadata { state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh" } - main(["valve"]) - details(["valve", "battery", "refresh"]) + main(["contact"]) + details(["contact", "battery", "refresh"]) } } From cc70865fbf957841c20384c373fe72f4519d0bc4 Mon Sep 17 00:00:00 2001 From: Vinay Rao Date: Mon, 19 Jun 2017 11:21:05 -0700 Subject: [PATCH 2/4] DVCSMP-2701 Update Deployment Jobs to new Artifactory --- build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 8f7b27b..08d5e86 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ apply plugin: 'smartthings-slack' buildscript { dependencies { - classpath "com.smartthings.deployment:executable-deployment-scripts:1.0.11" + classpath "com.smartthings.deployment:executable-deployment-scripts:1.0.12" } repositories { mavenLocal() @@ -74,19 +74,19 @@ slackSendMessage { String username switch (branch) { case 'master': - username = 'Hickory' + username = 'DEV' iconUrl = wolverine color = '#35D0F2' messageText = 'Began deployment of _SmartThingsPublic[master]_ branch to the _Dev_ environments.' break case 'staging': - username = 'Dickory' + username = 'STG' iconUrl = beach color = '#FFDE20' messageText = 'Began deployment of _SmartThingsPublic[staging]_ branch to the _Staging_ environments.' break case 'production': - username = 'Dock' + username = 'PRD' iconUrl = drinks color = '#FF1D23' messageText = 'Began deployment of _SmartThingsPublic[production]_ branch to the _Prod_ environments.' From 20407441d9dab2dacba2b3010fe784ee85f14ec7 Mon Sep 17 00:00:00 2001 From: Vinay Rao Date: Mon, 19 Jun 2017 14:23:44 -0700 Subject: [PATCH 3/4] DVCSMP-2701 Update Deployment Jobs to new Artifactory. set build gradle to new artifactory server --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 08d5e86..f2dc8da 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ buildscript { username smartThingsArtifactoryUserName password smartThingsArtifactoryPassword } - url "https://artifactory.smartthings.com/libs-release-local" + url "https://smartthings.jfrog.io/smartthings/libs-release-local" } } } @@ -32,7 +32,7 @@ repositories { username smartThingsArtifactoryUserName password smartThingsArtifactoryPassword } - url "https://artifactory.smartthings.com/libs-release-local" + url "https://smartthings.jfrog.io/smartthings/libs-release-local" } } From 7f13dd356d982142f069b07f3d915978d057393d Mon Sep 17 00:00:00 2001 From: Vinay Rao Date: Mon, 19 Jun 2017 16:24:58 -0700 Subject: [PATCH 4/4] Fix circle ci issues with new artifactory server --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index f2dc8da..6e709ef 100644 --- a/build.gradle +++ b/build.gradle @@ -51,10 +51,10 @@ sourceSets { dependencies { devicetypesCompile 'org.codehaus.groovy:groovy-all:2.4.7' - devicetypesCompile 'smartthings:appengine-z-wave:0.1.2' - devicetypesCompile 'smartthings:appengine-zigbee:0.1.11' + devicetypesCompile 'smartthings:appengine-z-wave:0.1.3' + devicetypesCompile 'smartthings:appengine-zigbee:0.1.12' smartappsCompile 'org.codehaus.groovy:groovy-all:2.4.7' - smartappsCompile 'smartthings:appengine-common:0.1.8' + smartappsCompile 'smartthings:appengine-common:0.1.9' smartappsCompile 'org.codehaus.groovy.modules.http-builder:http-builder:0.7.1' smartappsCompile 'org.grails:grails-web:2.3.11' smartappsCompile 'org.json:json:20140107'