diff --git a/app/build.gradle b/app/build.gradle
index d9fe35e..c458087 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'me.tatarka.retrolambda'
-apply plugin: 'com.neenbedankt.android-apt'
 apply plugin: 'hu.supercluster.paperwork'
 apply from: '../code_quality_tools/jacoco.gradle'
 apply plugin: 'com.frogermcs.androiddevmetrics'
@@ -113,7 +112,7 @@ android {
 // Libraries declared in dependencies.gradle in the root of the project
 dependencies {
     compile libraries.dagger
-    apt libraries.daggerCompiler
+    annotationProcessor libraries.daggerCompiler
 
     compile libraries.rxJava
     compile libraries.rxLint
@@ -125,7 +124,7 @@ dependencies {
     compile libraries.jacksonDataBind
 
     // Do not compile AutoValue dependencies to the app.
-    apt libraries.autoValue
+    annotationProcessor libraries.autoValue
     // Make AutoValue annotation visible to the compiler.
     provided libraries.autoValue
 
@@ -136,7 +135,7 @@ dependencies {
     compile libraries.supportCardView
 
     compile libraries.butterKnife
-    apt libraries.butterKnifeCompiler
+    annotationProcessor libraries.butterKnifeCompiler
 
     compile libraries.picasso
     compile libraries.picassoOkHttpDownloader
diff --git a/build.gradle b/build.gradle
index 4dbcfbb..8756dcb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,9 +15,6 @@ buildscript {
 
         classpath gradlePlugins.android
 
-        // Compile-time annotation processing.
-        classpath gradlePlugins.apt
-
         // Backport of some Java 8 language features such as Lambdas and method references.
         classpath gradlePlugins.retrolambda
 
diff --git a/dependencies.gradle b/dependencies.gradle
index c0f1146..bef63b9 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -7,8 +7,7 @@ ext.versions = [
         compileSdk                   : 23,
         buildTools                   : '23.0.3',
 
-        androidGradlePlugin          : '2.1.2',
-        aptGradlePlugin              : '1.8',
+        androidGradlePlugin          : '2.2.1',
         retrolambdaGradlePlugin      : '3.2.5',
         lombokGradlePlugin           : '0.2.3.a2',
         paperworkGradlePlugin        : '1.2.7',
@@ -16,7 +15,7 @@ ext.versions = [
         androidDevMetricsGradlePlugin: '0.4',
         errorProneVersion            : '0.0.8',
         errorProneCoreVersion        : '2.0.9',
-        dexcountPlugin               : '0.5.4',
+        dexcountPlugin               : '0.6.1',
         versionsGradlePlugin         : '0.13.0',
         buildScan                   : '1.1.1',
 
@@ -52,7 +51,6 @@ ext.versions = [
 
 ext.gradlePlugins = [
         android          : "com.android.tools.build:gradle:$versions.androidGradlePlugin",
-        apt              : "com.neenbedankt.gradle.plugins:android-apt:$versions.aptGradlePlugin",
         retrolambda      : "me.tatarka:gradle-retrolambda:$versions.retrolambdaGradlePlugin",
         lombok           : "me.tatarka.retrolambda.projectlombok:lombok.ast:$versions.lombokGradlePlugin",
         paperwork        : "hu.supercluster:paperwork-plugin:$versions.paperworkGradlePlugin",
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index ca78035..6ffa237 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 86a3e94..7494219 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon May 30 20:17:48 ICT 2016
+#Thu Oct 13 19:11:10 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip
diff --git a/gradlew b/gradlew
index 27309d9..9aa616c 100755
--- a/gradlew
+++ b/gradlew
@@ -161,4 +161,9 @@ function splitJvmOpts() {
 eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
 JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+  cd "$(dirname "$0")"
+fi
+
 exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
index f6d5974..e95643d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -49,7 +49,6 @@ goto fail
 @rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line