From ab360828e45dd84fbe90790e7c77d2605071f79d Mon Sep 17 00:00:00 2001
From: plamen5kov <plamen.krasimirov.petkov@gmail.com>
Date: Thu, 2 Nov 2017 13:01:02 +0200
Subject: [PATCH 01/12] update buildscript move xml files remove unused
 dependency from test-app

---
 .../src/debug/res/layout/error_activity.xml   | 39 --------------
 .../src/debug/res/layout/exception_tab.xml    | 52 -------------------
 .../src/debug/res/layout/logcat_tab.xml       | 52 -------------------
 .../src/debug/res/values/colors.xml           |  4 --
 .../src/main/AndroidManifest.xml              | 40 --------------
 .../src/main/res/values-v21/colors.xml        |  4 --
 .../src/main/res/values-v21/styles.xml        | 23 --------
 .../src/main/res/values/colors.xml            |  6 ---
 .../src/main/res/values/errorstyles.xml       |  7 ---
 .../src/main/res/values/strings.xml           |  5 --
 .../src/main/res/values/styles.xml            | 22 --------
 build.gradle                                  | 18 +++----
 test-app/runtime/build.gradle                 |  1 -
 test-app/test-app.iml                         |  2 +-
 14 files changed, 10 insertions(+), 265 deletions(-)
 delete mode 100644 build-artifacts/project-template-gradle/src/debug/res/layout/error_activity.xml
 delete mode 100644 build-artifacts/project-template-gradle/src/debug/res/layout/exception_tab.xml
 delete mode 100644 build-artifacts/project-template-gradle/src/debug/res/layout/logcat_tab.xml
 delete mode 100644 build-artifacts/project-template-gradle/src/debug/res/values/colors.xml
 delete mode 100644 build-artifacts/project-template-gradle/src/main/AndroidManifest.xml
 delete mode 100644 build-artifacts/project-template-gradle/src/main/res/values-v21/colors.xml
 delete mode 100644 build-artifacts/project-template-gradle/src/main/res/values-v21/styles.xml
 delete mode 100644 build-artifacts/project-template-gradle/src/main/res/values/colors.xml
 delete mode 100644 build-artifacts/project-template-gradle/src/main/res/values/errorstyles.xml
 delete mode 100644 build-artifacts/project-template-gradle/src/main/res/values/strings.xml
 delete mode 100644 build-artifacts/project-template-gradle/src/main/res/values/styles.xml

diff --git a/build-artifacts/project-template-gradle/src/debug/res/layout/error_activity.xml b/build-artifacts/project-template-gradle/src/debug/res/layout/error_activity.xml
deleted file mode 100644
index 8720947cf..000000000
--- a/build-artifacts/project-template-gradle/src/debug/res/layout/error_activity.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
-                tools:context="com.tns.ErrorReportActivity"
-                android:theme="@style/Widget.AppCompat.Light.ActionBar">
-
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="?attr/actionBarSize"/>
-
-    <android.support.v4.view.ViewPager
-        android:id="@+id/pager"
-        android:layout_width="match_parent"
-        android:layout_height="fill_parent"
-        android:layout_below="@+id/toolbar"
-        android:scrollbarAlwaysDrawVerticalTrack="false">
-
-    </android.support.v4.view.ViewPager>
-
-    <android.support.design.widget.TabLayout
-        android:id="@+id/tabLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?attr/colorPrimary"
-        android:minHeight="?attr/actionBarSize"
-        app:tabIndicatorColor="@color/nativescript_blue"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentStart="true"
-        android:scrollbarStyle="insideOverlay"
-        android:scrollbars="vertical"
-        tools:tabBackground="@android:color/darker_gray"
-        android:scrollbarAlwaysDrawVerticalTrack="false"
-        />
-</RelativeLayout>
\ No newline at end of file
diff --git a/build-artifacts/project-template-gradle/src/debug/res/layout/exception_tab.xml b/build-artifacts/project-template-gradle/src/debug/res/layout/exception_tab.xml
deleted file mode 100644
index 4e9bca2bb..000000000
--- a/build-artifacts/project-template-gradle/src/debug/res/layout/exception_tab.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:paddingBottom="10dp"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
-                android:paddingTop="10dp">
-
-    <Button
-        android:id="@+id/btnCopyException"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:background="@color/nativescript_blue"
-        android:paddingLeft="20dp"
-        android:paddingRight="20dp"
-        android:text="Copy to clipboard"
-        android:textAlignment="textStart"
-        android:textColor="@android:color/white"
-        tools:layout_width="match_parent"/>
-
-    <LinearLayout
-        android:id="@+id/linearLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@+id/btnCopyException"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
-        android:orientation="vertical"
-        android:paddingBottom="10dp"
-        android:weightSum="100">
-
-        <TextView
-            android:id="@+id/txtErrorMsg"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text=""
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:paddingLeft="2dp"
-            android:paddingRight="2dp"
-            android:scrollbars="vertical"
-            android:scrollbarStyle="outsideOverlay"
-            android:scrollbarAlwaysDrawVerticalTrack="true"/>
-
-    </LinearLayout>
-
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/build-artifacts/project-template-gradle/src/debug/res/layout/logcat_tab.xml b/build-artifacts/project-template-gradle/src/debug/res/layout/logcat_tab.xml
deleted file mode 100644
index 5d94c1599..000000000
--- a/build-artifacts/project-template-gradle/src/debug/res/layout/logcat_tab.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:paddingBottom="10dp"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
-                android:paddingTop="10dp">
-
-    <Button
-        android:id="@+id/btnCopyLogcat"
-        android:layout_height="wrap_content"
-        android:text="Copy to sdcard"
-        android:layout_width="match_parent"
-        android:background="@color/nativescript_blue"
-        android:textColor="@android:color/white"
-        android:textAlignment="textStart"
-        android:paddingLeft="20dp"
-        android:paddingRight="20dp"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        tools:layout_width="match_parent"/>
-
-    <LinearLayout
-        android:id="@+id/logcatLinearLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:weightSum="100"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentStart="true"
-        android:layout_above="@+id/btnCopyLogcat"
-        android:paddingBottom="10dp">
-
-        <TextView
-            android:id="@+id/logcatMsg"
-            android:layout_width="match_parent"
-            android:text=""
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:layout_height="wrap_content"
-            android:paddingLeft="2dp"
-            android:paddingRight="2dp"
-            android:scrollbars="vertical"
-            android:scrollbarStyle="outsideOverlay"
-            android:scrollbarAlwaysDrawVerticalTrack="true"/>
-
-    </LinearLayout>
-
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/build-artifacts/project-template-gradle/src/debug/res/values/colors.xml b/build-artifacts/project-template-gradle/src/debug/res/values/colors.xml
deleted file mode 100644
index 01ab61b41..000000000
--- a/build-artifacts/project-template-gradle/src/debug/res/values/colors.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="nativescript_blue">#3c5afd</color>
-</resources>
\ No newline at end of file
diff --git a/build-artifacts/project-template-gradle/src/main/AndroidManifest.xml b/build-artifacts/project-template-gradle/src/main/AndroidManifest.xml
deleted file mode 100644
index fd39a5c33..000000000
--- a/build-artifacts/project-template-gradle/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="__PACKAGE__"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-   <supports-screens
-        android:smallScreens="true"
-        android:normalScreens="true"
-        android:largeScreens="true"
-        android:xlargeScreens="true"/>
-	
-   <uses-sdk
-        android:minSdkVersion="17"
-		android:targetSdkVersion="__APILEVEL__"/>
-    
-    <uses-permission android:name="android.permission.INTERNET"/>
-    
-    <application
-        android:name="com.tns.NativeScriptApplication"
-        android:allowBackup="true"
-        android:icon="@drawable/icon"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
-		<activity
-            android:name="com.tns.NativeScriptActivity"
-            android:label="@string/title_activity_kimera"
-            android:configChanges="keyboardHidden|orientation|screenSize">
-            
-             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity android:name="com.tns.ErrorReportActivity"
-				  android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
-    </application>
-
-</manifest>
diff --git a/build-artifacts/project-template-gradle/src/main/res/values-v21/colors.xml b/build-artifacts/project-template-gradle/src/main/res/values-v21/colors.xml
deleted file mode 100644
index a64641a9d..000000000
--- a/build-artifacts/project-template-gradle/src/main/res/values-v21/colors.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<color name="ns_accent">#3d5afe</color>
-</resources>
\ No newline at end of file
diff --git a/build-artifacts/project-template-gradle/src/main/res/values-v21/styles.xml b/build-artifacts/project-template-gradle/src/main/res/values-v21/styles.xml
deleted file mode 100644
index da2272ea5..000000000
--- a/build-artifacts/project-template-gradle/src/main/res/values-v21/styles.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- Application theme -->
-    <style name="AppTheme" parent="AppThemeBase">
-        <item name="android:datePickerStyle">@style/SpinnerDatePicker</item>
-        <item name="android:timePickerStyle">@style/SpinnerTimePicker</item>       
-    </style>
-
-    <!-- Default style for DatePicker - in spinner mode -->
-    <style name="SpinnerDatePicker" parent="android:Widget.Material.Light.DatePicker">
-        <item name="android:datePickerMode">spinner</item>
-    </style>
-
-    <!-- Default style for TimePicker - in spinner mode -->
-    <style name="SpinnerTimePicker" parent="android:Widget.Material.Light.TimePicker">
-        <item name="android:timePickerMode">spinner</item>
-    </style>
-    
-	<style name="NativeScriptToolbarStyle" parent="NativeScriptToolbarStyleBase">
-        <item name="android:elevation">4dp</item>
-    </style>    
-</resources>
\ No newline at end of file
diff --git a/build-artifacts/project-template-gradle/src/main/res/values/colors.xml b/build-artifacts/project-template-gradle/src/main/res/values/colors.xml
deleted file mode 100644
index 4b46e883e..000000000
--- a/build-artifacts/project-template-gradle/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ns_primary">#F5F5F5</color>
-	<color name="ns_primaryDark">#757575</color>
-	<color name="ns_accent">#33B5E5</color>
-</resources>
\ No newline at end of file
diff --git a/build-artifacts/project-template-gradle/src/main/res/values/errorstyles.xml b/build-artifacts/project-template-gradle/src/main/res/values/errorstyles.xml
deleted file mode 100644
index f16d76814..000000000
--- a/build-artifacts/project-template-gradle/src/main/res/values/errorstyles.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <style name="NoActionBar" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="android:windowActionBar">false</item>
-        <item name="android:windowNoTitle">true</item>
-    </style>
-</resources> 
diff --git a/build-artifacts/project-template-gradle/src/main/res/values/strings.xml b/build-artifacts/project-template-gradle/src/main/res/values/strings.xml
deleted file mode 100644
index 4abc791d6..000000000
--- a/build-artifacts/project-template-gradle/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">__NAME__</string>
-    <string name="title_activity_kimera">__TITLE_ACTIVITY__</string>
-</resources>
\ No newline at end of file
diff --git a/build-artifacts/project-template-gradle/src/main/res/values/styles.xml b/build-artifacts/project-template-gradle/src/main/res/values/styles.xml
deleted file mode 100644
index 75a1d7910..000000000
--- a/build-artifacts/project-template-gradle/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-	<style name="AppThemeBase" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="toolbarStyle">@style/NativeScriptToolbarStyle</item>
-        
-		<item name="colorPrimary">@color/ns_primary</item>
-    	<item name="colorPrimaryDark">@color/ns_primaryDark</item>
-		<item name="colorAccent">@color/ns_accent</item>
-    </style>
-    
-    <style name="AppTheme" parent="AppThemeBase">
-    </style>
-
-    <style name="NativeScriptToolbarStyleBase" parent="Widget.AppCompat.Toolbar">
-        <item name="android:background">@color/ns_primary</item>
-        <item name="theme">@style/ThemeOverlay.AppCompat.ActionBar</item>
-        <item name="popupTheme">@style/ThemeOverlay.AppCompat</item>
-    </style>
-    
-	<style name="NativeScriptToolbarStyle" parent="NativeScriptToolbarStyleBase">
-    </style>
-</resources> 
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 6d6dd8278..ffb8813d9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -55,11 +55,11 @@ task copyFilesToProjectTemeplate {
             from "$rootDir/test-app/app/src/main/java/com/tns/ErrorReport.java"
             from "$rootDir/test-app/app/src/main/java/com/tns/ErrorReportActivity.java"
             from "$rootDir/test-app/app/src/main/java/com/tns/NativeScriptSyncService.java"
-            into "$rootDir/build-artifacts/project-template-gradle/src/debug/java/com/tns/"
+            into "$rootDir/build-artifacts/project-template-gradle/app/src/debug/java/com/tns/"
         }
         copy {
             from "$rootDir/test-app/app/src/main/assets/internal"
-            into "$rootDir/build-artifacts/project-template-gradle/src/main/assets/internal"
+            into "$rootDir/build-artifacts/project-template-gradle/app/src/main/assets/internal"
         }
         copy {
             from "$rootDir/test-app/app/src/main/java/com/tns/AndroidJsV8Inspector.java"
@@ -69,11 +69,11 @@ task copyFilesToProjectTemeplate {
             from "$rootDir/test-app/app/src/main/java/com/tns/NativeScriptUncaughtExceptionHandler.java"
             from "$rootDir/test-app/app/src/main/java/com/tns/RuntimeHelper.java"
             from "$rootDir/test-app/app/src/main/java/com/tns/Util.java"
-            into "$rootDir/build-artifacts/project-template-gradle/src/main/java/com/tns/"
+            into "$rootDir/build-artifacts/project-template-gradle/app/src/main/java/com/tns/"
         }
         copy {
             from "$rootDir/test-app/app/src/main/java/com/tns/internal"
-            into "$rootDir/build-artifacts/project-template-gradle/src/main/java/com/tns/internal"
+            into "$rootDir/build-artifacts/project-template-gradle/app/src/main/java/com/tns/internal"
         }
     }
 }
@@ -164,13 +164,13 @@ task copyGeneratedRuntime {
     doLast {
         copy {
             from "$rootDir/test-app/runtime/build/outputs/aar/runtime-regular-release.aar"
-            into "$rootDir/dist/framework/libs/runtime-libs/"
+            into "$rootDir/dist/framework/app/libs/runtime-libs/"
             rename "runtime-regular-release.aar", "nativescript-regular.aar"
         }
 
         copy {
             from "$rootDir/test-app/runtime/build/outputs/aar/runtime-optimized-release.aar"
-            into "$rootDir/dist/framework/libs/runtime-libs/"
+            into "$rootDir/dist/framework/app/libs/runtime-libs/"
             rename "runtime-optimized-release.aar", "nativescript-optimized.aar"
         }
     }
@@ -284,9 +284,9 @@ task copyReadme(type: Copy) {
 }
 
 task cleanBuildArtefacts(type: Delete) {
-    delete "$rootDir/build-artifacts/project-template-gradle/src/debug/java"
-    delete "$rootDir/build-artifacts/project-template-gradle/src/main/java"
-    delete "$rootDir/build-artifacts/project-template-gradle/src/main/assets"
+    delete "$rootDir/build-artifacts/project-template-gradle/app/src/debug/java"
+    delete "$rootDir/build-artifacts/project-template-gradle/app/src/main/java"
+    delete "$rootDir/build-artifacts/project-template-gradle/app/src/main/assets"
 }
 
 //clean and set up dirs
diff --git a/test-app/runtime/build.gradle b/test-app/runtime/build.gradle
index a18731847..cdbf0f78b 100644
--- a/test-app/runtime/build.gradle
+++ b/test-app/runtime/build.gradle
@@ -66,7 +66,6 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:26.0.2'
 }
 
 tasks.whenTaskAdded { task ->
diff --git a/test-app/test-app.iml b/test-app/test-app.iml
index a2d28c6cd..6a2a0b6b4 100644
--- a/test-app/test-app.iml
+++ b/test-app/test-app.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="test-app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="test-app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/runtime" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>

From 53c4381f1e408786e1bb336720cd2a7142709a84 Mon Sep 17 00:00:00 2001
From: plamen5kov <plamen.krasimirov.petkov@gmail.com>
Date: Thu, 2 Nov 2017 13:02:14 +0200
Subject: [PATCH 02/12] make changes to build.gradle

---
 .../project-template-gradle/build.gradle      | 366 +++++++++---------
 1 file changed, 186 insertions(+), 180 deletions(-)

diff --git a/build-artifacts/project-template-gradle/build.gradle b/build-artifacts/project-template-gradle/build.gradle
index cc0f394f8..545f2427a 100644
--- a/build-artifacts/project-template-gradle/build.gradle
+++ b/build-artifacts/project-template-gradle/build.gradle
@@ -1,8 +1,8 @@
 /*
 *	Script builds apk in release or debug mode
 *	To run:
-*			gradle buildapk -Prelease (release mode)
-*			gradle buildapk (debug mode -> default)
+*			gradle assembleRelease -Prelease (release mode)
+*			gradle assembleDebug (debug mode -> default)
 * 	Options:
 *			-Prelease  //this flag will run build in release mode
 *			-PksPath=[path_to_keystore_file]
@@ -22,16 +22,8 @@ import groovy.json.JsonSlurper
 
 import java.nio.file.Files;
 import java.nio.file.Paths;
-
-buildscript {
-    repositories {
-        jcenter()
-    }
-
-	dependencies {
-		classpath "com.android.tools.build:gradle:2.2.3"
-	}
-}
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
 
 apply plugin: "com.android.application"
 
@@ -39,7 +31,7 @@ def metadataParams = new LinkedList <String> ()
 def allJarPaths = new LinkedList <String> ()
 def configStage = "\tconfig phase: "
 def nodeModulesDir = "../../node_modules/"
-def dependenciesJson = file("dependencies.json")
+def dependenciesJson = file("$rootDir/dependencies.json")
 
 // the build script will not work with previous versions of the CLI (3.1 or earlier)
 if (!dependenciesJson.exists()) {
@@ -50,6 +42,7 @@ version of the {N} CLI install a previous version of the runtime package - 'tns
 """)
 }
 
+project.ext.extractedDependenciesDir = "${project.buildDir}/exploded-dependencies";
 def nativescriptDependencies = new JsonSlurper().parseText(dependenciesJson.text)
 
 def packageJsonContents = [:]
@@ -99,12 +92,15 @@ def applyPluginsIncludeGradleConfigurations =  { ->
 	def flavorNumber = 0
 
 	nativescriptDependencies.each { dep ->
-		def androidDir = file("${dep.directory}/platforms/android")
+		def androidDir = file("$rootDir/${dep.directory}/platforms/android")
 		if (!androidDir.exists()) {
 			return
 		}
-
-		def packageJsonPath = file("${dep.directory}/package.json")
+		def includeGradleFile = new File(androidDir, "include.gradle")
+		if(!includeGradleFile.exists()) {
+			return;
+		}
+		def packageJsonPath = file("$rootDir/${dep.directory}/package.json")
 		def packageJson = new JsonSlurper().parseText(packageJsonPath.text)
 		def pluginName = packageJson.name
 		def dimensionName = sanitizeDimensionName(pluginName)
@@ -112,7 +108,6 @@ def applyPluginsIncludeGradleConfigurations =  { ->
 		dimensions.add(dimensionName)
 		def flavor = "F${flavorNumber++}"
 
-		def includeGradleFile = new File(androidDir, "include.gradle")
 		def destinationDir = file("${configurationsDir}/${pluginName}/")
 		def destinationIncludeGradleFile = file("${configurationsDir}/${pluginName}/include.gradle")
 
@@ -161,16 +156,16 @@ android {
 	}
 
 	sourceSets.main {
-        jniLibs.srcDir "$projectDir/libs/jni"
-    }
+		jniLibs.srcDir "$projectDir/libs/jni"
+	}
 
 	signingConfigs {
-        release {
-            if (project.hasProperty("release")) {
+		release {
+			if (project.hasProperty("release")) {
 				if (project.hasProperty("ksPath") &&
-					project.hasProperty("ksPassword") &&
-					project.hasProperty("alias") &&
-					project.hasProperty("password")) {
+						project.hasProperty("ksPassword") &&
+						project.hasProperty("alias") &&
+						project.hasProperty("password")) {
 
 					storeFile file(ksPath)
 					storePassword ksPassword
@@ -178,85 +173,49 @@ android {
 					keyPassword password
 				}
 			}
-        }
-    }
-    buildTypes {
-        release {
-            signingConfig signingConfigs.release
-        }
-    }
-
-	applicationVariants.all { variant ->
-		renameResultApks(variant)
-	}
-
-	applicationVariants.all { variant ->
-		def variantName = variant.name.capitalize()
-		def compileSourcesTaskName = "compile${variantName}Sources"
-		def compileSourcesTask = project.tasks.findByName(compileSourcesTaskName)
-
-		def generateBuildConfigTask = variant.generateBuildConfig;
-		generateBuildConfigTask.finalizedBy(collectAllJars)
-		if(!dontRunSbg) {
-			collectAllJars.finalizedBy(setProperties)
 		}
-
-		compileSourcesTask.finalizedBy(buildMetadata)
-
-		// forces packaging of resources and assets AFTER producing metadata
-		// Reference: https://github.com/NativeScript/android-runtime/issues/785
-
-		// Ensure metadata has been built and copied in assets before packaging
-		variant.outputs.each { output ->
-			def abiName = "";
-			if (output.getFilter(com.android.build.OutputFile.ABI)) {
-				abiName = output.getFilter(com.android.build.OutputFile.ABI)
-				def packageTask = project.tasks.findByName("package${output.name}")
-				if (packageTask) {
-					packageTask.dependsOn(buildMetadata)
-				}
-			}
+	}
+	buildTypes {
+		release {
+			signingConfig signingConfigs.release
 		}
+	}
 
-		// Compile the Java sources AFTER the Java code-generation step is done
-		def compileTask = project.tasks.findByName("compile${variantName}JavaWithJavac")
-		if (compileTask) {
-			compileTask.dependsOn("asbg:generateBindings")
-		}
+	applicationVariants.all { variant ->
+		renameResultApks(variant)
 	}
 
 	def dimensions = applyPluginsIncludeGradleConfigurations()
-	
+
 	flavorDimensions(*dimensions)
 
 	applyAppGradleConfiguration()
 }
 
+def localRuntimeExists = file("$projectDir/libs/runtime-libs/nativescript-regular.aar").exists()
+
 repositories {
-    jcenter()
-    maven { url 'https://maven.google.com' }
 
-    // used for local *.AAR files
-	def pluginDependencies = nativescriptDependencies.collect { "${it.directory}/platforms/android" }
-	pluginDependencies.add("libs/runtime-libs")
+	// used for local *.AAR files
+	def pluginDependencies = nativescriptDependencies.collect { "$rootDir/${it.directory}/platforms/android" }
+	if(localRuntimeExists) {
+		pluginDependencies.add("libs/runtime-libs")
+	}
 
-    flatDir {
-    	dirs pluginDependencies
+	flatDir {
+		dirs pluginDependencies
 	}
 }
 
 dependencies {
-	def supportVer = "22.2.0";
+	def supportVer = "22.2.0"
 	if (project.hasProperty("supportVersion")) {
 		supportVer = supportVersion
 	}
 
-    compile "com.android.support:support-v4:$supportVer"
-    compile "com.android.support:appcompat-v7:$supportVer"
+	compile "com.android.support:support-v4:$supportVer"
+	compile "com.android.support:appcompat-v7:$supportVer"
 	debugCompile "com.android.support:design:$supportVer"
-
-    // take all jars within the libs dir
-	compile fileTree(dir: "$projectDir/libs", include: ["**/*.jar"])
 }
 
 ////////////////////////////////////////////////////////////////////////////////////
@@ -265,20 +224,21 @@ dependencies {
 
 task addNativeScriptRuntimePackageDependency {
 	def useV8Symbols = nativescriptDependencies.any {
-		def packageJsonPath = file("${it.directory}/package.json");
+		def packageJsonPath = file("$rootDir/${it.directory}/package.json");
 		def packageJson = new JsonSlurper().parseText(packageJsonPath.text);
 		return packageJson.nativescript.useV8Symbols;
 	}
 
 	def runtime = useV8Symbols ? "nativescript-regular" : "nativescript-optimized";
 	println "\t + adding nativescript runtime package dependency: $runtime"
-
-	project.dependencies.add("compile", [name: runtime, ext: "aar"])
+	if(localRuntimeExists) {
+		project.dependencies.add("compile", [name: runtime, ext: "aar"])
+	}
 }
 
 task addDependenciesFromNativeScriptPlugins {
 	nativescriptDependencies.each { dep ->
-		def aarFiles = fileTree(dir: file("${dep.directory}/platforms/android"), include: ["**/*.aar"])
+		def aarFiles = fileTree(dir: file("$rootDir/${dep.directory}/platforms/android"), include: ["**/*.aar"])
 		aarFiles.each { aarFile ->
 			def length = aarFile.name.length() - 4
 			def fileName = aarFile.name[0..<length]
@@ -297,62 +257,62 @@ task addDependenciesFromNativeScriptPlugins {
 
 static def updateProductFlavorsContent(flavor, dimensionName, oldContent) {
 	def endIndex = oldContent.length() - 1;
-		def index = 0;
-		def newContent = "";
-		def level = -1;
-		def dimensionFound = false;
-
-		while(index <= endIndex) {
-			if (level == 0 && (oldContent[index] == '"' || oldContent[index] == "'")) {
-				def closingQuotes = oldContent.indexOf('"', index + 1);
-				if (closingQuotes == -1) {
-					closingQuotes = oldContent.indexOf("'", index + 1);
-				}
-
-				index = closingQuotes + 1;
-				newContent += "\"${flavor}\"";
-				continue;
+	def index = 0;
+	def newContent = "";
+	def level = -1;
+	def dimensionFound = false;
+
+	while(index <= endIndex) {
+		if (level == 0 && (oldContent[index] == '"' || oldContent[index] == "'")) {
+			def closingQuotes = oldContent.indexOf('"', index + 1);
+			if (closingQuotes == -1) {
+				closingQuotes = oldContent.indexOf("'", index + 1);
 			}
 
-			if (oldContent[index] == "{") {
-				level++;
-			}
+			index = closingQuotes + 1;
+			newContent += "\"${flavor}\"";
+			continue;
+		}
 
-			if (oldContent[index] == "}") {
-				level--;
-			}
+		if (oldContent[index] == "{") {
+			level++;
+		}
 
-			if (level > 0) {
-				if (!dimensionFound && oldContent.indexOf("dimension", index) == index) {
-					newContent += "dimension \"${dimensionName}\"";
-					dimensionFound = true;
-					index += "dimension ".length();
-					def openingQuoutes = oldContent.indexOf('"', index);
-					if (openingQuoutes == -1) {
-						openingQuoutes = oldContent.indexOf("'", index);
-					}
-
-					def closingQuotes = oldContent.indexOf('"', openingQuoutes + 1);
-					if (closingQuotes == -1) {
-						closingQuotes = oldContent.indexOf("'", openingQuoutes + 1);
-					}
-
-					index = closingQuotes + 1;
+		if (oldContent[index] == "}") {
+			level--;
+		}
+
+		if (level > 0) {
+			if (!dimensionFound && oldContent.indexOf("dimension", index) == index) {
+				newContent += "dimension \"${dimensionName}\"";
+				dimensionFound = true;
+				index += "dimension ".length();
+				def openingQuoutes = oldContent.indexOf('"', index);
+				if (openingQuoutes == -1) {
+					openingQuoutes = oldContent.indexOf("'", index);
 				}
-			}
 
-			newContent += oldContent[index];
+				def closingQuotes = oldContent.indexOf('"', openingQuoutes + 1);
+				if (closingQuotes == -1) {
+					closingQuotes = oldContent.indexOf("'", openingQuoutes + 1);
+				}
 
-			index++;
+				index = closingQuotes + 1;
+			}
 		}
 
-		return newContent;
+		newContent += oldContent[index];
+
+		index++;
+	}
+
+	return newContent;
 }
 
 static def createProductFlavorsContent(flavor, dimensionName, includeAndroidContent = true) {
 	if (includeAndroidContent)
-  	{
-    	def content = """
+	{
+		def content = """
 android {
     productFlavors {
         "${flavor}" {
@@ -361,18 +321,18 @@ android {
     }
 }
 """
-    	return content;
+		return content;
 	}
 	else
 	{
-    	def content = """
+		def content = """
     productFlavors {
         "${flavor}" {
             dimension "${dimensionName}"
         }
     }
 """
-      return content;
+		return content;
 	}
 }
 
@@ -408,28 +368,28 @@ static def modifyProductFlavorInContent(content, dimension, flavor) {
 	}
 
 	if (indexEnd != -1)
-    {
+	{
 		// full content of productFlavors { ... } -> the substring is parenthesis to parenthesis -> { ... }
-      def oldProductFlavorsText = content.substring(indexStart, indexEnd + 1);
+		def oldProductFlavorsText = content.substring(indexStart, indexEnd + 1);
 
-      def newProductFlavorsContent = updateProductFlavorsContent(flavor, dimension, oldProductFlavorsText);
+		def newProductFlavorsContent = updateProductFlavorsContent(flavor, dimension, oldProductFlavorsText);
 
-      return content.replace(oldProductFlavorsText, newProductFlavorsContent);
-    }
-    else
-    {
-        def androidContentExists = content.indexOf("android {") != -1;
-        def newProductFlavorsContent = createProductFlavorsContent(flavor, dimension, !androidContentExists);
-
-        if (androidContentExists)
-        {
-           return content.replace("android {", "android { ${newProductFlavorsContent}");
-        }
-        else
-        {
-           return "${newProductFlavorsContent} \t ${content}"
-        }
-    }
+		return content.replace(oldProductFlavorsText, newProductFlavorsContent);
+	}
+	else
+	{
+		def androidContentExists = content.indexOf("android {") != -1;
+		def newProductFlavorsContent = createProductFlavorsContent(flavor, dimension, !androidContentExists);
+
+		if (androidContentExists)
+		{
+			return content.replace("android {", "android { ${newProductFlavorsContent}");
+		}
+		else
+		{
+			return "${newProductFlavorsContent} \t ${content}"
+		}
+	}
 }
 
 def copyFolder(source, destination) {
@@ -466,18 +426,85 @@ def copyAndRenamePluginDirToFlavorName(directory, flavor) {
 }
 
 task ensureMetadataOutDir {
-	def outputDir = file("$projectDir/metadata/output/assets/metadata")
-	outputDir.mkdirs()
+	doLast {
+		def outputDir = file("$projectDir/metadata/output/assets/metadata")
+		outputDir.mkdirs()
+	}
 }
 
 ////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////// EXECUTUION PHASE /////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////
 
+tasks.whenTaskAdded({ org.gradle.api.DefaultTask currentTask ->
+	if(currentTask =~ /generate.+BuildConfig/ ) {
+		currentTask.finalizedBy(extractAllJars)
+		extractAllJars.finalizedBy(collectAllJars)
+		collectAllJars.finalizedBy(setProperties)
+	}
+	if(currentTask =~ /compile.+JavaWithJavac/ ) {
+		currentTask.dependsOn(":asbg:generateBindings")
+		currentTask.finalizedBy(ensureMetadataOutDir)
+		ensureMetadataOutDir.finalizedBy(buildMetadata)
+	}
+	if(currentTask.equals("assembleDebug") || currentTask.equals("assembleRelease")) {
+		currentTask.finalizedBy("validateAppIdMatch");
+	}
+})
+
+def explodeAar (File compileDependency, String outputDir) {
+	if(compileDependency.name.endsWith(".aar")) {
+		JarFile jar = new JarFile(compileDependency)
+		Enumeration enumEntries = jar.entries()
+		while (enumEntries.hasMoreElements()) {
+			JarEntry file = (JarEntry) enumEntries.nextElement();
+			if(file.name.equals("classes.jar")) {
+				def f = new File(outputDir , file.name);
+				new File(f.parent).mkdirs();
+				InputStream is = jar.getInputStream(file); // get the input stream
+				FileOutputStream fos = new FileOutputStream(f);
+				while (is.available() > 0) {  // write contents of 'is' to 'fos'
+					fos.write(is.read())
+				}
+				fos.close()
+				is.close()
+			}
+			if (file.isDirectory()) {
+				continue
+			}
+		}
+		jar.close()
+	}
+	else if(compileDependency.name.endsWith(".jar")) {
+		copy {
+			from compileDependency.absolutePath
+			into outputDir
+		}
+	}
+}
+
+task extractAllJars {
+
+	outputs.dir extractedDependenciesDir
+
+	doLast {
+		def iter = configurations.compile.resolvedConfiguration.resolvedArtifacts.iterator()
+		def dependencyCounter = 0;
+		while(iter.hasNext()) {
+			//declaring variable as specific class for getting code completion in Android Studio
+			org.gradle.api.internal.artifacts.DefaultResolvedArtifact nextDependency = iter.next();
+
+			def outputDir = java.nio.file.Paths.get(extractedDependenciesDir, ""+dependencyCounter).normalize().toString();
+			explodeAar(nextDependency.file, outputDir)
+			dependencyCounter++;
+		}
+	}
+}
+
 task collectAllJars {
 	description "gathers all paths to jar dependencies before building metadata with them"
 
-	def explodedAarDir = project.buildDir.getAbsolutePath() + "/intermediates/exploded-aar/"
+	def explodedAarDir = project.hasProperty("extractedDependenciesDir") ? extractedDependenciesDir : project.buildDir.getAbsolutePath() + "/intermediates/exploded-aar/"
 	def sdkPath = android.sdkDirectory.getAbsolutePath();
 	def androidJar = sdkPath + "/platforms/" + android.compileSdkVersion + "/android.jar"
 
@@ -539,7 +566,7 @@ task buildMetadata (type: JavaExec) {
 			metadataParams.add(classesDirBuildType.getAbsolutePath())
 		}
 
-		workingDir "build-tools"
+		workingDir "$rootDir/build-tools"
 		main "-jar"
 
 		logger.info("Task buildMetadata: Call metadata-generator.jar with arguments: " + metadataParams.toString().replaceAll(',', ''))
@@ -559,9 +586,9 @@ task generateTypescriptDefinitions (type: JavaExec) {
 	def includeDirs = ["com.android.support", "/platforms/" + android.compileSdkVersion]
 
 	doFirst {
-		delete "build-tools/typings"
+		delete "$rootDir/build-tools/typings"
 
-		workingDir "build-tools"
+		workingDir "$rootDir/build-tools"
 
 		main "-jar"
 
@@ -602,8 +629,8 @@ task copyTypings {
 		println "Copied generated typings to application root level. Make sure to import android.d.ts in reference.d.ts"
 
 		copy {
-			from "$projectDir/build-tools/typings"
-			into "$projectDir/../../"
+			from "$rootDir/build-tools/typings"
+			into "$rootDir/../../"
 		}
 	}
 }
@@ -622,8 +649,8 @@ task validateAppIdMatch {
 
 			if (packageJsonMap.nativescript.id != android.defaultConfig.applicationId) {
 				def errorMessage = "${lineSeparator}WARNING: The Application identifier is different from the one inside 'package.json' file.$lineSeparator" +
-					"NativeScript CLI might not work properly.$lineSeparator" +
-					"Update the application identifier in package.json and app.gradle so that they match.";
+						"NativeScript CLI might not work properly.$lineSeparator" +
+						"Update the application identifier in package.json and app.gradle so that they match.";
 				logger.error(errorMessage);
 			}
 		}
@@ -647,26 +674,6 @@ task setProperties {
 	}
 }
 
-setProperties.finalizedBy("asbg:generateBindings", generateTypescriptDefinitions)
-
-////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////// EXECUTION ORDER /////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////
-
-collectAllJars.dependsOn(ensureMetadataOutDir)
-buildMetadata.dependsOn(collectAllJars)
-generateTypescriptDefinitions.finalizedBy(copyTypings)
-
-task buildapk {
-	//done to build only necessary apk
-	if (project.hasProperty("release")) {
-		dependsOn "assembleRelease"
-	}
-	else {
-		dependsOn "assembleDebug"
-	}
-}
-
 //////// custom clean ///////////
 task deleteMetadata (type: Delete){
 	delete "$projectDir/metadata/output", "$projectDir/src/main/assets/metadata"
@@ -690,7 +697,6 @@ task deleteGeneratedBindings(type: Delete) {
 	delete "$projectDir/src/main/java/com/tns/gen"
 }
 
-buildapk.finalizedBy("validateAppIdMatch");
 deleteMetadata.dependsOn(":asbg:clean")
 deleteFlavors.dependsOn(deleteMetadata)
 deleteGeneratedBindings.dependsOn(deleteFlavors)

From b89cb80a6fe6ae5dc07258a9627eade185ac683e Mon Sep 17 00:00:00 2001
From: plamen5kov <plamen.krasimirov.petkov@gmail.com>
Date: Thu, 2 Nov 2017 13:02:51 +0200
Subject: [PATCH 03/12] move xml files

---
 .../src/debug/res/layout/error_activity.xml   | 39 ++++++++++++++
 .../src/debug/res/layout/exception_tab.xml    | 52 +++++++++++++++++++
 .../app/src/debug/res/layout/logcat_tab.xml   | 52 +++++++++++++++++++
 .../app/src/debug/res/values/colors.xml       |  4 ++
 .../app/src/main/AndroidManifest.xml          | 40 ++++++++++++++
 .../app/src/main/res/values-v21/colors.xml    |  4 ++
 .../app/src/main/res/values-v21/styles.xml    | 23 ++++++++
 .../app/src/main/res/values/colors.xml        |  6 +++
 .../app/src/main/res/values/errorstyles.xml   |  7 +++
 .../app/src/main/res/values/strings.xml       |  5 ++
 .../app/src/main/res/values/styles.xml        | 22 ++++++++
 11 files changed, 254 insertions(+)
 create mode 100644 build-artifacts/project-template-gradle/app/src/debug/res/layout/error_activity.xml
 create mode 100644 build-artifacts/project-template-gradle/app/src/debug/res/layout/exception_tab.xml
 create mode 100644 build-artifacts/project-template-gradle/app/src/debug/res/layout/logcat_tab.xml
 create mode 100644 build-artifacts/project-template-gradle/app/src/debug/res/values/colors.xml
 create mode 100644 build-artifacts/project-template-gradle/app/src/main/AndroidManifest.xml
 create mode 100644 build-artifacts/project-template-gradle/app/src/main/res/values-v21/colors.xml
 create mode 100644 build-artifacts/project-template-gradle/app/src/main/res/values-v21/styles.xml
 create mode 100644 build-artifacts/project-template-gradle/app/src/main/res/values/colors.xml
 create mode 100644 build-artifacts/project-template-gradle/app/src/main/res/values/errorstyles.xml
 create mode 100644 build-artifacts/project-template-gradle/app/src/main/res/values/strings.xml
 create mode 100644 build-artifacts/project-template-gradle/app/src/main/res/values/styles.xml

diff --git a/build-artifacts/project-template-gradle/app/src/debug/res/layout/error_activity.xml b/build-artifacts/project-template-gradle/app/src/debug/res/layout/error_activity.xml
new file mode 100644
index 000000000..8720947cf
--- /dev/null
+++ b/build-artifacts/project-template-gradle/app/src/debug/res/layout/error_activity.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                tools:context="com.tns.ErrorReportActivity"
+                android:theme="@style/Widget.AppCompat.Light.ActionBar">
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?attr/actionBarSize"/>
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/pager"
+        android:layout_width="match_parent"
+        android:layout_height="fill_parent"
+        android:layout_below="@+id/toolbar"
+        android:scrollbarAlwaysDrawVerticalTrack="false">
+
+    </android.support.v4.view.ViewPager>
+
+    <android.support.design.widget.TabLayout
+        android:id="@+id/tabLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/colorPrimary"
+        android:minHeight="?attr/actionBarSize"
+        app:tabIndicatorColor="@color/nativescript_blue"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentStart="true"
+        android:scrollbarStyle="insideOverlay"
+        android:scrollbars="vertical"
+        tools:tabBackground="@android:color/darker_gray"
+        android:scrollbarAlwaysDrawVerticalTrack="false"
+        />
+</RelativeLayout>
\ No newline at end of file
diff --git a/build-artifacts/project-template-gradle/app/src/debug/res/layout/exception_tab.xml b/build-artifacts/project-template-gradle/app/src/debug/res/layout/exception_tab.xml
new file mode 100644
index 000000000..4e9bca2bb
--- /dev/null
+++ b/build-artifacts/project-template-gradle/app/src/debug/res/layout/exception_tab.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:paddingBottom="10dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
+                android:paddingTop="10dp">
+
+    <Button
+        android:id="@+id/btnCopyException"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:background="@color/nativescript_blue"
+        android:paddingLeft="20dp"
+        android:paddingRight="20dp"
+        android:text="Copy to clipboard"
+        android:textAlignment="textStart"
+        android:textColor="@android:color/white"
+        tools:layout_width="match_parent"/>
+
+    <LinearLayout
+        android:id="@+id/linearLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/btnCopyException"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:orientation="vertical"
+        android:paddingBottom="10dp"
+        android:weightSum="100">
+
+        <TextView
+            android:id="@+id/txtErrorMsg"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text=""
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:paddingLeft="2dp"
+            android:paddingRight="2dp"
+            android:scrollbars="vertical"
+            android:scrollbarStyle="outsideOverlay"
+            android:scrollbarAlwaysDrawVerticalTrack="true"/>
+
+    </LinearLayout>
+
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/build-artifacts/project-template-gradle/app/src/debug/res/layout/logcat_tab.xml b/build-artifacts/project-template-gradle/app/src/debug/res/layout/logcat_tab.xml
new file mode 100644
index 000000000..5d94c1599
--- /dev/null
+++ b/build-artifacts/project-template-gradle/app/src/debug/res/layout/logcat_tab.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:paddingBottom="10dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
+                android:paddingTop="10dp">
+
+    <Button
+        android:id="@+id/btnCopyLogcat"
+        android:layout_height="wrap_content"
+        android:text="Copy to sdcard"
+        android:layout_width="match_parent"
+        android:background="@color/nativescript_blue"
+        android:textColor="@android:color/white"
+        android:textAlignment="textStart"
+        android:paddingLeft="20dp"
+        android:paddingRight="20dp"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        tools:layout_width="match_parent"/>
+
+    <LinearLayout
+        android:id="@+id/logcatLinearLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:weightSum="100"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentStart="true"
+        android:layout_above="@+id/btnCopyLogcat"
+        android:paddingBottom="10dp">
+
+        <TextView
+            android:id="@+id/logcatMsg"
+            android:layout_width="match_parent"
+            android:text=""
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:layout_height="wrap_content"
+            android:paddingLeft="2dp"
+            android:paddingRight="2dp"
+            android:scrollbars="vertical"
+            android:scrollbarStyle="outsideOverlay"
+            android:scrollbarAlwaysDrawVerticalTrack="true"/>
+
+    </LinearLayout>
+
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/build-artifacts/project-template-gradle/app/src/debug/res/values/colors.xml b/build-artifacts/project-template-gradle/app/src/debug/res/values/colors.xml
new file mode 100644
index 000000000..01ab61b41
--- /dev/null
+++ b/build-artifacts/project-template-gradle/app/src/debug/res/values/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="nativescript_blue">#3c5afd</color>
+</resources>
\ No newline at end of file
diff --git a/build-artifacts/project-template-gradle/app/src/main/AndroidManifest.xml b/build-artifacts/project-template-gradle/app/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..fd39a5c33
--- /dev/null
+++ b/build-artifacts/project-template-gradle/app/src/main/AndroidManifest.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="__PACKAGE__"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+   <supports-screens
+        android:smallScreens="true"
+        android:normalScreens="true"
+        android:largeScreens="true"
+        android:xlargeScreens="true"/>
+	
+   <uses-sdk
+        android:minSdkVersion="17"
+		android:targetSdkVersion="__APILEVEL__"/>
+    
+    <uses-permission android:name="android.permission.INTERNET"/>
+    
+    <application
+        android:name="com.tns.NativeScriptApplication"
+        android:allowBackup="true"
+        android:icon="@drawable/icon"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+		<activity
+            android:name="com.tns.NativeScriptActivity"
+            android:label="@string/title_activity_kimera"
+            android:configChanges="keyboardHidden|orientation|screenSize">
+            
+             <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name="com.tns.ErrorReportActivity"
+				  android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+    </application>
+
+</manifest>
diff --git a/build-artifacts/project-template-gradle/app/src/main/res/values-v21/colors.xml b/build-artifacts/project-template-gradle/app/src/main/res/values-v21/colors.xml
new file mode 100644
index 000000000..a64641a9d
--- /dev/null
+++ b/build-artifacts/project-template-gradle/app/src/main/res/values-v21/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<color name="ns_accent">#3d5afe</color>
+</resources>
\ No newline at end of file
diff --git a/build-artifacts/project-template-gradle/app/src/main/res/values-v21/styles.xml b/build-artifacts/project-template-gradle/app/src/main/res/values-v21/styles.xml
new file mode 100644
index 000000000..da2272ea5
--- /dev/null
+++ b/build-artifacts/project-template-gradle/app/src/main/res/values-v21/styles.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Application theme -->
+    <style name="AppTheme" parent="AppThemeBase">
+        <item name="android:datePickerStyle">@style/SpinnerDatePicker</item>
+        <item name="android:timePickerStyle">@style/SpinnerTimePicker</item>       
+    </style>
+
+    <!-- Default style for DatePicker - in spinner mode -->
+    <style name="SpinnerDatePicker" parent="android:Widget.Material.Light.DatePicker">
+        <item name="android:datePickerMode">spinner</item>
+    </style>
+
+    <!-- Default style for TimePicker - in spinner mode -->
+    <style name="SpinnerTimePicker" parent="android:Widget.Material.Light.TimePicker">
+        <item name="android:timePickerMode">spinner</item>
+    </style>
+    
+	<style name="NativeScriptToolbarStyle" parent="NativeScriptToolbarStyleBase">
+        <item name="android:elevation">4dp</item>
+    </style>    
+</resources>
\ No newline at end of file
diff --git a/build-artifacts/project-template-gradle/app/src/main/res/values/colors.xml b/build-artifacts/project-template-gradle/app/src/main/res/values/colors.xml
new file mode 100644
index 000000000..4b46e883e
--- /dev/null
+++ b/build-artifacts/project-template-gradle/app/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ns_primary">#F5F5F5</color>
+	<color name="ns_primaryDark">#757575</color>
+	<color name="ns_accent">#33B5E5</color>
+</resources>
\ No newline at end of file
diff --git a/build-artifacts/project-template-gradle/app/src/main/res/values/errorstyles.xml b/build-artifacts/project-template-gradle/app/src/main/res/values/errorstyles.xml
new file mode 100644
index 000000000..f16d76814
--- /dev/null
+++ b/build-artifacts/project-template-gradle/app/src/main/res/values/errorstyles.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <style name="NoActionBar" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowNoTitle">true</item>
+    </style>
+</resources> 
diff --git a/build-artifacts/project-template-gradle/app/src/main/res/values/strings.xml b/build-artifacts/project-template-gradle/app/src/main/res/values/strings.xml
new file mode 100644
index 000000000..4abc791d6
--- /dev/null
+++ b/build-artifacts/project-template-gradle/app/src/main/res/values/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">__NAME__</string>
+    <string name="title_activity_kimera">__TITLE_ACTIVITY__</string>
+</resources>
\ No newline at end of file
diff --git a/build-artifacts/project-template-gradle/app/src/main/res/values/styles.xml b/build-artifacts/project-template-gradle/app/src/main/res/values/styles.xml
new file mode 100644
index 000000000..75a1d7910
--- /dev/null
+++ b/build-artifacts/project-template-gradle/app/src/main/res/values/styles.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+	<style name="AppThemeBase" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="toolbarStyle">@style/NativeScriptToolbarStyle</item>
+        
+		<item name="colorPrimary">@color/ns_primary</item>
+    	<item name="colorPrimaryDark">@color/ns_primaryDark</item>
+		<item name="colorAccent">@color/ns_accent</item>
+    </style>
+    
+    <style name="AppTheme" parent="AppThemeBase">
+    </style>
+
+    <style name="NativeScriptToolbarStyleBase" parent="Widget.AppCompat.Toolbar">
+        <item name="android:background">@color/ns_primary</item>
+        <item name="theme">@style/ThemeOverlay.AppCompat.ActionBar</item>
+        <item name="popupTheme">@style/ThemeOverlay.AppCompat</item>
+    </style>
+    
+	<style name="NativeScriptToolbarStyle" parent="NativeScriptToolbarStyleBase">
+    </style>
+</resources> 
\ No newline at end of file

From a3b7a326481c24ccf7c0c26e9b5bb1774b0a3eaf Mon Sep 17 00:00:00 2001
From: plamen5kov <plamen.krasimirov.petkov@gmail.com>
Date: Thu, 2 Nov 2017 13:03:14 +0200
Subject: [PATCH 04/12] move build.gradle file to app folder

---
 build-artifacts/project-template-gradle/{ => app}/build.gradle | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename build-artifacts/project-template-gradle/{ => app}/build.gradle (100%)

diff --git a/build-artifacts/project-template-gradle/build.gradle b/build-artifacts/project-template-gradle/app/build.gradle
similarity index 100%
rename from build-artifacts/project-template-gradle/build.gradle
rename to build-artifacts/project-template-gradle/app/build.gradle

From 5ecb294a423b8c4489273b5f141d5fcc26fa87eb Mon Sep 17 00:00:00 2001
From: plamen5kov <plamen.krasimirov.petkov@gmail.com>
Date: Thu, 2 Nov 2017 13:22:51 +0200
Subject: [PATCH 05/12] update static binding generator remove unnecessary
 folder from build tools

---
 android-static-binding-generator/project/build.gradle | 11 ++++++++---
 .../runtime-modules/binding-generator/build.gradle    |  2 --
 2 files changed, 8 insertions(+), 5 deletions(-)
 delete mode 100644 build-artifacts/project-template-gradle/build-tools/runtime-modules/binding-generator/build.gradle

diff --git a/android-static-binding-generator/project/build.gradle b/android-static-binding-generator/project/build.gradle
index 63352275c..c4f5d04c8 100644
--- a/android-static-binding-generator/project/build.gradle
+++ b/android-static-binding-generator/project/build.gradle
@@ -14,7 +14,7 @@ def cachedJarsFilePath = "$projectDir/cached.txt"
 def jsParserP = "$projectDir/parser/js_parser.js"
 def jsFilesParametersP = "$projectDir/jsFilesParameters.txt"
 
-def webpackWorkersExcludePath = "$projectDir/../../src/main/assets/app/__worker-chunks.json"
+def webpackWorkersExcludePath = "$rootDir/app/src/main/assets/app/__worker-chunks.json"
 def webpackWorkersExcludesList = [];
 
 def workersExcludeFile = file(webpackWorkersExcludePath);
@@ -40,8 +40,13 @@ if (project.hasProperty("outDir")) {
 def absoluteJsCodeDir;
 def jsCodeAbsolutePath;
 if (!project.hasProperty("test")) {
-	absoluteJsCodeDir = project.jsCodeDir
-	jsCodeAbsolutePath = absoluteJsCodeDir.getAbsolutePath()
+	println project.jsCodeDir.equals(null)
+	if(project.jsCodeDir.exists()) {
+		absoluteJsCodeDir = project.jsCodeDir
+		jsCodeAbsolutePath = absoluteJsCodeDir.getAbsolutePath()
+	} else {
+		logger.log(LogLevel.WARN, "The input jsCodeDir: ${jsCodeDir} folder could not be found. Please make sure you've passed the correct folder containing the .js files that need to be parsed.");
+	}
 }
 
 def utf8 = StandardCharsets.UTF_8
diff --git a/build-artifacts/project-template-gradle/build-tools/runtime-modules/binding-generator/build.gradle b/build-artifacts/project-template-gradle/build-tools/runtime-modules/binding-generator/build.gradle
deleted file mode 100644
index 39fc2fb4f..000000000
--- a/build-artifacts/project-template-gradle/build-tools/runtime-modules/binding-generator/build.gradle
+++ /dev/null
@@ -1,2 +0,0 @@
-configurations.maybeCreate("default")
-artifacts.add("default", file('../../../libs/runtime-libs/binding-generator.aar'))
\ No newline at end of file

From da53dff6b029f25d9f303aeac1bf1d0d8ad2fff6 Mon Sep 17 00:00:00 2001
From: plamen5kov <plamen.krasimirov.petkov@gmail.com>
Date: Thu, 2 Nov 2017 13:25:49 +0200
Subject: [PATCH 06/12] remove redundant script

---
 .../build-tools/check-v8-dependants.js        | 39 -------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 build-artifacts/project-template-gradle/build-tools/check-v8-dependants.js

diff --git a/build-artifacts/project-template-gradle/build-tools/check-v8-dependants.js b/build-artifacts/project-template-gradle/build-tools/check-v8-dependants.js
deleted file mode 100644
index 75b045209..000000000
--- a/build-artifacts/project-template-gradle/build-tools/check-v8-dependants.js
+++ /dev/null
@@ -1,39 +0,0 @@
-'use strict';
-
-let args = process.argv;
-let dependencies = JSON.parse(args[2]);
-let platformsDir = args[3];
-
-const path = require("path"),
-    fs = require("fs");
-
-if (dependencies) {
-    let platformDir = path.join(platformsDir, "android");
-    let buildDir = path.join(platformDir, "build-tools");
-    let useV8File = path.join(buildDir, 'useV8');
-
-    try {
-        fs.unlinkSync(useV8File);
-    } catch (e) {
-
-    }
-
-    let useV8Symbols = false;
-
-    for (let dependencyName in dependencies) {
-        let dependency = dependencies[dependencyName];
-        
-        let isPlugin = !!dependency.nativescript;
-        if (isPlugin) {
-            let consumesV8Symbols = !!dependency.nativescript.useV8symbols;
-            if (consumesV8Symbols) {
-                useV8Symbols = true;
-                break;
-            }
-        }
-    }
-
-    if (useV8Symbols) {
-        fs.writeFileSync(useV8File, "1");
-    }
-}
\ No newline at end of file

From d5d5bb4968258a5fd03100570d73dbf1516a57c9 Mon Sep 17 00:00:00 2001
From: plamen5kov <plamen.krasimirov.petkov@gmail.com>
Date: Thu, 2 Nov 2017 13:37:28 +0200
Subject: [PATCH 07/12] updates after review

---
 .../project-template-gradle/app/build.gradle        | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/build-artifacts/project-template-gradle/app/build.gradle b/build-artifacts/project-template-gradle/app/build.gradle
index 545f2427a..f792b3cc7 100644
--- a/build-artifacts/project-template-gradle/app/build.gradle
+++ b/build-artifacts/project-template-gradle/app/build.gradle
@@ -97,9 +97,7 @@ def applyPluginsIncludeGradleConfigurations =  { ->
 			return
 		}
 		def includeGradleFile = new File(androidDir, "include.gradle")
-		if(!includeGradleFile.exists()) {
-			return;
-		}
+
 		def packageJsonPath = file("$rootDir/${dep.directory}/package.json")
 		def packageJson = new JsonSlurper().parseText(packageJsonPath.text)
 		def pluginName = packageJson.name
@@ -192,7 +190,7 @@ android {
 	applyAppGradleConfiguration()
 }
 
-def localRuntimeExists = file("$projectDir/libs/runtime-libs/nativescript-regular.aar").exists()
+def localRuntimeExists = file("$projectDir/libs/runtime-libs/nativescript-regular.aar").exists() || file("$projectDir/libs/runtime-libs/nativescript-optimized.aar").exists()
 
 repositories {
 
@@ -229,9 +227,9 @@ task addNativeScriptRuntimePackageDependency {
 		return packageJson.nativescript.useV8Symbols;
 	}
 
-	def runtime = useV8Symbols ? "nativescript-regular" : "nativescript-optimized";
-	println "\t + adding nativescript runtime package dependency: $runtime"
 	if(localRuntimeExists) {
+		def runtime = useV8Symbols ? "nativescript-regular" : "nativescript-optimized";
+		println "\t + adding nativescript runtime package dependency: $runtime"
 		project.dependencies.add("compile", [name: runtime, ext: "aar"])
 	}
 }
@@ -504,7 +502,6 @@ task extractAllJars {
 task collectAllJars {
 	description "gathers all paths to jar dependencies before building metadata with them"
 
-	def explodedAarDir = project.hasProperty("extractedDependenciesDir") ? extractedDependenciesDir : project.buildDir.getAbsolutePath() + "/intermediates/exploded-aar/"
 	def sdkPath = android.sdkDirectory.getAbsolutePath();
 	def androidJar = sdkPath + "/platforms/" + android.compileSdkVersion + "/android.jar"
 
@@ -516,7 +513,7 @@ task collectAllJars {
 
 		allJarPaths.add(androidJar);
 
-		def ft = fileTree(dir: explodedAarDir, include: "**/*.jar")
+		def ft = fileTree(dir: extractedDependenciesDir, include: "**/*.jar")
 		ft.each { currentJarFile ->
 			allJarPaths.add(currentJarFile.getAbsolutePath())
 		}

From d8fc75ad1a32b814ea228aab2926e57a9439321d Mon Sep 17 00:00:00 2001
From: plamen5kov <plamen.krasimirov.petkov@gmail.com>
Date: Thu, 2 Nov 2017 13:50:03 +0200
Subject: [PATCH 08/12] added root level build gradle updated gradle to 4.1
 updated settings.gradle updated gradle.properties

---
 .../project-template-gradle/build.gradle      |  23 ++++++++++++++++++
 .../project-template-gradle/gradle.properties |  18 ++++++++++++++
 .../gradle/wrapper/gradle-wrapper.jar         | Bin 54208 -> 54208 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   4 +--
 .../project-template-gradle/settings.gradle   |   7 ++----
 5 files changed, 45 insertions(+), 7 deletions(-)
 create mode 100644 build-artifacts/project-template-gradle/build.gradle

diff --git a/build-artifacts/project-template-gradle/build.gradle b/build-artifacts/project-template-gradle/build.gradle
new file mode 100644
index 000000000..f6050738b
--- /dev/null
+++ b/build-artifacts/project-template-gradle/build.gradle
@@ -0,0 +1,23 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+
+    repositories {
+        google()
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.3.3'
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/build-artifacts/project-template-gradle/gradle.properties b/build-artifacts/project-template-gradle/gradle.properties
index 47bae1943..4f6b214fe 100644
--- a/build-artifacts/project-template-gradle/gradle.properties
+++ b/build-artifacts/project-template-gradle/gradle.properties
@@ -1,2 +1,20 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+
 android.useDeprecatedNdk = true
 org.gradle.jvmargs=-Xmx16384M
diff --git a/build-artifacts/project-template-gradle/gradle/wrapper/gradle-wrapper.jar b/build-artifacts/project-template-gradle/gradle/wrapper/gradle-wrapper.jar
index df9f043ef0a44d52c84e873dc2a60765056e6d62..3e68357b788ffd4a0e9931aad591d892291fbc99 100644
GIT binary patch
delta 28
hcmX@GocX|V<_*z@Sa^z}yf?=m5)=fpCYN0H0RX5M3k(1N

delta 28
hcmX@GocX|V<_*z@Sf-Y0du@(CBq#`GO)k0Y0|2rs3&a2b

diff --git a/build-artifacts/project-template-gradle/gradle/wrapper/gradle-wrapper.properties b/build-artifacts/project-template-gradle/gradle/wrapper/gradle-wrapper.properties
index f843584bb..666911124 100644
--- a/build-artifacts/project-template-gradle/gradle/wrapper/gradle-wrapper.properties
+++ b/build-artifacts/project-template-gradle/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jan 11 14:44:42 EET 2017
+#Thu Oct 26 15:50:33 EEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
diff --git a/build-artifacts/project-template-gradle/settings.gradle b/build-artifacts/project-template-gradle/settings.gradle
index 235dc9dd7..03eb8c27f 100644
--- a/build-artifacts/project-template-gradle/settings.gradle
+++ b/build-artifacts/project-template-gradle/settings.gradle
@@ -1,6 +1,3 @@
 rootProject.name = "__PROJECT_NAME__"
-include "asbg"
-project(":asbg").projectDir = file("build-tools/android-static-binding-generator")
-
-include "runtime"
-project(":runtime").projectDir = file("build-tools/runtime-modules/runtime")
\ No newline at end of file
+include ':app', ':asbg'
+project(':asbg').projectDir = new File('build-tools/android-static-binding-generator')

From 0aa1506be95bc48356c05850be360d36bcd2e724 Mon Sep 17 00:00:00 2001
From: Plamen Petkov <Plamen5kov@users.noreply.github.com>
Date: Thu, 2 Nov 2017 14:18:56 +0200
Subject: [PATCH 09/12] Update gradle.properties

---
 build-artifacts/project-template-gradle/gradle.properties | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/build-artifacts/project-template-gradle/gradle.properties b/build-artifacts/project-template-gradle/gradle.properties
index 4f6b214fe..52749577c 100644
--- a/build-artifacts/project-template-gradle/gradle.properties
+++ b/build-artifacts/project-template-gradle/gradle.properties
@@ -7,14 +7,11 @@
 # For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
-
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-android.useDeprecatedNdk = true
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx16384M

From a8eaa53b019e9a28bd5702eaf043b89933efe9a9 Mon Sep 17 00:00:00 2001
From: plamen5kov <plamen.krasimirov.petkov@gmail.com>
Date: Fri, 3 Nov 2017 10:03:35 +0200
Subject: [PATCH 10/12] include all jars found in .aar file

---
 build-artifacts/project-template-gradle/app/build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build-artifacts/project-template-gradle/app/build.gradle b/build-artifacts/project-template-gradle/app/build.gradle
index f792b3cc7..05e5ea2d8 100644
--- a/build-artifacts/project-template-gradle/app/build.gradle
+++ b/build-artifacts/project-template-gradle/app/build.gradle
@@ -456,12 +456,12 @@ def explodeAar (File compileDependency, String outputDir) {
 		Enumeration enumEntries = jar.entries()
 		while (enumEntries.hasMoreElements()) {
 			JarEntry file = (JarEntry) enumEntries.nextElement();
-			if(file.name.equals("classes.jar")) {
+			if(file.name.endsWith(".jar")) {
 				def f = new File(outputDir , file.name);
 				new File(f.parent).mkdirs();
-				InputStream is = jar.getInputStream(file); // get the input stream
+				InputStream is = jar.getInputStream(file);
 				FileOutputStream fos = new FileOutputStream(f);
-				while (is.available() > 0) {  // write contents of 'is' to 'fos'
+				while (is.available() > 0) {
 					fos.write(is.read())
 				}
 				fos.close()

From 5201a277d60750aebee4769590490f148e8c07ec Mon Sep 17 00:00:00 2001
From: plamen5kov <plamen.krasimirov.petkov@gmail.com>
Date: Tue, 7 Nov 2017 15:18:49 +0200
Subject: [PATCH 11/12] update path too user app folder

---
 build-artifacts/project-template-gradle/app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-artifacts/project-template-gradle/app/build.gradle b/build-artifacts/project-template-gradle/app/build.gradle
index 05e5ea2d8..785fc2093 100644
--- a/build-artifacts/project-template-gradle/app/build.gradle
+++ b/build-artifacts/project-template-gradle/app/build.gradle
@@ -133,7 +133,7 @@ def applyPluginsIncludeGradleConfigurations =  { ->
 }
 
 def applyAppGradleConfiguration = { ->
-	def pathToAppGradle = "$projectDir/../../app/App_Resources/Android/app.gradle"
+	def pathToAppGradle = "$rootDir/../../app/App_Resources/Android/app.gradle"
 	def appGradle = file(pathToAppGradle)
 	if (appGradle.exists()) {
 		println "\t + applying user-defined configuration from ${appGradle}"

From 9291bd70257a772fcdac6259d9f2c3324e31efe4 Mon Sep 17 00:00:00 2001
From: plamen5kov <plamen.krasimirov.petkov@gmail.com>
Date: Tue, 7 Nov 2017 17:59:13 +0200
Subject: [PATCH 12/12] update relative path to project package.json

---
 build-artifacts/project-template-gradle/app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-artifacts/project-template-gradle/app/build.gradle b/build-artifacts/project-template-gradle/app/build.gradle
index 785fc2093..3446d61ab 100644
--- a/build-artifacts/project-template-gradle/app/build.gradle
+++ b/build-artifacts/project-template-gradle/app/build.gradle
@@ -636,7 +636,7 @@ copyTypings.onlyIf { generateTypescriptDefinitions.didWork }
 
 task validateAppIdMatch {
 	doLast {
-		def packageJsonFile = new File("$projectDir/../../package.json");
+		def packageJsonFile = new File("$rootDir/../../package.json");
 		def lineSeparator = System.getProperty("line.separator");
 
 		if (packageJsonFile.exists() && !project.hasProperty("release")) {