diff --git a/.travis.yml b/.travis.yml
index 4f40875..c4488e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,10 +5,11 @@ jdk:
 
 android:
   components:
+    - tools
     - extra-android-support
     - extra-android-m2repository
-    - build-tools-23.0.1
-    - android-22
+    - build-tools-25.0.2
+    - android-25
   licenses:
     - '.+'
 
diff --git a/build.gradle b/build.gradle
index d0f1d20..d9a2526 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,6 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
-        classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
+        classpath 'com.android.tools.build:gradle:2.3.0'
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 78e0752..88725df 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-2.14-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-3.4.1-all.zip
diff --git a/library/build.gradle b/library/build.gradle
index b53f210..f842ed8 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -1,7 +1,5 @@
 apply plugin: 'com.android.library'
-apply plugin: 'com.neenbedankt.android-apt'
 apply plugin: 'checkstyle'
-apply plugin: 'com.github.ben-manes.versions'
 
 buildscript {
     repositories {
@@ -14,32 +12,29 @@ buildscript {
 }
 
 repositories {
-  mavenCentral()
-  maven { url 'http://guardian.github.com/maven/repo-releases' }
+    mavenCentral()
+    maven { url 'http://guardian.github.com/maven/repo-releases' }
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:22.2.1'
-    compile 'com.android.support:support-annotations:22.2.1'
+    compile 'com.android.support:appcompat-v7:25.3.1'
+    compile 'com.android.support:support-annotations:25.3.1'
     compile 'com.gu:option:1.3'
     compile 'com.github.frankiesardo:auto-parcel:0.3.1'
     compile 'com.google.auto.value:auto-value:1.1'
-    apt 'com.github.frankiesardo:auto-parcel-processor:0.3.1'
+    annotationProcessor 'com.github.frankiesardo:auto-parcel-processor:0.3.1'
 
     testCompile 'junit:junit:4.12'
     testCompile 'org.mockito:mockito-all:1.9.5'
-    testCompile 'com.squareup.assertj:assertj-android:1.1.0'
+    testCompile 'com.squareup.assertj:assertj-android:1.1.1'
     testCompile 'org.apache.maven:maven-ant-tasks:2.1.3' // fixes issue on linux/mac
-    testCompile('org.robolectric:robolectric:3.0')
-    testCompile('org.robolectric:shadows-support-v4:3.0') {
-        exclude group: 'commons-logging', module: 'commons-logging'
-        exclude group: 'org.apache.httpcomponents', module: 'httpclient'
-    }
+    testCompile 'org.robolectric:robolectric:3.3'
+    testCompile 'org.robolectric:shadows-support-v4:3.3'
 }
 
 android {
-  compileSdkVersion 22
-  buildToolsVersion '23.0.1'
+  compileSdkVersion 25
+  buildToolsVersion '25.0.2'
 
   defaultConfig {
     minSdkVersion 11
@@ -63,7 +58,6 @@ checkstyle {
 
 apply from: 'https://raw.githubusercontent.com/robbypond/gradle-mvn-push/8f35c0555e9c71154c08dfde9397340099f8dc9f/gradle-mvn-push.gradle'
 
-
 gradle.taskGraph.whenReady { taskGraph ->
   if (taskGraph.allTasks.any { it instanceof Sign } &&
       ':library:uploadArchives' in gradle.startParameter.taskNames) {
diff --git a/library/src/test/java/net/rdrei/android/dirchooser/DirectoryChooserActivityTest.java b/library/src/test/java/net/rdrei/android/dirchooser/DirectoryChooserActivityTest.java
index a54810d..80e9f51 100644
--- a/library/src/test/java/net/rdrei/android/dirchooser/DirectoryChooserActivityTest.java
+++ b/library/src/test/java/net/rdrei/android/dirchooser/DirectoryChooserActivityTest.java
@@ -6,9 +6,9 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.RobolectricTestRunner;
 
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class DirectoryChooserActivityTest {
     private DirectoryChooserActivity activity;
     private Intent launchIntent;
diff --git a/library/src/test/java/net/rdrei/android/dirchooser/DirectoryChooserFragmentTest.java b/library/src/test/java/net/rdrei/android/dirchooser/DirectoryChooserFragmentTest.java
index 9f9e0ba..8204b34 100644
--- a/library/src/test/java/net/rdrei/android/dirchooser/DirectoryChooserFragmentTest.java
+++ b/library/src/test/java/net/rdrei/android/dirchooser/DirectoryChooserFragmentTest.java
@@ -17,15 +17,15 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
-import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.Shadows;
 import org.robolectric.shadows.ShadowAlertDialog;
 import org.robolectric.shadows.ShadowDialog;
 
 import static org.assertj.android.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class DirectoryChooserFragmentTest {
 
     @TargetApi(Build.VERSION_CODES.HONEYCOMB)
diff --git a/sample/build.gradle b/sample/build.gradle
index abccad9..ce5889e 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -10,8 +10,8 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion '23.0.1'
+    compileSdkVersion 25
+    buildToolsVersion '25.0.2'
 
     defaultConfig {
         versionCode 6