adapt project template to copy optimized runtime aar by default

Author: petekanev

build-artifacts/project-template-gradle/build.gradle

@@ -205,11 +205,22 @@ dependencies {
 	// compile files("$rootDir/libs/aar") {
         // builtBy 'copyAarDependencies'
     // }
-	
+	copyNativeScriptAar()
+
 	compile project(':runtime')
 }
 
 
+def copyNativeScriptAar() {
+	def runtimeAarType = project.hasProperty("nooptimize") ? "regular" : "optimized";
+
+	copy {
+		from "$projectDir/libs/runtime-libs/nativescript-${runtimeAarType}.aar"
+		into "$projectDir/libs/runtime-libs/"
+		rename "nativescript-${runtimeAarType}.aar", "nativescript.aar"
+	}
+}
+
 ////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////// CONFIGURATION PHASE //////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////

build.gradle

@@ -141,9 +141,9 @@ task generateRuntimeAar(type: Exec) {
 
 task copyGeneratedRuntime << {
 	copy {
-		from "$rootDir/runtime/build/outputs/aar/runtime-release.aar"
+		from "$rootDir/runtime/build/outputs/aar/runtime-regular-release.aar"
 		into "$rootDir/dist/framework/libs/runtime-libs/"
-		rename "runtime-release.aar", "nativescript.aar"
+		rename "runtime-regular-release.aar", "nativescript-regular.aar"
 	}
 
 	copy {

runtime/build.gradle

@@ -202,6 +202,8 @@ model {
         defaultConfig.with {
             if(optimized) {
                 project.archivesBaseName = "${archivesBaseName}-optimized"
+            } else {
+                project.archivesBaseName = "${archivesBaseName}-regular"
             }
 
             minSdkVersion.apiLevel = 17
@@ -265,10 +267,6 @@ model {
             minifyEnabled = false
             proguardFiles.add(file('proguard-rules.txt'))
 
-            if(optimized) {
-                versionNameSuffix '-optimized'
-            }
-
             ndk {
                 debuggable = ndkDebuggable