merge with master

Author: Mihail Slavchev

.travis.yml

@@ -1,34 +1,68 @@
 env:
-    global:
-        - NDK_VERSION=r10e
+  global:
+  - NDK_VERSION=r10e
+  - DATE=$(date +%Y-%m-%d)
+  - PACKAGE_VERSION=$DATE-$TRAVIS_BUILD_NUMBER
+  - ANDROID_VERSION=19
+  - ANDROID_SUPPORT_VERSION=19.0.0
+  - PACKAGE_NAME=tns-android
 sudo: false
-language:
-    android
+language: android
 jdk:
-    - oraclejdk8
+  - oraclejdk8
 git:
-    submodules: false
+  submodules: false
 android:
-    components:
-        - platform-tools
-        - tools
-
-        - build-tools-22.0.1
-        - android-22
-
-        - extra-android-support
-        - extra-android-m2repository
-
-        - sys-img-x86_64-android-22
+  components:
+  - platform-tools
+  - tools
+  - build-tools-22.0.1
+  - android-19
+  - extra-android-support
+  - extra-android-m2repository
+  - sys-img-armeabi-v7a-android-19
+before_cache:
+  - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
+cache:
+  directories:
+  - "$HOME/.gradle/caches/"
+  - "$HOME/.gradle/wrapper/"
 before_install:
-    - sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules
-    - git submodule update --init --recursive
-    - wget http://dl.google.com/android/ndk/android-ndk-$NDK_VERSION-linux-x86_64.bin
-    - chmod +x android-ndk-$NDK_VERSION-linux-x86_64.bin
-    - ./android-ndk-$NDK_VERSION-linux-x86_64.bin | egrep -v ^Extracting
-    - export ANDROID_NDK_HOME=`pwd`/android-ndk-$NDK_VERSION
-    - export PATH=${PATH}:${ANDROID_NDK_HOME}
-
+  - sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules
+  - git submodule update --init --recursive
+  - wget http://dl.google.com/android/ndk/android-ndk-$NDK_VERSION-linux-x86_64.bin
+  - chmod +x android-ndk-$NDK_VERSION-linux-x86_64.bin
+  - "./android-ndk-$NDK_VERSION-linux-x86_64.bin | egrep -v ^Extracting"
+  - export ANDROID_NDK_HOME=`pwd`/android-ndk-$NDK_VERSION
+  - export PATH=${PATH}:${ANDROID_NDK_HOME}
+before_script:
+  - echo no | android create avd --force -n Arm19 -t android-19 -b armeabi-v7a -c 12M
+  - emulator -avd Arm19 -no-skin -no-audio -no-window &
+  - android-wait-for-emulator
 script:
-    - gradle packar -PPACKAGE_VERSION=5.5.5
-
+  - "./gradlew packar -i -PPACKAGE_VERSION=$PACKAGE_VERSION -PcompileSdk=android-$ANDROID_VERSION
+  -PsupportVersion=$ANDROID_SUPPORT_VERSION --stacktrace"
+  - "./gradlew runtest -PenableTest -PcompileSdk=android-$ANDROID_VERSION -PsupportVersion=$ANDROID_SUPPORT_VERSION
+  -PtargetSdk=$ANDROID_VERSION --stacktrace"
+before_deploy:
+  - FULL_PACKAGE_VERSION=`sed -n 's/\s*"version":\s*"\([a-zA-Z0-9.\-]\+\)"/\1/p' dist/package.json`
+  - mv dist/$PACKAGE_NAME-$FULL_PACKAGE_VERSION.tgz ../.deploymentpackage
+  - mv .travis ../
+  - cd ..
+  - rm -rf android-runtime
+  - tar -zxvf .deploymentpackage
+  - mv package android-runtime
+  - cd android-runtime
+  - rm ../.deploymentpackage
+  - nvm install 4.2.6
+  - nvm use 4.2.6
+  - mv ../.travis ./
+  - node ./.travis/add-publishConfig.js next
+deploy:
+  provider: npm
+  email: nativescript@telerik.com
+  on:
+    branch: master
+  skip_cleanup: true
+  api_key:
+    secure: aFJZR8VIbFAlXfFx5G2AveSgpGjr40prghvw8m06X0yvmUQlucwHVyq+Ov0ZD94br8d7OUOPbUzh+p9N/+oXLAXOj3DbQmJaCc+fk/e+avHu1BRy3fg295P9BQau1Abu+2ZO7tUbg5zAqJqhbEgjXsr9B5gxl+vwh4lbDhCPCwo=

.travis/add-publishConfig.js

@@ -0,0 +1,25 @@
+#!/usr/bin/env node
+
+var fsModule = require('fs');
+
+//Adds a publishConfig section to the package.json file
+// and sets a tag to it
+
+var path = './package.json';
+var fileOptions = {encoding: "utf-8"};
+var content = fsModule.readFileSync(path, fileOptions);
+
+var tag = process.argv[2];
+if (!tag) {
+    console.log('Please pass the tag name as an argument!');
+    process.exit(1);
+}
+
+var packageDef = JSON.parse(content);
+if (!packageDef.publishConfig) {
+    packageDef.publishConfig = {};
+}
+packageDef.publishConfig.tag = tag;
+
+var newContent = JSON.stringify(packageDef, null, '  ');
+fsModule.writeFileSync(path, newContent, fileOptions);

CHANGELOG.md

@@ -1,3 +1,24 @@
+1.6.0
+==
+
+## What's New
+
+ - [Build common test infrastructure for Android and iOS](https://github.com/NativeScript/android-runtime/issues/68)
+ - [New syntax for Java arrays](https://github.com/NativeScript/android-runtime/issues/70)
+ - [Improved debugger](https://github.com/NativeScript/android-runtime/issues/112)
+ - [Log in the debugger console](https://github.com/NativeScript/android-runtime/issues/145)
+ - [Update documentation](https://github.com/NativeScript/android-runtime/issues/290)
+ - [Provide support for ARMv8a](https://github.com/NativeScript/android-runtime/issues/297)
+ - [Imroved exception handling](https://github.com/NativeScript/android-runtime/issues/300)
+ - Gradle script improvements
+
+## Bug Fixes
+
+ - [Fix app crash during debugging (#270)](https://github.com/NativeScript/android-runtime/issues/270)
+ - [Fix app hang during array marshalling](https://github.com/NativeScript/android-runtime/issues/320)
+ - [Fix incorrect module resolution](https://github.com/NativeScript/android-runtime/issues/334)
+ - [Fix app crash during debugging (#338)](https://github.com/NativeScript/android-runtime/issues/338)
+
 1.5.1
 ==
 

android-metadata-generator

@@ -1,3 +1,4 @@
+
 /* 
 *	Compiles binding generator 
 *	to run: "gradle build"
@@ -6,14 +7,21 @@
 */
 apply plugin: "java"
 
+def compiteCompileSdkVersion () {
+	if(project.hasProperty("compileSdk")) {
+		return compileSdk
+	}
+	return "android-22"
+}
+
 //workaround because there is a problem when the binding generator is compiled with java 1.7/1.8
 sourceCompatibility = 1.6
 targetCompatibility = 1.6
 
 def pathToAndroidSdkPlatforms = "$System.env.ANDROID_HOME" + "/platforms"
 
 dependencies {
-	compile files(pathToAndroidSdkPlatforms + "/android-22/android.jar")
+	compile files(pathToAndroidSdkPlatforms + "/" + compiteCompileSdkVersion() + "/android.jar")
 }
 
 sourceSets {
@@ -24,7 +32,4 @@ sourceSets {
     }
 	def isOutClassesDirSet = project.hasProperty("outClassesDir")
 	main.output.classesDir = isOutClassesDirSet ? outClassesDir : "$rootDir/build/classesss"
-}
-
-
-
+}

binding-generator/Generator/build.gradle

@@ -1,2 +1,40 @@
 # android-binding-generator
-Contains the source of the binding generator tool for the NativeScript's Android Runtime.
+
+This project is used in the [NativeScript runtime for Android](https://github.com/NativeScript/android-runtime) to generate Java subclasses at runtime. Supppose you have the following Java class
+
+```Java
+package com.example;
+
+public class MyClass {
+   public int add(int x, int y) {
+      return x + y;
+   }
+}
+```
+
+In NativeScript, you can inherit from `MyClass` using the following syntax:
+
+```JavaScript
+var MyNewClass = com.example.MyClass.extend({
+   add: function(x, y) {
+      return x * y;
+   }
+})
+
+var obj = new MyNewClass();
+```
+
+Using `extend` function will create a new Java class that looks roughly as follows
+```Java
+package <some auto-generated package name>;
+
+public <some auto-generated class name> extends com.example.MyClass {
+   public int add(int x, int y) {
+      java.lang.Object[] params = new Object[2];
+      params[0] = x;
+      params[1] = y;
+      return (int)com.tns.Platform.callJSMethod(this, "add", int.class, params);
+   }
+}
+```
+The binding generator uses [ASMDEX library](http://asm.ow2.org/asmdex-index.html) to create the class above and to produce the corresponding `*.dex` file.

binding-generator/README.md

@@ -179,23 +179,24 @@ task deleteCommitFile (type: Delete) {
 task generateRuntime (type: Exec) {
 	doFirst{
 		workingDir "$rootDir/src"
-
+		def passParams = new LinkedList<String>()
+		passParams.addAll(envVars);
 		//command gradlew buildar -PpackageVersion=[from_package.json] -PgitCommitVersion=[from_some_sys_variable]
 		if(isWinOs) {
-			envVars.addFirst("-PgitCommitVersion=${arVersion}");
-			envVars.addFirst("-PpackageVersion=${pVersion}");
-			envVars.addFirst("buildar");
-			envVars.addFirst("gradlew");
-			envVars.addFirst("/c");
-			envVars.addFirst("cmd");
-			commandLine envVars.toArray()
+			passParams.addFirst("-PgitCommitVersion=${arVersion}");
+			passParams.addFirst("-PpackageVersion=${pVersion}");
+			passParams.addFirst("buildar");
+			passParams.addFirst("gradlew");
+			passParams.addFirst("/c");
+			passParams.addFirst("cmd");
+			commandLine passParams.toArray()
 		}
 		else {
-			envVars.addFirst("-PgitCommitVersion=${arVersion}");
-			envVars.addFirst("-PpackageVersion=${pVersion}");
-			envVars.addFirst("buildar");
-			envVars.addFirst("./gradlew");
-			commandLine envVars.toArray();
+			passParams.addFirst("-PgitCommitVersion=${arVersion}");
+			passParams.addFirst("-PpackageVersion=${pVersion}");
+			passParams.addFirst("buildar");
+			passParams.addFirst("./gradlew");
+			commandLine passParams.toArray();
 		}
 	}
 }
@@ -288,16 +289,23 @@ task packar {
 	dependsOn packFramework
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
+task runTest(type: Exec) {
+	if(project.hasProperty("enableTest")) {
+		workingDir "$rootDir/test-app"
+		
+		def passParams = new LinkedList<String>()
+		passParams.addAll(envVars);
+		if(isWinOs) {
+			passParams.addFirst("runtest");
+			passParams.addFirst("gradlew");
+			passParams.addFirst("/c");
+			passParams.addFirst("cmd");
+			commandLine passParams.toArray();
+		}
+		else {
+			passParams.addFirst("runtest");
+			passParams.addFirst("./gradlew");
+			commandLine passParams.toArray();
+		}
+	}
+}

build.gradle

@@ -23,9 +23,9 @@ buildscript {
         jcenter()
     }
 
-    dependencies {
-        classpath "com.android.tools.build:gradle:1.3.1"
-    }
+	dependencies {
+		classpath "com.android.tools.build:gradle:1.5.0"
+	}
 }
 
 apply plugin: "com.android.application"
@@ -151,7 +151,7 @@ repositories {
 }
 
 dependencies {
-	def suppotVer = "22.2.0";
+	def suppotVer = "23.2.0";
 	if(project.hasProperty("supportVersion")) {
 		suppotVer = supportVersion
 	}
@@ -163,7 +163,7 @@ dependencies {
 	compile fileTree(dir: "libs", include: ["**/*.jar"])
 
 	// take all jars within the node_modules dir
-	compile fileTree(dir: nodeModulesDir, include: ["**/*.jar"])
+	compile fileTree(dir: nodeModulesDir, include: ["**/platforms/android/**/*.jar"], exclude: '**/.bin/**')
 
 	// take all jars within the lib/Android dir
 	compile fileTree(dir: libDir, include: ["**/*.jar"])
@@ -207,7 +207,7 @@ task pluginExtend {
 // we need to copy all dependencies into a flat dir, as pointed by the repositories configurations at the top
 task copyAarDependencies (type: Copy) {
 	println "$configStage copyAarDependencies"
-	from fileTree(dir: nodeModulesDir, include: ["**/*.aar"]).files
+	from fileTree(dir: nodeModulesDir, include: ["**/*.aar"], exclude: '**/.bin/**').files
 	into "libs/aar"
 }
 
@@ -449,4 +449,4 @@ task buildapk {
 	}
 
 	dependsOn deleteExplodedAarFolder
-}
+}

build/project-template-gradle/build.gradle

@@ -14,8 +14,6 @@
         android:minSdkVersion="17"
 		android:targetSdkVersion="__APILEVEL__"/>
 
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
 
     <application