binding generator now takes jar to be built with from android runtime

Author: Plamen5kov

binding-generator/Generator/build.gradle

@@ -1,3 +1,4 @@
+
 /* 
 *	Compiles binding generator 
 *	to run: "gradle build"
@@ -6,14 +7,21 @@
 */
 apply plugin: "java"
 
+def compiteCompileSdkVersion () {
+	if(project.hasProperty("compileSdk")) {
+		return compileSdk
+	}
+	return "android-22"
+}
+
 //workaround because there is a problem when the binding generator is compiled with java 1.7/1.8
 sourceCompatibility = 1.6
 targetCompatibility = 1.6
 
 def pathToAndroidSdkPlatforms = "$System.env.ANDROID_HOME" + "/platforms"
 
 dependencies {
-	compile files(pathToAndroidSdkPlatforms + "/android-22/android.jar")
+	compile files(pathToAndroidSdkPlatforms + "/" + compiteCompileSdkVersion() + "/android.jar")
 }
 
 sourceSets {
@@ -24,7 +32,4 @@ sourceSets {
     }
 	def isOutClassesDirSet = project.hasProperty("outClassesDir")
 	main.output.classesDir = isOutClassesDirSet ? outClassesDir : "$rootDir/build/classesss"
-}
-
-
-
+}

src/build.gradle

@@ -20,6 +20,7 @@ def distDir = "$rootDir/dist"
 def isWinOs = System.properties['os.name'].toLowerCase().contains('windows')
 def pathToAndroidSdkPlatforms = "$System.env.ANDROID_HOME" + "/platforms"
 def pathToBindingGeneratorJar = "../binding-generator/Generator/build/libs/Generator.jar"
+def envVars = new LinkedList<String>()
 
 buildscript {
     repositories {
@@ -71,6 +72,7 @@ def computeSupportVersion() {
 //configuration of the android plugin for gradle
 android {
 	compileSdkVersion compiteCompileSdkVersion()
+	envVars.addFirst("-PcompileSdk=" + compileSdkVersion);
     buildToolsVersion computeBuildToolsVersion()
 
 	defaultConfig {
@@ -172,13 +174,21 @@ task revertNdkConfiguration (type: Exec) {
 }
 
 task generateBindingGeneratorClasses (type: Exec ) {	
-	workingDir "../binding-generator/Generator" 
+	workingDir "../binding-generator/Generator"
 
 	if(isWinOs) {
-		commandLine "cmd", "/c", "gradlew", "build", "-PoutClassesDir=$rootDir/build/intermediates/classes/release"
+		envVars.addFirst("-PoutClassesDir=$rootDir/build/intermediates/classes/release");
+		envVars.addFirst("build");
+		envVars.addFirst("gradlew");
+		envVars.addFirst("/c");
+		envVars.addFirst("cmd");
+		commandLine envVars.toArray();
 	}
 	else {
-		commandLine "./gradlew", "build", "-PoutClassesDir=$rootDir/build/intermediates/classes/release"
+		envVars.addFirst("-PoutClassesDir=$rootDir/build/intermediates/classes/release");
+		envVars.addFirst("build");
+		envVars.addFirst("./gradlew");
+		commandLine envVars.toArray();
 	}
 }