diff --git a/build.gradle b/build.gradle
index 82c7e4ce7..20ca1403c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         maven { url "https://maven.google.com" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-beta1'
+        classpath 'com.android.tools.build:gradle:3.0.0-beta2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle.properties b/gradle.properties
index fd25e7773..2d1d7ae4c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -23,3 +23,4 @@ org.gradle.daemon=true
 
 # Enable AAPT2
 android.enableAapt2=true
+android.enableD8=true