From 5dea43bb4a743104d6473ef94ea226699b631f74 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Wed, 7 Jun 2017 16:29:27 -0500
Subject: [PATCH] Android Studio 3.0 preview 3

---
 .travis.yml                                   |  6 ++---
 build.gradle                                  | 23 ++++++++-----------
 .../tasks/preferences/BasicPreferences.java   |  4 ++--
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2e9508a12..ba1794182 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ android:
     - tools # https://github.com/travis-ci/travis-ci/issues/6040
     - android-25
     - platform-tools
-    - build-tools-25.0.2
+    - build-tools-25.0.3
     - extra-android-m2repository
     - extra-google-m2repository
   licenses:
@@ -23,5 +23,5 @@ before_install:
   - adb shell input keyevent 82 &
 
 script:
-  - ./gradlew :lintGoogleplayProdDebug
-  - ./gradlew :connectedGoogleplayProdDebugAndroidTest
+  - ./gradlew :lintGoogleplayDebug
+  - ./gradlew :connectedGoogleplayDebugAndroidTest
diff --git a/build.gradle b/build.gradle
index 8d096a814..2e133bed4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,10 +7,13 @@ task wrapper(type: Wrapper) {
 buildscript {
     repositories {
         jcenter()
+        maven {
+            url 'https://maven.google.com'
+        }
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:3.0.0-alpha3'
     }
 }
 
@@ -33,10 +36,8 @@ android {
         versionCode 457
         versionName "4.9.14"
         targetSdkVersion 25
+        minSdkVersion 15
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        jackOptions {
-            enabled true
-        }
     }
 
     signingConfigs {
@@ -59,7 +60,7 @@ android {
         }
     }
 
-    flavorDimensions 'store', 'env'
+    flavorDimensions 'store'
 
     productFlavors {
         generic {
@@ -71,14 +72,6 @@ android {
         amazon {
             dimension 'store'
         }
-        dev {
-            minSdkVersion 21
-            dimension 'env'
-        }
-        prod {
-            minSdkVersion 15
-            dimension 'env'
-        }
     }
 
     if (project.hasProperty('keyAlias') &&
@@ -114,7 +107,9 @@ dependencies {
     annotationProcessor "com.jakewharton:butterknife-compiler:${BUTTERKNIFE_VERSION}"
     compile "com.jakewharton:butterknife:${BUTTERKNIFE_VERSION}"
 
-    debugCompile "com.facebook.stetho:stetho:${STETHO_VERSION}"
+    debugCompile ("com.facebook.stetho:stetho:${STETHO_VERSION}") {
+        exclude group: 'com.google.code.findbugs', module: 'jsr305'
+    }
     debugCompile "com.facebook.stetho:stetho-timber:${STETHO_VERSION}@aar"
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
     //noinspection GradleCompatible
diff --git a/src/main/java/org/tasks/preferences/BasicPreferences.java b/src/main/java/org/tasks/preferences/BasicPreferences.java
index 39fd4b821..42ad7ff09 100644
--- a/src/main/java/org/tasks/preferences/BasicPreferences.java
+++ b/src/main/java/org/tasks/preferences/BasicPreferences.java
@@ -137,7 +137,7 @@ public class BasicPreferences extends InjectingPreferenceActivity implements
         });
 
         findPreference(R.string.TLA_menu_donate).setOnPreferenceClickListener(preference -> {
-            if (BuildConfig.FLAVOR_store.equals("googleplay")) {
+            if (BuildConfig.FLAVOR.equals("googleplay")) {
                 newDonationDialog().show(getFragmentManager(), FRAG_TAG_DONATION);
             } else {
                 startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse("http://tasks.org/donate")));
@@ -214,7 +214,7 @@ public class BasicPreferences extends InjectingPreferenceActivity implements
         requires(R.string.get_plugins, atLeastJellybeanMR1(), R.string.p_purchased_dashclock);
         requires(R.string.settings_localization, atLeastJellybeanMR1(), R.string.p_language, R.string.p_layout_direction);
 
-        if (!BuildConfig.FLAVOR_store.equals("googleplay")) {
+        if (!BuildConfig.FLAVOR.equals("googleplay")) {
             requires(R.string.settings_general, false, R.string.synchronization);
             requires(R.string.privacy, false, R.string.p_collect_statistics);
         }