diff --git a/.travis.yml b/.travis.yml
index a1c9090d..c57a40b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,15 +4,20 @@ git:
 before_install:
   - git submodule update --init --recursive
 script:
-  - export JAVA_OPTS="-XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"
+  - export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"
   - export TERM=dumb
   - echo sdk.dir $ANDROID_HOME > local.properties
-  - ./gradlew assembleDebug -x lint
+  - jdk_switcher use oraclejdk8
+  - ./gradlew assemble
 android:
   components:
   - tools
-  - build-tools-23.0.3
-  - android-23
+  - build-tools-24.0.2
+  - android-24
   - extra-android-m2repository
-
-
+before_cache:
+  - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
diff --git a/build.gradle b/build.gradle
index 4b3b586b..9e2799c4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,17 +19,17 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.2.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
     }
 }
 
 allprojects {
     apply plugin: 'idea'
-    ext.androidBuildVersionTools = "23.0.3"
+    ext.androidBuildVersionTools = "24.0.2"
 }
 
-def androidCompileSdk() { return 23 }
+def androidCompileSdk() { return 24 }
 
 subprojects {
     repositories {