fix(tooling): wait for emulator before running adb commands (#912)

* Revert "refactor(project template): replace runtime project template with user template (#891)"

This reverts commit 81f70ad.

* fix(tooling): wait for emulator before running adb commands

* chore: update messages

Author: Plamen5kov

.gitmodules

@@ -4,7 +4,3 @@
 [submodule "test-app/app/src/main/assets/app/shared"]
 	path = test-app/app/src/main/assets/app/shared
 	url = https://github.com/NativeScript/common-runtime-tests-app.git
-[submodule "test-app/build-tools/android-dts-generator"]
-	path = test-app/build-tools/android-dts-generator
-	url = https://github.com/NativeScript/android-dts-generator.git
-	branch = master

.travis.yml

@@ -10,6 +10,22 @@ env:
 
 matrix:
   include:
+    - stage: "Static Binding Generator Parser Tests"
+      language: node_js 
+      node_js: "6"
+      git:
+        submodules: false
+      script:
+        - cd android-static-binding-generator
+        - npm install && node run-tests
+        - cd ..
+    - stage: "Static Binding Generator Class Generator Tests"
+      language: android
+      jdk: oraclejdk8
+      git:
+        submodules: false
+      script:
+        - "android-static-binding-generator/project/staticbindinggenerator/gradlew test --project-dir android-static-binding-generator/project/staticbindinggenerator/"    
     - stage: "Build and Tests"
       sudo: true
       language: android
@@ -25,13 +41,15 @@ matrix:
         submodules: false
       script:
         # (master branch) build the runtime twice - optimized, and regular packages, skip on PRs
-        # test-app/gradlew runtests will take care of building the runtime for its testing needs
+        # test-app/gradlew runtest will take care of building the runtime for its testing needs
         - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./gradlew -PpreReleaseVersion=$PACKAGE_VERSION -PgitCommitVersion=$TRAVIS_COMMIT --stacktrace; fi'
         - 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
+        - cd test-app 
         - "./gradlew runtest --stacktrace"
         - adb -e logcat -d 300
+        - cd ..
       before_install:
         - echo "y" | sdkmanager "cmake;3.6.4111459"
         - sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules

test-app/build-tools/android-metadata-generator/.gitattributes renamed to android-metadata-generator/.gitattributes

@@ -0,0 +1,131 @@
+/* 
+*	Packs metadata generator in a .tgz file in ~/dist folder
+*	To build .tgz
+*			gradlew packmg
+*	To build jar
+*			gradlew jarmg
+*/
+apply plugin: "java"
+
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
+
+def isWinOs = System.properties['os.name'].toLowerCase().contains('windows')
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.5.0'
+    }
+}
+
+sourceSets {
+    main {
+        java {
+            srcDir 'src/src'
+        }
+    }
+	main.output.classesDir = "$rootDir/dist/classes"
+}
+
+dependencies {
+    compile files("./src/libs/bcel-5.2.jar")
+    compile files("./src/libs/dx.jar")
+}
+
+task makeDistDir {
+	def distDir = new File("$rootDir/dist")
+	distDir.mkdirs()
+}
+
+task cleanDist (type: Delete) {
+	delete "$rootDir/dist"
+}
+
+task cleanDistForJar (type: Delete) {
+	delete "$rootDir/dist"
+}
+
+task cleanBuildDir (type: Delete){
+	delete "$rootDir/build"
+}
+
+task cleanBuildDirForJar (type: Delete){
+	delete "$rootDir/build"
+}
+
+task cleanBin (type: Delete) {
+	delete "$rootDir/src/bin"
+}
+
+task copyNecessaryFiles {
+	doLast {
+		copy {
+			from "$rootDir/helpers"
+			into "$rootDir/dist/bin"
+		}
+		
+		copy {
+			from "$rootDir/package.json"
+			into "$rootDir/dist"
+		}	
+	}
+}
+
+task packMetadataGenerator (type: Exec) {
+	workingDir "$rootDir/dist"
+	
+	if(isWinOs) {
+		commandLine "cmd", "/c", "npm", "pack"
+	}
+	else {
+		commandLine "npm", "pack"
+	}
+}
+
+jar {
+    manifest {
+        attributes("Manifest-Version": "1.0",
+                   "Main-Class": "com.telerik.metadata.Generator")
+    }
+	
+    from {
+
+        configurations.runtime.collect {
+            it.isDirectory() ? it : zipTree(it)
+        }
+
+        configurations.compile.collect {
+            it.isDirectory() ? it : zipTree(it)
+        }
+    }
+}
+
+task copyJarToDist (type: Copy) {
+	from "$rootDir/build/libs/android-metadata-generator.jar"
+	into "$rootDir/dist"
+}
+
+makeDistDir.dependsOn(cleanDist)
+cleanBin.dependsOn(makeDistDir)
+compileJava.dependsOn(cleanBin)
+cleanBuildDir.dependsOn(compileJava)
+copyNecessaryFiles.dependsOn(cleanBuildDir)
+packMetadataGenerator.dependsOn(copyNecessaryFiles)
+
+task packmg {
+	dependsOn packMetadataGenerator
+}
+
+cleanDistForJar.dependsOn(jar)
+copyJarToDist.dependsOn(cleanDistForJar)
+cleanBuildDirForJar.dependsOn(copyJarToDist)
+
+task jarmg {
+	dependsOn cleanBuildDirForJar
+}
+
+

test-app/build-tools/android-metadata-generator/.gitignore renamed to android-metadata-generator/.gitignore

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip

test-app/build-tools/android-metadata-generator/LICENCE renamed to android-metadata-generator/LICENCE

@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"