Merge remote-tracking branch 'refs/remotes/origin/alpha-development' …

…into beta-development
domoticz · Jun 16, 2016 · 3b4550d · 3b4550d
2 parents 4df6503 + bc3d643
commit 3b4550d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -126,11 +126,13 @@ dependencies {
 
     compile 'com.android.support:multidex:1.0.1'
     compile 'com.google.code.gson:gson:2.4'
+
     compile 'com.google.android.gms:play-services-analytics:8.4.0'
     compile 'com.google.android.gms:play-services-wearable:8.4.0'
     compile 'com.google.android.gms:play-services-maps:8.4.0'
     compile 'com.google.android.gms:play-services-gcm:8.4.0'
     compile 'com.google.android.gms:play-services-location:8.4.0'
+
     compile 'com.mcxiaoke.volley:library:1.0.15'
     compile 'fr.avianey.com.viewpagerindicator:library:2.4.1@aar'
     compile 'com.marvinlabs:android-floatinglabel-widgets:1.6.1@aar'

diff --git a/app/src/main/res/raw/changelog.xml b/app/src/main/res/raw/changelog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog bulletedList="false">
 
-    <changelogversion versionName="0.1.26*" changeDate="Beta">
+    <changelogversion versionName="0.1.266" changeDate="June 16, 2016">
         <changelogtext>[b]PREMIUM[/b] Added Speech Commands</changelogtext>
         <changelogtext>[b]PREMIUM[/b] Added Multi users support</changelogtext>
         <changelogtext>[b]PREMIUM[/b] NFC auto open Domoticz app</changelogtext>

diff --git a/app/version.properties b/app/version.properties
@@ -1,4 +1,4 @@
-#Fri May 20 14:16:18 CEST 2016
-VERSION_BUILD=106
-VERSION_PATCH=265
-VERSION_CODE=113
+#Thu Jun 16 10:21:23 CEST 2016
+VERSION_BUILD=142
+VERSION_PATCH=266
+VERSION_CODE=114
diff --git a/build.gradle b/build.gradle
@@ -8,12 +8,11 @@ buildscript {
     }
     //noinspection GroovyAssignabilityCheck
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
-        classpath 'com.google.gms:google-services:2.0.0-alpha3'
+        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.google.gms:google-services:2.0.0'
     }
 }
 
-
 allprojects {
     repositories {
         jcenter()

diff --git a/libs/MemorizingTrustManager/build.gradle b/libs/MemorizingTrustManager/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 	}
 	//noinspection GroovyAssignabilityCheck
 	dependencies {
-		classpath 'com.android.tools.build:gradle:2.1.0'
+		classpath 'com.android.tools.build:gradle:2.1.2'
 	}
 }