Merge remote-tracking branch 'refs/remotes/origin/develop' into develop

.travis.yml

@@ -9,7 +9,6 @@ before_script:
  - echo y | android update sdk --no-ui --all --filter extra-google-m2repository,extra-google-google_play_services
  - echo y | android update sdk --no-ui --all --filter build-tools-25.0.1
  - ./gradlew dependencies
- - sed -i -e 's/minSdkVersion = 21/minSdkVersion = 17/g' dependencies.gradle
 
 script:
  - ./gradlew checkstyle findbugs pmd

android-ddp/build.gradle

@@ -27,6 +27,11 @@ android {
     versionName "0.0.8"
   }
   buildTypes {
+    debug {
+      defaultConfig {
+        minSdkVersion rootProject.ext.minSdkVersionDebug
+      }
+    }
     release {
       minifyEnabled false
       proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

app/build.gradle

@@ -48,6 +48,11 @@ android {
     }
   }
   buildTypes {
+    debug {
+      defaultConfig {
+        minSdkVersion rootProject.ext.minSdkVersionDebug
+      }
+    }
     release {
       minifyEnabled false
       proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

dependencies.gradle

@@ -5,7 +5,8 @@ ext {
   retroLambdaPatch = 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'
   compileSdkVersion = 25
   buildToolsVersion = '25.0.1'
-  minSdkVersion = 21 //for accelerating multi-dex build. OVERRIDEN BY Circle CI to 17
+  minSdkVersionDebug = 21
+  minSdkVersion = 17
 
   supportVersion = '25.0.1'
   supportAnnotations = "com.android.support:support-annotations:$supportVersion"

realm-helpers/build.gradle

@@ -29,6 +29,11 @@ android {
     versionName "1"
   }
   buildTypes {
+    debug {
+      defaultConfig {
+        minSdkVersion rootProject.ext.minSdkVersionDebug
+      }
+    }
     release {
       minifyEnabled false
       proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

rocket-chat-android-widgets/build.gradle

@@ -22,6 +22,11 @@ android {
     vectorDrawables.useSupportLibrary = true
   }
   buildTypes {
+    debug {
+      defaultConfig {
+        minSdkVersion rootProject.ext.minSdkVersionDebug
+      }
+    }
     release {
       minifyEnabled false
       proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'