Merge pull request #340 from NativeScript/plamen5kov/enable_pass_build_parameters

enabled passing compileSdk, support version and other variables

Author: Plamen5kov

android-metadata-generator

@@ -0,0 +1,6 @@
+#Tue Jan 26 14:00:17 EET 2016
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip

binding-generator/Generator/gradle/wrapper/gradle-wrapper.jar

@@ -1,3 +1,17 @@
+/*
+*	Test command 
+*			gradlew packar -PtargetSdk=android-23 -PminSdk=17  -PbuildToolsVersion=23.0.2 -PsupportVersion=23.0.1  -PcompileSdk=android-23
+*	To run: 
+*			gradlew 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,14 @@ 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 = "";
+
+def envVars = new LinkedList<String>()
+
 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 +47,27 @@ 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"
+		envVars.add(compileSdkVer)
+	}
+	if(project.hasProperty("buildToolsVersion")) {
+		buildToolsVer = "-PbuildToolsVersion=$buildToolsVersion"
+		envVars.add(buildToolsVer)
+	}
+	if(project.hasProperty("minSdk")) {
+		minSdkVer = "-PminSdk=$minSdk"
+		envVars.add(minSdkVer)
+	}
+	if(project.hasProperty("targetSdk")) {
+		targetSdkVer = "-PtargetSdk=$targetSdk"
+		envVars.add(targetSdkVer)
+	}
+	if(project.hasProperty("supportVersion")) {
+		supportVer = "-PsupportVersion=$supportVersion"
+		envVars.add(supportVer)
+	}
 }
 
 task checkAndroidCommand(type:Exec) {
@@ -136,13 +179,23 @@ task deleteCommitFile (type: Delete) {
 task generateRuntime (type: Exec) {
 	doFirst{
 		workingDir "$rootDir/src"
-		
-		//command gradle buildar -PpackageVersion=[from_package.json] -PgitCommitVersion=[from_some_sys_variable]
+
+		//command gradlew buildar -PpackageVersion=[from_package.json] -PgitCommitVersion=[from_some_sys_variable]
 		if(isWinOs) {
-			commandLine "cmd", "/c" , "gradle", "buildar", "-PpackageVersion=${pVersion}", "-PgitCommitVersion=${arVersion}"
+			envVars.addFirst("-PgitCommitVersion=${arVersion}");
+			envVars.addFirst("-PpackageVersion=${pVersion}");
+			envVars.addFirst("buildar");
+			envVars.addFirst("gradlew");
+			envVars.addFirst("/c");
+			envVars.addFirst("cmd");
+			commandLine envVars.toArray()
 		}
 		else {
-			commandLine "gradle", "buildar", "-PpackageVersion=${pVersion}", "-PgitCommitVersion=${arVersion}"
+			envVars.addFirst("-PgitCommitVersion=${arVersion}");
+			envVars.addFirst("-PpackageVersion=${pVersion}");
+			envVars.addFirst("buildar");
+			envVars.addFirst("./gradlew");
+			commandLine envVars.toArray();
 		}
 	}
 }
@@ -156,10 +209,10 @@ task generateMetadataGeneratorJar (type: Exec) {
 	workingDir "$rootDir/android-metadata-generator"
 
 	if(isWinOs) {
-		commandLine "cmd", "/c", "gradle", "jarmg"
+		commandLine "cmd", "/c", "gradlew", "jarmg"
 	}
 	else {
-		commandLine "gradle", "jarmg"
+		commandLine "./gradlew", "jarmg"
 	}
 }
 

binding-generator/Generator/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Tue Jan 26 13:33:45 EET 2016
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip