fixed gradle test-app passing parameters

Author: Plamen5kov

test-app/AndroidManifest.xml

@@ -4,8 +4,7 @@
     android:versionName="1.0" >
 
     <uses-sdk
-        android:minSdkVersion="17"
-        android:targetSdkVersion="22" />
+        android:minSdkVersion="17"/>
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

test-app/build.gradle

@@ -14,6 +14,7 @@
 
 def isWinOs = System.properties['os.name'].toLowerCase().contains('windows')
 def allJarPaths = new LinkedList <String> ()
+def envVars = new LinkedList<String>()
 
 buildscript {
     repositories {
@@ -44,7 +45,7 @@ def computeBuildToolsVersion() {
 
 def computeMinSdkVersion() {
 	if(project.hasProperty("minSdk")) {
-		return targetSdk
+		return minSdk
 	}
 	return 17
 }
@@ -66,10 +67,14 @@ def computeSupportVersion() {
 android {
 	compileSdkVersion computeCompileSdkVersion()
     buildToolsVersion computeBuildToolsVersion()
+	envVars.addFirst("-PcompileSdk=" + compileSdkVersion);
+	envVars.addFirst("-PbuildToolsVersion=" + buildToolsVersion);
 
 	defaultConfig {
 		minSdkVersion computeMinSdkVersion()
 		targetSdkVersion computeTargetSdkVersion()
+		envVars.addFirst("-PminSdk=" + minSdkVersion);
+		envVars.addFirst("-PtargetSdk=" + targetSdkVersion);
 	}
 
 	sourceSets.main {
@@ -118,6 +123,7 @@ repositories {
 dependencies {
 	def nativescriptJarPath = "$rootDir/libs/nativescript.jar"
 	def suppotVer = computeSupportVersion();
+	envVars.addFirst("-PsupportVersion=" + suppotVer);
 
 	compile "com.android.support:support-v4:$suppotVer"
 	compile files(nativescriptJarPath)
@@ -238,10 +244,22 @@ task runJarProject (type: Exec) {
 	println "---- jar project so metadata can be made for it"
 
 	if(isWinOs) {
-		commandLine "cmd", "/c", "gradlew", "-b", "jarProject.gradle", "jarReleaseClasses", "copyJaredProject"
+		envVars.addFirst("copyJaredProject");
+		envVars.addFirst("jarReleaseClasses");
+		envVars.addFirst("jarProject.gradle");
+		envVars.addFirst("-b");
+		envVars.addFirst("gradlew");
+		envVars.addFirst("/c");
+		envVars.addFirst("cmd");
+		commandLine envVars.toArray();
 	}
 	else {
-		commandLine "./gradlew", "-b", "jarProject.gradle", "jarReleaseClasses", "copyJaredProject"
+		envVars.addFirst("copyJaredProject");
+		envVars.addFirst("jarReleaseClasses");
+		envVars.addFirst("jarProject.gradle");
+		envVars.addFirst("-b");
+		envVars.addFirst("./gradlew");
+		commandLine envVars.toArray();
 	}
 }
 

test-app/jarProject.gradle

@@ -17,19 +17,51 @@ repositories {
     jcenter()
 }
 
-dependencies {
-	// def sdkPath = android.sdkDirectory.getAbsolutePath();
-	// def androidJar = sdkPath + "/platforms/" + android.compileSdkVersion + "/android.jar"	
-	def nativescriptJar = "../dist/framework/libs/nativescript.jar"
-    
-	compile 'com.android.support:support-v4:22.2.0'
-	compile files(nativescriptJar)
-    // compile 'com.android.support:appcompat-v7:22.2.0'
-	// compile files(androidJar)
+def computeCompileSdkVersion () {
+	if(project.hasProperty("compileSdk")) {
+		return compileSdk
+	}
+	return 22
+}
+
+def computeBuildToolsVersion() {
+	if(project.hasProperty("buildToolsVersion")) {
+		return buildToolsVersion
+	}
+	return "22.0.1"
+}
+
+def computeMinSdkVersion() {
+	if(project.hasProperty("minSdk")) {
+		return minSdk
+	}
+	return 17
+}
+
+def computeTargetSdkVersion() {
+	if(project.hasProperty("targetSdk")) {
+		return targetSdk
+	}
+	return 22
 }
+
+def computeSupportVersion() { 
+	if(project.hasProperty("supportVersion")) {
+		return supportVersion
+	}
+	return "22.2.0"
+}
+
+
 android {
-	buildToolsVersion "22.0.1"
-	compileSdkVersion 22
+
+	compileSdkVersion computeCompileSdkVersion()
+    buildToolsVersion computeBuildToolsVersion()
+	
+	defaultConfig {
+		minSdkVersion computeMinSdkVersion()
+		targetSdkVersion computeTargetSdkVersion()
+	}
 
 	sourceSets.main {
 		//manifest is necessary to generate a BuildConfig.java file necessary for build
@@ -39,6 +71,15 @@ android {
 	}
 }
 
+dependencies {
+	def nativescriptJar = "../dist/framework/libs/nativescript.jar"
+	def suppotVer = computeSupportVersion();
+    
+	compile "com.android.support:support-v4:$suppotVer"
+	compile files(nativescriptJar)
+    // compile "com.android.support:appcompat-v7:suppotVer"
+}
+
 task copyJaredProject (type:Copy) {
 	from "$rootDir/build/intermediates/packaged/release"
 	into "$rootDir/metadata/libs"