enabled passing compileSdk, support version and other variables

Author: plamen5kov

build.gradle

@@ -1,3 +1,17 @@
+/*
+*	Test command 
+*			gradle packar -PtargetSdk=android-23 -PminSdk=17  -PbuildToolsVersion=23.0.2 -PsupportVersion=23.0.1  -PcompileSdk=android-23
+*	To run: 
+*			gradle packar
+*
+* 	Options:
+*			-PtargetSdk=[target_sdk]
+*			-PminSdk=[target_sdk]
+*			-PbuildToolsVersion=[build_tools_version]
+*			-PsupportVersion=[support_version]
+*			-PcompileSdk=[compile_sdk_version]
+*/
+
 import groovy.json.JsonSlurper //used to parse package.json
 import groovy.json.JsonBuilder
 import groovy.json.JsonOutput
@@ -9,6 +23,12 @@ def pVersion = "no package version was provided by build.gradle build"
 def arVersion = "no commit sha was provided by build.gradle build"
 def commitVersionFile = "commit.txt"
 
+def compileSdkVer = "";
+def buildToolsVer = "";
+def minSdkVer = "";
+def targetSdkVer = "";
+def supportVer = "";
+
 task checkEnvironmentVariables {
 	if ("$System.env.JAVA_HOME" == "" || "$System.env.JAVA_HOME" == "null") {
 		throw new GradleException("Set JAVA_HOME to point to the correct Jdk location\n");
@@ -25,6 +45,22 @@ task checkEnvironmentVariables {
 	if(project.hasProperty("metadataGen") && !file("../android-metadata-generator/dist/tns-android-metadata-generator-0.0.1.tgz").exists()) {
 		throw new GradleException("android-metadata-generator build output not found and no metadataGen option specified. Build android-metadata-generator first.\n");
 	}
+	
+	if(project.hasProperty("compileSdk")) {
+		compileSdkVer = "-PcompileSdk=$compileSdk"
+	}
+	if(project.hasProperty("buildToolsVersion")) {
+		buildToolsVer = "-PbuildToolsVersion=$buildToolsVersion"
+	}
+	if(project.hasProperty("minSdk")) {
+		minSdkVer = "-PminSdk=$minSdk"
+	}
+	if(project.hasProperty("targetSdk")) {
+		targetSdkVer = "-PtargetSdk=$targetSdk"
+	}
+	if(project.hasProperty("supportVersion")) {
+		supportVer = "-PsupportVersion=$supportVersion"
+	}
 }
 
 task checkAndroidCommand(type:Exec) {
@@ -136,13 +172,13 @@ task deleteCommitFile (type: Delete) {
 task generateRuntime (type: Exec) {
 	doFirst{
 		workingDir "$rootDir/src"
-		
+
 		//command gradle buildar -PpackageVersion=[from_package.json] -PgitCommitVersion=[from_some_sys_variable]
 		if(isWinOs) {
-			commandLine "cmd", "/c" , "gradle", "buildar", "-PpackageVersion=${pVersion}", "-PgitCommitVersion=${arVersion}"
+			commandLine "cmd", "/c" , "gradle", "buildar", "-PpackageVersion=${pVersion}", "-PgitCommitVersion=${arVersion}", compileSdkVer, buildToolsVer, minSdkVer, targetSdkVer, supportVer
 		}
 		else {
-			commandLine "gradle", "buildar", "-PpackageVersion=${pVersion}", "-PgitCommitVersion=${arVersion}"
+			commandLine "gradle", "buildar", "-PpackageVersion=${pVersion}", "-PgitCommitVersion=${arVersion}", compileSdkVer, buildToolsVer, minSdkVer, targetSdkVer, supportVer
 		}
 	}
 }

src/build.gradle

@@ -3,7 +3,17 @@
 *	It builds the C++ part of the runtime with the ndk-build command, which is currently impossible to do with the android plugin for gradle
 *	The script also builds the nativescript.jar file containing the binding generator and the rest of the android runtime
 *
-*	How to run script and build android runtime run: "gradle buildar"
+*	Test command:
+*			gradle buildar -PtargetSdk=android-23 -PminSdk=17  -PbuildToolsVersion=23.0.2 -PsupportVersion=23.0.1  -PcompileSdk=android-23
+*	To run: 
+*			gradle buildar
+*
+* 	Options:
+*			-PtargetSdk=[target_sdk] (default is 22)
+*			-PminSdk=[target_sdk] (default is 19)
+*			-PbuildToolsVersion=[build_tools_version] (default is 22.0.1)
+*			-PsupportVersion=[support_version] (default (22.2.0)
+*			-PcompileSdk=[compile_sdk_version] (default 22)
 */
 
 def distDir = "$rootDir/dist"
@@ -23,14 +33,57 @@ buildscript {
 
 apply plugin: 'com.android.library' //com.android.application for applications (build process is different)
 
+def compiteCompileSdkVersion () {
+	if(project.hasProperty("compileSdk")) {
+		return compileSdk
+	}
+	else {
+		return 22
+	}
+}
+
+def computeBuildToolsVersion() {
+	if(project.hasProperty("buildToolsVersion")) {
+		return buildToolsVersion
+	}
+	else {
+		return "22.0.1"
+	}
+}
+
+def computeMinSdkVersion() {
+	if(project.hasProperty("minSdk")) {
+		return targetSdk
+	}
+	else {
+		return 19
+	}
+}
+
+def computeTargetSdkVersion() {
+	if(project.hasProperty("targetSdk")) {
+		return targetSdk
+	}
+	else {
+		return 22
+	}
+}
+
+def computeSupportVersion() { 
+	if(project.hasProperty("supportVersion")) {
+		return supportVersion
+	}
+	return "22.2.0"
+}
+
 //configuration of the android plugin for gradle
 android {
-	compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+	compileSdkVersion compiteCompileSdkVersion()
+    buildToolsVersion computeBuildToolsVersion()
 
 	defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 22
+        minSdkVersion computeMinSdkVersion()
+        targetSdkVersion computeTargetSdkVersion()
         versionCode 1
         versionName "1.0"
     }
@@ -53,10 +106,11 @@ repositories {
 
 dependencies {
 	def sdkPath = android.sdkDirectory.getAbsolutePath();
-	def androidJar = sdkPath + "/platforms/" + android.compileSdkVersion + "/android.jar"	
-    
-	compile 'com.android.support:support-v4:22.2.0'
-    compile 'com.android.support:appcompat-v7:22.2.0'
+	def androidJar = sdkPath + "/platforms/" + android.compileSdkVersion + "/android.jar"
+	def suppotVer = computeSupportVersion();
+	
+	compile "com.android.support:support-v4:$suppotVer"
+    compile "com.android.support:appcompat-v7:$suppotVer"
 	compile files(androidJar)
 	compile files(pathToBindingGeneratorJar)
 }

test-app/build.gradle

@@ -1,3 +1,17 @@
+/*
+*	Test command:
+*			gradle runtest -PtargetSdk=android-23 -PminSdk=17  -PbuildToolsVersion=23.0.2 -PsupportVersion=23.0.1  -PcompileSdk=android-23
+*	To run:
+*			gradle runtest
+*
+* 	Options:
+*			-PtargetSdk=[target_sdk] (default is 22)
+*			-PminSdk=[target_sdk] (default is 17)
+*			-PbuildToolsVersion=[build_tools_version] (default is 22.0.1)
+*			-PsupportVersion=[support_version] (default (22.2.0)
+*			-PcompileSdk=[compile_sdk_version] (default 22)
+*/
+
 def isWinOs = System.properties['os.name'].toLowerCase().contains('windows')
 def allJarPaths = new LinkedList <String> ()
 
@@ -13,22 +27,56 @@ buildscript {
 
 apply plugin: "com.android.application"
 
+
+def compiteCompileSdkVersion () {
+	if(project.hasProperty("compileSdk")) {
+		return compileSdk
+	}
+	else {
+		return 22
+	}
+}
+
+def computeBuildToolsVersion() {
+	if(project.hasProperty("buildToolsVersion")) {
+		return buildToolsVersion
+	}
+	else {
+		return "22.0.1"
+	}
+}
+
+def computeMinSdkVersion() {
+	if(project.hasProperty("minSdk")) {
+		return targetSdk
+	}
+	else {
+		return 17
+	}
+}
+
 def computeTargetSdkVersion() {
 	if(project.hasProperty("targetSdk")) {
-	
 		return targetSdk
 	}
 	else {
 		return 22
 	}
 }
 
+def computeSupportVersion() { 
+	if(project.hasProperty("supportVersion")) {
+		return supportVersion
+	}
+	return "22.2.0"
+}
+
 android {
-	compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+	compileSdkVersion compiteCompileSdkVersion()
+    buildToolsVersion computeBuildToolsVersion()
 
 	defaultConfig {
-		minSdkVersion 17
+		minSdkVersion computeMinSdkVersion()
 		targetSdkVersion computeTargetSdkVersion()
 	}
 
@@ -77,7 +125,9 @@ repositories {
 
 dependencies {
 	def nativescriptJarPath = "$rootDir/libs/nativescript.jar"
-	compile 'com.android.support:support-v4:22.2.0'
+	def suppotVer = computeSupportVersion();
+	
+	compile "com.android.support:support-v4:$suppotVer"
 	compile files(nativescriptJarPath)
 }