diff --git a/.travis.yml b/.travis.yml
index f1cbc49..c3ebd9c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,38 +2,38 @@ language: java
 jdk: oraclejdk7
 env:
   matrix:
-    - ANDROID_SDKS=android-22,sysimg-22  ANDROID_TARGET=android-22  ANDROID_ABI=armeabi-v7a
+    - ANDROID_SDKS=android-23,sysimg-23  ANDROID_TARGET=android-23  ANDROID_ABI=armeabi-v7a
 before_install:
   # Install base Android SDK.
   - sudo apt-get update -qq
   - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch > /dev/null; fi
-  - wget http://dl.google.com/android/android-sdk_r24.3.3-linux.tgz
-  - tar xzf android-sdk_r24.3.3-linux.tgz
+  - wget http://dl.google.com/android/android-sdk_r24.4.1-linux.tgz
+  - tar xzf android-sdk_r24.4.1-linux.tgz
   - export ANDROID_HOME=$PWD/android-sdk-linux
   - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
 
   # Gradle
-  - wget http://services.gradle.org/distributions/gradle-2.4-bin.zip
-  - unzip gradle-2.4-bin.zip
-  - export GRADLE_HOME=$PWD/gradle-2.4
+  - wget http://services.gradle.org/distributions/gradle-2.10-bin.zip
+  - unzip gradle-2.10-bin.zip
+  - export GRADLE_HOME=$PWD/gradle-2.10
   - export PATH=$GRADLE_HOME/bin:$PATH
 
   # install android build tools.
-  - wget https://dl-ssl.google.com/android/repository/build-tools_r22.0.1-linux.zip
-  - unzip build-tools_r22.0.1-linux.zip -d $ANDROID_HOME
+  - wget https://dl-ssl.google.com/android/repository/build-tools_r23.0.3-linux.zip
+  - unzip build-tools_r23.0.3-linux.zip -d $ANDROID_HOME
   - mkdir -p $ANDROID_HOME/build-tools/
-  - mv $ANDROID_HOME/android-5.1 $ANDROID_HOME/build-tools/22.0.1
-  - ls -la $ANDROID_HOME/build-tools/22.0.1
+  - mv $ANDROID_HOME/android-6.0 $ANDROID_HOME/build-tools/23.0.3
+  - ls -la $ANDROID_HOME/build-tools/23.0.3
   - echo $ANDROID_HOME
 
   # Install required components.
   # For a full list, run `android list sdk -a --extended`
-  # Note that sysimg-22 downloads the ARM, x86 and MIPS images (we should optimize this).
+  # Note that sysimg-23 downloads the ARM, x86 and MIPS images (we should optimize this).
   # Other relevant API's
   - echo yes | android update sdk --filter platform-tools --no-ui --force > /dev/null
   - echo yes | android update sdk --filter android-18 --no-ui --force > /dev/null
-  - echo yes | android update sdk --filter android-22 --no-ui --force > /dev/null
-  - echo yes | android update sdk --filter sysimg-22 --no-ui --force > /dev/null
+  - echo yes | android update sdk --filter android-23 --no-ui --force > /dev/null
+  - echo yes | android update sdk --filter sysimg-23 --no-ui --force > /dev/null
   - echo yes | android update sdk --filter extra-android-support --no-ui --force > /dev/null
   - echo yes | android update sdk --filter extra-android-m2repository --no-ui --force > /dev/null
 
diff --git a/build.gradle b/build.gradle
index 23c9b17..54eb494 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:1.2.3'
+    classpath 'com.android.tools.build:gradle:2.1.0'
   }
 }
 
diff --git a/gradle.properties b/gradle.properties
index e291867..81b7245 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 VERSION_NAME=1.0
 VERSION_CODE=1
 
-ANDROID_BUILD_TOOLS_VERSION=22.0.1
-ANDROID_COMPILE_SDK_VERSION=22
-ANDROID_TARGET_SDK_VERSION=22
+ANDROID_BUILD_TOOLS_VERSION=23.0.3
+ANDROID_COMPILE_SDK_VERSION=23
+ANDROID_TARGET_SDK_VERSION=23
 ANDROID_MIN_SDK=14
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1192279..8bec4ee 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jan 02 11:53:54 PST 2015
+#Tue May 03 08:45:18 CDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
diff --git a/rebound-core/build.gradle b/rebound-core/build.gradle
index 11d8794..1b9d6cf 100644
--- a/rebound-core/build.gradle
+++ b/rebound-core/build.gradle
@@ -1,5 +1,10 @@
 apply plugin: 'java'
 
+allprojects {
+    sourceCompatibility = JavaVersion.VERSION_1_7
+    targetCompatibility = JavaVersion.VERSION_1_7
+}
+
 dependencies {
     testCompile files(
         'libs/hamcrest-core-1.3.jar',