diff --git a/app/build.gradle b/app/build.gradle
index 2045e0c..213aada 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.google.protobuf'
-apply plugin: 'com.neenbedankt.android-apt'
 apply plugin: 'me.tatarka.retrolambda'
 
 apply from: "${rootDir}/buildscript/signing/sign.gradle"
@@ -123,12 +122,12 @@ dependencies {
     compile libraries.rxRelay
 
     compile libraries.butterknife
-    apt libraries.butterknifeCompiler
+    annotationProcessor libraries.butterknifeCompiler
 
     compile libraries.dagger
-    apt libraries.daggerCompiler
+    annotationProcessor libraries.daggerCompiler
 
-    apt libraries.autoValue
+    annotationProcessor libraries.autoValue
     provided libraries.autoValueAnnotations
 
     provided libraries.xposed
diff --git a/buildscript/dependencies.gradle b/buildscript/dependencies.gradle
index ed59c1c..f120940 100644
--- a/buildscript/dependencies.gradle
+++ b/buildscript/dependencies.gradle
@@ -1,26 +1,25 @@
 ext {
     pluginVersions = [
-            android    : '2.2.0',
-            apt        : '1.8',
+            android    : '2.2.1',
             retrolambda: '3.3.0',
             protobuf   : '0.8.0',
             versions   : '0.13.0'
     ]
     testVersions = [
             junit    : '4.12',
-            mockito  : '2.1.0-RC.1',
+            mockito  : '2.1.0',
             hamcrest : '1.4-atlassian-1',
             powermock: '1.6.5'
     ]
     libraryVersions = [
             supportLib          : '24.2.1',
             xposed              : '82',
-            rxJava              : '1.2.0',
+            rxJava              : '1.2.1',
             rxAndroid           : '1.2.1',
             rxBinding           : '0.4.0',
-            rxRelay             : '1.1.0',
+            rxRelay             : '1.2.0',
             dagger              : '2.7',
-            protobuf            : '3.0.2',
+            protobuf            : '3.1.0',
             protobufLite        : '3.0.1',
             protobufGenLite     : '3.0.0',
             autoValue           : '1.3',
@@ -31,7 +30,6 @@ ext {
 
     pluginLibraries = [
             android    : "com.android.tools.build:gradle:${pluginVersions.android}",
-            apt        : "com.neenbedankt.gradle.plugins:android-apt:${pluginVersions.apt}",
             retrolambda: "me.tatarka:gradle-retrolambda:${pluginVersions.retrolambda}",
             protobuf   : "com.google.protobuf:protobuf-gradle-plugin:${pluginVersions.protobuf}",
             versions   : "com.github.ben-manes:gradle-versions-plugin:${pluginVersions.versions}"