Merge pull request #707 from SmartThingsCommunity/staging

Rolling down build changes to master from staging
Merge pull request #706 from SmartThingsCommunity/production
2026-04-26 14:16:20 +01:00 · 2016-03-25 16:51:58 -07:00 · 2016-03-25 16:47:12 -07:00 · 2016-03-25 16:45:47 -07:00 · 2016-03-25 18:33:15 -05:00 · 2016-03-25 11:28:19 -07:00
4 changed files with 8 additions and 8 deletions
@@ -7,9 +7,10 @@ apply plugin: 'smartthings-hipchat'

 buildscript {
    dependencies {
-        classpath "com.smartthings.deployment:executable-deployment-scripts:1.0.3"
+        classpath "com.smartthings.deployment:executable-deployment-scripts:1.0.6"
    }
    repositories {
+        mavenLocal()
        jcenter()
        maven {
            credentials {
@@ -15,13 +15,13 @@ deployment:
  develop:
    branch: master
    commands:
-      - ./gradlew deployArchives -PsmartThingsArtifactoryUserName=$ARTIFACTORY_USERNAME -PsmartThingsArtifactoryPassword=$ARTIFACTORY_PASSWORD -Ps3BucketName=$S3_BUCKET_NAME_PREPROD_DEV
+      - ./gradlew deployArchives -PsmartThingsArtifactoryUserName=$ARTIFACTORY_USERNAME -PsmartThingsArtifactoryPassword=$ARTIFACTORY_PASSWORD -Ps3Buckets="$S3_BUCKETS_DEV"
      - ./gradlew hipchatSendNotification -PsmartThingsArtifactoryUserName=$ARTIFACTORY_USERNAME -PsmartThingsArtifactoryPassword=$ARTIFACTORY_PASSWORD -Pbranch=$CIRCLE_BRANCH
      - ./gradlew hipchatShareFile -PsmartThingsArtifactoryUserName=$ARTIFACTORY_USERNAME -PsmartThingsArtifactoryPassword=$ARTIFACTORY_PASSWORD

  stage:
    branch: staging
    commands:
-      - ./gradlew deployArchives -PsmartThingsArtifactoryUserName=$ARTIFACTORY_USERNAME -PsmartThingsArtifactoryPassword=$ARTIFACTORY_PASSWORD -Ps3BucketName=$S3_BUCKET_NAME_PREPROD_STAGING
+      - ./gradlew deployArchives -PsmartThingsArtifactoryUserName=$ARTIFACTORY_USERNAME -PsmartThingsArtifactoryPassword=$ARTIFACTORY_PASSWORD -Ps3Buckets="$S3_BUCKETS_STAGE"
      - ./gradlew hipchatSendNotification -PsmartThingsArtifactoryUserName=$ARTIFACTORY_USERNAME -PsmartThingsArtifactoryPassword=$ARTIFACTORY_PASSWORD -Pbranch=$CIRCLE_BRANCH
      - ./gradlew hipchatShareFile -PsmartThingsArtifactoryUserName=$ARTIFACTORY_USERNAME -PsmartThingsArtifactoryPassword=$ARTIFACTORY_PASSWORD
@@ -41,7 +41,6 @@ metadata {
 				attributeState "locked", label:'locked', action:"lock.unlock", icon:"st.locks.lock.locked", backgroundColor:"#79b821", nextState:"unlocking"
 				attributeState "unlocked", label:'unlocked', action:"lock.lock", icon:"st.locks.lock.unlocked", backgroundColor:"#ffffff", nextState:"locking"
 				attributeState "unknown", label:"unknown", action:"lock.lock", icon:"st.locks.lock.unknown", backgroundColor:"#ffffff", nextState:"locking"
-				attributeState "jammed", label:"jammed", action:"lock.lock", icon:"st.locks.lock.unknown", backgroundColor:"#ffffff", nextState:"locking"
 				attributeState "locking", label:'locking', icon:"st.locks.lock.locked", backgroundColor:"#79b821"
 				attributeState "unlocking", label:'unlocking', icon:"st.locks.lock.unlocked", backgroundColor:"#ffffff"
 			}
@@ -131,7 +130,7 @@ def zwaveEvent(DoorLockOperationReport cmd) {
 	if (cmd.doorLockMode == 0xFF) {
 		map.value = "locked"
 	} else if (cmd.doorLockMode >= 0x40) {
-		map.value = "unknown" // XXX: Jammed?
+		map.value = "unknown"
 	} else if (cmd.doorLockMode & 1) {
 		map.value = "unlocked with timeout"
 	} else {
@@ -181,7 +180,7 @@ def zwaveEvent(physicalgraph.zwave.commands.alarmv2.AlarmReport cmd) {
 				map = [ name: "lock", value: "unknown", descriptionText: "$device.displayName was not locked fully" ]
 				break
 			case 0xB:
-				map = [ name: "lock", value: "jammed", descriptionText: "$device.displayName is jammed", displayed: true, eventType: "ALERT" ]
+				map = [ name: "lock", value: "unknown", descriptionText: "$device.displayName is jammed" ]
 				break
 			case 0xC:
 				map = [ name: "codeChanged", value: "all", descriptionText: "$device.displayName: all user codes deleted", isStateChange: true ]
@@ -267,7 +266,7 @@ def zwaveEvent(physicalgraph.zwave.commands.alarmv2.AlarmReport cmd) {
 		case 17:
 		case 23:
 		case 26:
-			map = [ name: "lock", value: "jammed", descriptionText: "$device.displayName bolt is jammed", displayed: true, eventType: "ALERT" ]
+			map = [ name: "lock", value: "unknown", descriptionText: "$device.displayName bolt is jammed" ]
 			break
 		case 13:
 			map = [ name: "codeChanged", value: cmd.alarmLevel, descriptionText: "$device.displayName code $cmd.alarmLevel was added", isStateChange: true ]
@@ -161,7 +161,7 @@ private sendDeveloperReq() {
 		headers: [
 			HOST: host
 		],
-		body: [devicetype: "$token-0", username: "$token-0"]], "${selectedHue}"))
+		body: [devicetype: "$token-0"]], "${selectedHue}"))
 }

 private discoverHueBulbs() {
Author	SHA1	Message	Date
Vinay Rao	6ac174c2f3	Merge pull request #707 from SmartThingsCommunity/staging Rolling down build changes to master from staging	2016-03-25 16:51:58 -07:00
Vinay Rao	eb8d5ed4c9	Merge pull request #706 from SmartThingsCommunity/production Rolling down build changes to staging from production	2016-03-25 16:47:12 -07:00
Vinay Rao	7b5d618de8	Merge pull request #705 from jeff-blaisdell/fix-production Update public repo to new build setup.	2016-03-25 16:45:47 -07:00
Jeff Blaisdell	c024e09fb8	Update public repo to new build setup.	2016-03-25 18:33:15 -05:00
Amol Mundayoor	e5841fb3cb	Merge pull request #702 from larsfinander/DVCSMP-1667-Update-Hue-user-creation DVCSMP-1667 Authentication needs to be updated for Philips Hue	2016-03-25 11:28:19 -07:00
Lars Finander	805b870447	DVCSMP-1667 Authentication needs to be updated for Philips Hue	2016-03-25 10:12:48 -07:00
Vinay Rao	fe92f7ad19	Merge pull request #698 from SmartThingsCommunity/master Rolling up master to staging	2016-03-24 13:25:36 -07:00
Vinay Rao	10245315ee	Merge pull request #697 from SmartThingsCommunity/staging Rolling down staging commits to master	2016-03-24 13:22:33 -07:00
Vinay Rao	0b239d4686	Merge pull request #696 from SmartThingsCommunity/revert-668-staging_remove_hue Revert "Revert "DVCSMP-1615 & DEVC-372""	2016-03-24 13:19:48 -07:00
Vinay Rao	9374290d64	Revert "Revert "DVCSMP-1615 & DEVC-372""	2016-03-24 13:12:23 -07:00
Vinay Rao	ffcacb9da5	Merge pull request #664 from SmartThingsCommunity/staging Rolling up changes to production from staging 2016-03-25 Release	2016-03-24 13:03:24 -07:00
Vinay Rao	c45129170a	Merge pull request #668 from larsfinander/staging_remove_hue Revert "DVCSMP-1615 & DEVC-372"	2016-03-24 12:56:35 -07:00
Lars Finander	633bef2ac5	Revert "DVCSMP-1615 & DEVC-372" This reverts commit `6fbef3b297`. (temporary for staging, MArch 25 deploy)	2016-03-22 14:29:32 -07:00
Vinay Rao	024a6cb698	Merge pull request #632 from SmartThingsCommunity/staging Rolling up changes to production from staging 2016-03-17 Release	2016-03-18 10:43:22 -07:00
Vinay Rao	62a965d90b	Merge pull request #599 from SmartThingsCommunity/staging Rolling up changes to production from staging 2016-03-10 Release	2016-03-10 16:26:26 -08:00
Vinay Rao	515b268374	Merge pull request #549 from SmartThingsCommunity/staging Rolling up changes to production from staging 2016-02-25 Release	2016-02-26 10:51:42 -08:00
Vinay Rao	a103d437c2	Merge pull request #523 from SmartThingsCommunity/staging Deploy to production 2/18	2016-02-18 09:28:02 -08:00
Vinay Rao	bdd88deb99	Merge pull request #504 from SmartThingsCommunity/staging Merging changes from staging to production	2016-02-11 22:40:38 -08:00