diff --git a/.travis.yml b/.travis.yml
index ea6e884e0..e5a39819c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,11 @@
 language: android
+jdk:
+  - oraclejdk7
+  - oraclejdk8
+before_install:
+  - export JAVA7_HOME=/usr/lib/jvm/java-7-oracle
+  - export JAVA8_HOME=/usr/lib/jvm/java-8-oracle
+  - export JAVA_HOME=$JAVA7_HOME
 
 android:
   components:
diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index f1500dc29..5b2b7d7d5 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -55,11 +55,11 @@ dependencies {
         transitive = true
     }
 
-    compile 'com.android.support:appcompat-v7:23.2.1'
-    compile 'com.android.support:design:23.2.1'
-    compile 'com.android.support:gridlayout-v7:23.2.1'
-    compile 'com.android.support:recyclerview-v7:23.2.1'
-    compile 'com.android.support:preference-v14:23.2.1'
+    compile 'com.android.support:appcompat-v7:23.3.0'
+    compile 'com.android.support:design:23.3.0'
+    compile 'com.android.support:gridlayout-v7:23.3.0'
+    compile 'com.android.support:recyclerview-v7:23.3.0'
+    compile 'com.android.support:preference-v14:23.3.0'
     compile 'com.android.support:multidex:1.0.1'
 
     // Image Loading/Caching
diff --git a/build.gradle b/build.gradle
index 4f0d708b9..34b93d919 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0-rc3'
+        classpath 'com.android.tools.build:gradle:2.0.0'
         classpath 'com.android.databinding:dataBinder:1.0-rc4'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
     }