Fix compilation issue and add support for AS 2.2+

m4gr3d · m4gr3d · commit bb8bd90b953a · 2016-10-09T18:27:07.000-07:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -22,6 +22,12 @@ android {
         abortOnError false
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+
+    buildToolsVersion '24.0.1'
 }
 
 dependencies {

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,7 @@ android {`
`94`	`94`	`testOptions {`
`95`	`95`	`unitTests.returnDefaultValues = true`
`96`	`96`	`}`
	`97`	`+ buildToolsVersion '24.0.1'`
`97`	`98`	`}`
`98`	`99`
`99`	`100`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ buildscript {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`dependencies {`
`18`		`- classpath 'com.android.tools.build:gradle:1.5.0'`
	`18`	`+ classpath 'com.android.tools.build:gradle:2.2.0'`
`19`	`19`
`20`	`20`	`//Dexcount gradle plugin`
`21`	`21`	`classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.4.4'`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,12 @@ android {`
`22`	`22`	`abortOnError false`
`23`	`23`	`}`
`24`	`24`
	`25`	`+ compileOptions {`
	`26`	`+ sourceCompatibility JavaVersion.VERSION_1_7`
	`27`	`+ targetCompatibility JavaVersion.VERSION_1_7`
	`28`	`+ }`
	`29`	`+`
	`30`	`+ buildToolsVersion '24.0.1'`
`25`	`31`	`}`
`26`	`32`
`27`	`33`	`dependencies {`