diff --git a/android/gradle.properties b/android/gradle.properties
index daa1f5d46..370f6cc5a 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -9,7 +9,7 @@ DAGGER_VERSION = 2.9
 BUILD_TOOLS_VERSION = 27.0.3
 KOTLIN_VERSION = 1.2.41
 SUPPORT_LIBRARY_VERSION = 27.1.1
-AUTO_FACTORY_VERSION = 1.0-beta3
+AUTO_FACTORY_VERSION = 1.0-beta6
 
 org.gradle.parallel=false
 org.gradle.daemon=true
diff --git a/android/uhabits-android/build.gradle b/android/uhabits-android/build.gradle
index dc1f20fbb..58c9f2716 100644
--- a/android/uhabits-android/build.gradle
+++ b/android/uhabits-android/build.gradle
@@ -113,7 +113,7 @@ dependencies {
     compileOnly "javax.annotation:jsr250-api:1.0"
     compileOnly "com.google.auto.factory:auto-factory:${AUTO_FACTORY_VERSION}"
     kapt "com.google.dagger:dagger-compiler:$DAGGER_VERSION"
-    kapt "com.jakewharton:butterknife-compiler:8.6.1-SNAPSHOT"
+    kapt "com.jakewharton:butterknife-compiler:9.0.0"
     kapt "com.google.auto.factory:auto-factory:${AUTO_FACTORY_VERSION}"
 
     androidTestImplementation "com.android.support.test.espresso:espresso-contrib:2.2.2"
@@ -125,7 +125,7 @@ dependencies {
     androidTestImplementation "com.android.support:support-annotations:$SUPPORT_LIBRARY_VERSION"
     androidTestImplementation "com.android.support.test:rules:0.5"
     androidTestImplementation "com.android.support.test:runner:0.5"
-    androidTestImplementation "com.google.guava:guava:20.0"
+    androidTestImplementation "com.google.guava:guava:24.1-android"
     androidTestImplementation project(":uhabits-core")
     kaptAndroidTest "com.google.dagger:dagger-compiler:$DAGGER_VERSION"