diff --git a/app/build.gradle b/app/build.gradle
index da828cc8c..db9b44621 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,15 +7,17 @@ task wrapper(type: Wrapper) {
 buildscript {
     repositories {
         jcenter()
+        google()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.0-beta1'
     }
 }
 
 repositories {
     jcenter()
+    google()
 }
 
 android {
@@ -33,10 +35,8 @@ android {
         versionCode 458
         versionName "4.9.15"
         targetSdkVersion 25
+        minSdkVersion 15
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        jackOptions {
-            enabled true
-        }
     }
 
     signingConfigs {
@@ -59,7 +59,7 @@ android {
         }
     }
 
-    flavorDimensions 'store', 'env'
+    flavorDimensions 'store'
 
     productFlavors {
         generic {
@@ -71,14 +71,6 @@ android {
         amazon {
             dimension 'store'
         }
-        dev {
-            minSdkVersion 21
-            dimension 'env'
-        }
-        prod {
-            minSdkVersion 15
-            dimension 'env'
-        }
     }
 
     if (project.hasProperty('keyAlias') &&
diff --git a/app/proguard.pro b/app/proguard.pro
index ac46a4c50..0c99e65cf 100644
--- a/app/proguard.pro
+++ b/app/proguard.pro
@@ -24,3 +24,6 @@
 -dontwarn javax.inject.**
 -dontwarn com.google.j2objc.annotations.**
 -dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
+-dontwarn com.google.errorprone.annotations.CanIgnoreReturnValue
+-dontwarn com.google.errorprone.annotations.concurrent.LazyInit
+-dontwarn com.google.errorprone.annotations.ForOverride
diff --git a/app/src/main/java/org/tasks/preferences/BasicPreferences.java b/app/src/main/java/org/tasks/preferences/BasicPreferences.java
index 39fd4b821..42ad7ff09 100644
--- a/app/src/main/java/org/tasks/preferences/BasicPreferences.java
+++ b/app/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);
         }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0d176f240..2bb867551 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue May 23 14:22:03 CDT 2017
+#Thu Aug 10 09:35:33 CDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-milestone-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-rc-1-all.zip