Merge pull request #88 from SUPLA/develop

v2.3.16
SUPLA · Jul 22, 2019 · d3c4c90 · d3c4c90
2 parents 6e66904 + 89f96f1
commit d3c4c90
Show file tree

Hide file tree

Showing 47 changed files with 1,884 additions and 189 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,13 @@
+language: android
+dist: trusty
+
+notifications:
+  slack:
+    rooms:
+      - supla:dauFpwhgEGeyy9ERzqOYeJyY#github
+
+android:
+  components:
+    - build-tools-28.0.3
+    - android-28
+    - extra
diff --git a/app/app.iml b/app/app.iml
@@ -132,6 +132,8 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/validate_signing_config" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
+      <excludeFolder url="file://$MODULE_DIR$/build/test-results" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />

diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "org.supla.android"
         minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION)
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
-        versionCode 69
-        versionName "2.3.15"
+        versionCode 70
+        versionName "2.3.16"
 
         sourceSets.main {
             jniLibs.srcDir 'src/main/libs'
@@ -37,6 +37,7 @@ android {
     }
 
     lintOptions { checkReleaseBuilds false }
+    testOptions { unitTests.returnDefaultValues = true }
 
     buildToolsVersion '28.0.3'
 }