Merge remote-tracking branch 'upstream/master'

.travis.yml

@@ -23,5 +23,5 @@ before_install:
   - adb shell input keyevent 82 &
 
 script:
-  - ./gradlew :lintGoogleplayDebug
+    - ./gradlew :app:lintGoogleplayProdDebug
-  - ./gradlew :connectedGoogleplayDebugAndroidTest
+    - ./gradlew :app:connectedGoogleplayProdDebugAndroidTest

app/build.gradle

@@ -7,13 +7,10 @@ task wrapper(type: Wrapper) {
 buildscript {
     repositories {
         jcenter()
-        maven {
-            url 'https://maven.google.com'
-        }
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha3'
+        classpath 'com.android.tools.build:gradle:2.3.3'
     }
 }
 
@@ -33,11 +30,13 @@ android {
 
     defaultConfig {
         applicationId "org.tasks"
-        versionCode 457
+        versionCode 458
-        versionName "4.9.14"
+        versionName "4.9.15"
         targetSdkVersion 25
-        minSdkVersion 15
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        jackOptions {
+            enabled true
+        }
     }
 
     signingConfigs {
@@ -60,7 +59,7 @@ android {
         }
     }
 
-    flavorDimensions 'store'
+    flavorDimensions 'store', 'env'
 
     productFlavors {
         generic {
@@ -72,6 +71,14 @@ android {
         amazon {
             dimension 'store'
         }
+        dev {
+            minSdkVersion 21
+            dimension 'env'
+        }
+        prod {
+            minSdkVersion 15
+            dimension 'env'
+        }
     }
 
     if (project.hasProperty('keyAlias') &&

app/src/androidTest/java/org/tasks/jobs/JobQueueTest.java

@@ -14,6 +14,7 @@ import org.tasks.preferences.Preferences;
 import java.util.concurrent.TimeUnit;
 
 import static com.todoroo.astrid.reminders.ReminderService.TYPE_DUE;
+import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
 import static junit.framework.Assert.assertEquals;
 import static org.mockito.AdditionalAnswers.returnsFirstArg;