diff --git a/ClientLib/build.gradle b/ClientLib/build.gradle
index a910162f67..8c5d1e120f 100644
--- a/ClientLib/build.gradle
+++ b/ClientLib/build.gradle
@@ -94,6 +94,7 @@ android {
     testOptions {
         unitTests.returnDefaultValues = true
     }
+    buildToolsVersion '24.0.1'
 }
 
 dependencies {
diff --git a/build.gradle b/build.gradle
index 7ff2c5d981..5011519ac6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:2.2.0'
 
         //Dexcount gradle plugin
         classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.4.4'
diff --git a/dependencyLibs/Mavlink/build.gradle b/dependencyLibs/Mavlink/build.gradle
index be2042cef7..51e50443e7 100644
--- a/dependencyLibs/Mavlink/build.gradle
+++ b/dependencyLibs/Mavlink/build.gradle
@@ -1,4 +1,6 @@
 apply plugin: 'java'
+sourceCompatibility = JavaVersion.VERSION_1_7
+targetCompatibility = JavaVersion.VERSION_1_7
 
 sourceSets {
     main {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9eee8b9f64..171c27b618 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Nov 30 09:39:49 PST 2014
+#Sun Oct 09 17:42:15 PDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/samples/StarterApp/build.gradle b/samples/StarterApp/build.gradle
index 9f324a1f60..e542e2f097 100644
--- a/samples/StarterApp/build.gradle
+++ b/samples/StarterApp/build.gradle
@@ -22,6 +22,12 @@ android {
         abortOnError false
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+
+    buildToolsVersion '24.0.1'
 }
 
 dependencies {