diff --git a/.travis.yml b/.travis.yml
index 0156cdc3b..821766c12 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,14 @@ cache:
     - $HOME/.gradle/wrapper/
     - $HOME/.android/build-cache
 
+android:
+  components:
+    - tools
+    - platform-tools
+    - tools
+    - build-tools-27.0.3
+    - android-27
+
 licenses:
   - '.+'
 
diff --git a/app/build.gradle b/app/build.gradle
index fb0d90ae1..037420595 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.0.1'
+    classpath 'com.android.tools.build:gradle:3.1.0'
     classpath 'com.testdroid:gradle:1.5.0'
     classpath 'org.apache.httpcomponents:httpclient-android:4.3.3'
   }
@@ -79,6 +79,8 @@ dependencies {
   implementation 'com.google.dagger:dagger:2.0.2'
   annotationProcessor "com.google.dagger:dagger-compiler:2.0.2"
   androidTestAnnotationProcessor "com.google.dagger:dagger-compiler:2.0.2"
+  compileOnly "javax.annotation:javax.annotation-api:$javaxAnnotationVersion"
+  androidTestCompileOnly "javax.annotation:javax.annotation-api:$javaxAnnotationVersion"
 
   // SquiDB
   implementation 'com.yahoo.squidb:squidb:2.0.0'
diff --git a/build.gradle b/build.gradle
index ede5fba81..fc14cc435 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
       google()
   }
   dependencies {
-      classpath 'com.android.tools.build:gradle:3.0.1'
+      classpath 'com.android.tools.build:gradle:3.1.0'
       classpath 'com.squareup.spoon:spoon-runner:1.7.1'
       classpath 'com.stanfy.spoon:spoon-gradle-plugin:1.2.2'
 
@@ -21,6 +21,7 @@ ext {
     rxAndroidVersion = '2.0.2'
     okHttpVersion = '3.9.1'
     retrofitVersion = '2.3.0'
+    javaxAnnotationVersion = '1.3.2'
 }
 
 allprojects {
diff --git a/gradle.properties b/gradle.properties
index 7e32dc4f4..fdfc80f04 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1,2 @@
-android.enableD8=true
\ No newline at end of file
+android.enableD8=true
+android.enableD8.desugaring=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index deed5ca03..5f7a15e41 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Nov 25 16:36:07 GMT 2017
+#Tue Mar 27 23:53:46 IST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip