Merge pull request #1065 from NativeScript/master

4.1 RC

Author: darind

.gitignore

@@ -18,3 +18,4 @@ bin/
 .DS_Store
 .settings
 
+.classpath

.travis.yml

@@ -1,7 +1,7 @@
 env:
   global:
   - NODE_VERSION=6.11.1
-  - NDK_VERSION=r15c
+  - NDK_VERSION=r16b
   - DATE=$(date +%Y-%m-%d)
   - PACKAGE_VERSION=next-$DATE-$TRAVIS_BUILD_NUMBER
   - EMULATOR_API_LEVEL=21
@@ -30,6 +30,7 @@ matrix:
         - echo no | android create avd --force -n $EMULATOR_NAME-$EMULATOR_API_LEVEL -t android-$EMULATOR_API_LEVEL --abi $ANDROID_ABI -c 12M
         - emulator -avd $EMULATOR_NAME-$EMULATOR_API_LEVEL -no-skin -no-audio -no-window &
         - android-wait-for-emulator
+        - "./gradlew runSbgTests --stacktrace"
         - "./gradlew runtest --stacktrace"
         - adb -e logcat -d 300
       before_install:
@@ -62,4 +63,3 @@ cache:
 
 install:
   - nvm install $NODE_VERSION
-  

README.md

@@ -12,6 +12,7 @@ Contains the source code for the NativeScript's Android Runtime. [NativeScript](
 - [Build Prerequisites](#build-prerequisites)
 - [How to build](#how-to-build)
 - [How to run tests](#how-to-run-tests)
+- [Misc](#misc)
 - [Get Help](#get-help)
 
 <!-- /TOC -->
@@ -39,11 +40,21 @@ For more details on how it works, read the [documentation](https://docs.nativesc
 ## Build Prerequisites
 Following are the minimal prerequisites to build the runtime package.
 
-* Install the latest [Android Studio ](https://developer.android.com/studio/index.html).
-* Install Android API Level 22, 23, 24, 25 from Android Studio -> Tools -> Android -> SDK Manager
-* Android NDK 15c - [NDK Archives](https://developer.android.com/ndk/downloads/older_releases.html) or [NDK Downloads](https://developer.android.com/ndk/downloads/index.html) if you can't find it in the archives.
-* Download Android Support Repository through the Android SDK Manager
-* Download Build Tools 25.0.2 through the Android SDK Manager.
+* Install the latest [Android Studio](https://developer.android.com/studio/index.html).
+* From the SDK Manager (Android Studio -> Tools -> Android -> SDK Manager) install the following components:
+    * Android API Level 23, 24, 25, 26
+    * Android NDK 
+    * Android Support Repository
+    * Download Build Tools 
+    * CMake
+    * LLDB
+* Clone this repository as well as the submodules: `git clone --recurse-submodules [email protected]:NativeScript/android-runtime.git`
+
+## Working with the Runtime in Android Studio
+
+* Open the test-app folder in Android Studio. It represents a valid Android project and you are able to build and run a test application working with the Runtime from the source.
+
+Note: You might need to run the Android Studio from the command line in order to preserve the environment variables. This is in case you get errors like "missing npm" if starting the studio the usual way.
 
 ## How to Build
 
@@ -76,6 +87,12 @@ Following are the minimal prerequisites to build the runtime package.
 ```Shell
 gradlew runtest
 ```
+## Contribute
+We love PRs! Check out the [contributing guidelines](CONTRIBUTING.md). If you want to contribute, but you are not sure where to start - look for [issues labeled `help wanted`](https://github.com/NativeScript/android-runtime/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22).
+
+## Misc
+
+* [Implementing additional Chrome DevTools protocol Domains](docs/extending-inspector.md)
 
 ## Get Help
 Please, use [github issues](https://github.com/NativeScript/android-runtime/issues) strictly for [reporting bugs](CONTRIBUTING.md#reporting-bugs) or [requesting features](CONTRIBUTING.md#requesting-new-features). For general questions and support, check out the [NativeScript community forum](https://discourse.nativescript.org/) or ask our experts in [NativeScript community Slack channel](http://developer.telerik.com/wp-login.php?action=slack-invitation).

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

@@ -1,7 +1,7 @@
 rootProject.name = "__PROJECT_NAME__"
-include ':app' //,  ':runtime', ":runtime-binding-generator"
+include ':app'//, ':runtime', ':runtime-binding-generator'
 
-//project(':runtime').projectDir = new File('path/to/runtime')
-//project(':runtime-binding-generator').projectDir = new File('path/to/runtime-binding-generator')
+//project(':runtime').projectDir = new File("${System.env.ANDROID_RUNTIME_HOME}/test-app/runtime")
+//project(':runtime-binding-generator').projectDir = new File("${System.env.ANDROID_RUNTIME_HOME}/test-app/runtime-binding-generator")
 
 file("google-services.json").renameTo(file("./app/google-services.json"))

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

@@ -0,0 +1,3 @@
+{
+    "v8Version": "6.6.346.23"
+}

build.gradle

@@ -1,5 +1,5 @@
 /*
-*	Usage: 
+*	Usage:
 *		gradlew - Builds the NativeScript Android App Package using an application project template.
 		gradlew -PgitCommitVersion - sets the commit version of the build
 		gradlew -PpreReleaseVersion - sets the pre-release version of the build (as per semver spec "-alpha" value results in 1.0.0-alpha)
@@ -13,6 +13,8 @@ import groovy.json.JsonSlurper
 import groovy.json.JsonBuilder
 import groovy.json.JsonOutput
 
+def onlyX86 = project.hasProperty("onlyX86")
+
 def isWinOs = System.properties['os.name'].toLowerCase().contains('windows')
 def pVersion = "no package version was provided by build.gradle build"
 def arVersion = "no commit sha was provided by build.gradle build"
@@ -64,7 +66,7 @@ task getPackageVersion {
 
         println "Using runtime version from package.json '${pVersion}'"
 
-        if (project.hasProperty("packageVersion")) {
+        if (project.hasProperty("packageVersion") && packageVersion != "") {
             pVersion += "-" + packageVersion
 
             println "Using packageVersion property '${pVersion}'"
@@ -77,6 +79,10 @@ task getPackageVersion {
             println "Adding preReleaseVersion property '${pVersion}' to package version"
         }
 
+        if(onlyX86) {
+            pVersion += "-onlyX86"
+        }
+
         println "The package version is '${pVersion}'"
     }
 }
@@ -131,19 +137,59 @@ task generateRuntime {
     doFirst {
         tasks.generateOptimizedRuntimeAar.execute();
 
+        tasks.generateOptimizedWithInspectorRuntimeAar.execute();
+
         if (generateRegularRuntimePackage) {
             tasks.generateRuntimeAar.execute();
         }
     }
 }
 
-task generateOptimizedRuntimeAar (type: Exec) {
+task cleanRuntime (type: Exec) {
     doFirst {
         workingDir "$TEST_APP_PATH"
         if (isWinOs) {
-            commandLine "cmd", "/c", "gradlew", ":runtime:assembleRelease", "-PpackageVersion=${pVersion}", "-PgitCommitVersion=${arVersion}", "-Poptimized"
+            commandLine "cmd", "/c", "gradlew", ":runtime:clean"
+        } else {
+            commandLine "./gradlew", ":runtime:clean"
+        }
+    }
+}
+
+task generateOptimizedRuntimeAar (type: Exec) {
+    doFirst {
+        workingDir "$TEST_APP_PATH"
+        if (onlyX86) {
+            if (isWinOs) {
+                commandLine "cmd", "/c", "gradlew", ":runtime:assembleRelease", "-PpackageVersion=${pVersion}", "-PgitCommitVersion=${arVersion}", "-Poptimized", "-PonlyX86"
+            } else {
+                commandLine "./gradlew", ":runtime:assembleRelease", "-PpackageVersion=${pVersion}", "-PgitCommitVersion=${arVersion}", "-Poptimized", "-PonlyX86"
+            }
+        } else {
+            if (isWinOs) {
+                commandLine "cmd", "/c", "gradlew", ":runtime:assembleRelease", "-PpackageVersion=${pVersion}", "-PgitCommitVersion=${arVersion}", "-Poptimized"
+            } else {
+                commandLine "./gradlew", ":runtime:assembleRelease", "-PpackageVersion=${pVersion}", "-PgitCommitVersion=${arVersion}", "-Poptimized"
+            }
+        }
+    }
+}
+
+task generateOptimizedWithInspectorRuntimeAar (type: Exec) {
+    doFirst {
+        workingDir "$TEST_APP_PATH"
+        if (onlyX86) {
+            if (isWinOs) {
+                commandLine "cmd", "/c", "gradlew", ":runtime:assembleRelease", "-PpackageVersion=${pVersion}", "-PgitCommitVersion=${arVersion}", "-PoptimizedWithInspector", "-PonlyX86"
+            } else {
+                commandLine "./gradlew", ":runtime:assembleRelease", "-PpackageVersion=${pVersion}", "-PgitCommitVersion=${arVersion}", "-PoptimizedWithInspector", "-PonlyX86"
+            }
         } else {
-            commandLine "./gradlew", ":runtime:assembleRelease", "-PpackageVersion=${pVersion}", "-PgitCommitVersion=${arVersion}", "-Poptimized"
+            if (isWinOs) {
+                commandLine "cmd", "/c", "gradlew", ":runtime:assembleRelease", "-PpackageVersion=${pVersion}", "-PgitCommitVersion=${arVersion}", "-PoptimizedWithInspector"
+            } else {
+                commandLine "./gradlew", ":runtime:assembleRelease", "-PpackageVersion=${pVersion}", "-PgitCommitVersion=${arVersion}", "-PoptimizedWithInspector"
+            }
         }
     }
 }
@@ -207,6 +253,11 @@ task copyFilesToProjectTemeplate {
             into "$DIST_FRAMEWORK_PATH/app/libs/runtime-libs"
             rename "runtime-optimized-release.aar", "nativescript-optimized.aar"
         }
+        copy {
+            from "$TEST_APP_PATH/runtime/build/outputs/aar/runtime-optimized-with-inspector-release.aar"
+            into "$DIST_FRAMEWORK_PATH/app/libs/runtime-libs"
+            rename "runtime-optimized-with-inspector-release.aar", "nativescript-optimized-with-inspector.aar"
+        }
         copy {
             from "$TEST_APP_PATH/app/build.gradle"
             into "$DIST_FRAMEWORK_PATH/app"
@@ -273,12 +324,9 @@ createDistDir.dependsOn(generateMdgJar)
 
 getPackageVersion.dependsOn(createDistDir)
 getCommitVersion.dependsOn(getPackageVersion)
-
 generateRuntime.dependsOn(getCommitVersion)
-generateOptimizedRuntimeAar.dependsOn(generateRuntime)
-generateRuntimeAar.dependsOn(generateOptimizedRuntimeAar)
 
-copyFilesToProjectTemeplate.dependsOn(generateRuntimeAar)
+copyFilesToProjectTemeplate.dependsOn(generateRuntime)
 copyProjectTemplate.dependsOn(copyFilesToProjectTemeplate)
 copyPackageJson.dependsOn(copyProjectTemplate)
 setPackageVersionInPackageJsonFile.dependsOn(copyPackageJson)
@@ -291,7 +339,18 @@ task createPackage {
     println "Creating NativeScript Android Package"
 }
 
-task runSbgTests (type: Exec) {
+task runAstTests (type: Exec) {
+    doFirst {
+        workingDir "$TEST_APP_PATH/build-tools/jsparser/tests"
+        if (isWinOs) {
+            commandLine "cmd", "/c", "npm", "test"
+        } else {
+            commandLine "npm", "test"
+        }
+    }
+}
+
+task runSbgTests (type: Exec, dependsOn: 'runAstTests') {
     doFirst {
         workingDir "$TEST_APP_PATH"
         if (isWinOs) {
@@ -305,10 +364,18 @@ task runSbgTests (type: Exec) {
 task runTests (type: Exec) {
     doFirst {
         workingDir "$TEST_APP_PATH"
-        if (isWinOs) {
-            commandLine "cmd", "/c", "gradlew", "-b", "runtests.gradle", "runtests"
+        if (onlyX86) {
+            if (isWinOs) {
+                commandLine "cmd", "/c", "gradlew", "-b", "runtests.gradle", "runtests", "-PonlyX86"
+            } else {
+                commandLine "./gradlew", "-b", "runtests.gradle", "runtests", "-PonlyX86"
+            }
         } else {
-            commandLine "./gradlew", "-b", "runtests.gradle", "runtests"
+            if (isWinOs) {
+                commandLine "cmd", "/c", "gradlew", "-b", "runtests.gradle", "runtests"
+            } else {
+                commandLine "./gradlew", "-b", "runtests.gradle", "runtests"
+            }
         }
     }
 }

build.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 ###############################################################################################
 # Android Runtime build script for CI.
 # This file is used by the CI only and it's not meant for regular development.
@@ -12,32 +13,59 @@ git submodule update --init
 
 echo "Cleanup old build and test artefacts"
 rm -rf consoleLog.txt
-rm -rf test-app/dist/android_unit_test_results.xml
+rm -rf test-app/dist/*.xml
 
 echo "Stopping running emulators if any"
 for KILLPID in `ps ax | grep 'emulator' | grep -v 'grep' | awk ' { print $1;}'`; do kill -9 $KILLPID; done
 for KILLPID in `ps ax | grep 'qemu' | grep -v 'grep' | awk ' { print $1;}'`; do kill -9 $KILLPID; done
 for KILLPID in `ps ax | grep 'adb' | grep -v 'grep' | awk ' { print $1;}'`; do kill -9 $KILLPID; done
 
-echo "Start emulator"
-$ANDROID_HOME/tools/emulator -avd Emulator-Api19-Default -wipe-data -gpu on &
+./gradlew cleanRuntime
+if [ "$1" != 'unit_tests_only' ]; then
+    echo "Building Android Runtime with paramerter packageVersion: $PACKAGE_VERSION and commit: $GIT_COMMIT"
+    ./gradlew -PpackageVersion=$PACKAGE_VERSION -PgitCommitVersion=$GIT_COMMIT
+    cp dist/tns-android-*.tgz dist/tns-android.tgz
+else
+    echo "Building Android Runtime for x86 unit tests with paramerter packageVersion: $PACKAGE_VERSION and commit: $GIT_COMMIT"
+    ./gradlew -PpackageVersion=$PACKAGE_VERSION -PgitCommitVersion=$GIT_COMMIT -PskipUnoptimized -PonlyX86
+    cp dist/tns-android-*.tgz dist/tns-android.tgz
+fi
 
-echo "Building Android Runtime with paramerter packageVersion: $PACKAGE_VERSION and commit: $GIT_COMMIT"
-./gradlew -PpackageVersion=$PACKAGE_VERSION -PgitCommitVersion=$GIT_COMMIT
+if [ "$2" != '' ]; then
+    listOfEmulators=$2
+else
+    listOfEmulators="Emulator-Api19-Default"
+fi
 
-echo "Run Android Runtime unit tests"
-cp dist/tns-android-*.tgz dist/tns-android.tgz
-$ANDROID_HOME/platform-tools/adb devices
-$ANDROID_HOME/platform-tools/adb -e logcat -c
-$ANDROID_HOME/platform-tools/adb -e logcat > consoleLog.txt &
-./gradlew runtest
+# Run static binding generator unit tests
+./gradlew runSbgTests
 
-echo $cwd
+for emulator in $listOfEmulators; do
+    echo "Start emulator $emulator"
+    $ANDROID_HOME/emulator/emulator -avd ${emulator} -wipe-data -gpu on&
+
+    echo "Run Android Runtime unit tests for $emulator"
+    $ANDROID_HOME/platform-tools/adb devices
+    $ANDROID_HOME/platform-tools/adb -e logcat -c
+    $ANDROID_HOME/platform-tools/adb -e logcat > consoleLog.txt&
 
-cd $cwd
+    if [ "$1" != 'unit_tests_only' ]; then
+        ./gradlew runtest
+    else
+        ./gradlew runtest -PonlyX86
+    fi
 
-echo "Stopping running emulators"
-for KILLPID in `ps ax | grep 'emulator' | grep -v 'grep' | awk ' { print $1;}'`; do kill -9 $KILLPID; done || true
-for KILLPID in `ps ax | grep 'qemu' | grep -v 'grep' | awk ' { print $1;}'`; do kill -9 $KILLPID; done || true
-for KILLPID in `ps ax | grep 'adb' | grep -v 'grep' | awk ' { print $1;}'`; do kill -9 $KILLPID &> /dev/null; done || true
+    echo "Rename unit test result"
+    (
+        cd ./test-app/dist
+        mv android_unit_test_results.xml $emulator.xml
+    )
 
+    echo "Stopping running emulators"
+    for KILLPID in `ps ax | grep 'emulator' | grep -v 'grep' | awk ' { print $1;}'`; do kill -9 $KILLPID; done
+    for KILLPID in `ps ax | grep 'qemu' | grep -v 'grep' | awk ' { print $1;}'`; do kill -9 $KILLPID; done
+    for KILLPID in `ps ax | grep 'adb' | grep -v 'grep' | awk ' { print $1;}'`; do kill -9 $KILLPID; done
+done
+
+echo $cwd
+cd $cwd