Merge branch 'master' into release

Author: Plamen5kov

.gitignore

@@ -2,9 +2,6 @@
 node_modules/
 dist/
 .gradle
-/test-app/build
-/test-app/libs
-/test-app/metadata
 .idea
 
 local.properties
@@ -21,4 +18,3 @@ bin/
 .DS_Store
 .settings
 
-build-artifacts/

.gitmodules

@@ -1,6 +1,6 @@
-[submodule "test-app/assets/app/shared"]
-	path = test-app/app/src/main/assets/app/shared
-	url = [email protected]:NativeScript/common-runtime-tests-app.git
-[submodule "test-app/assets/app/tns_modules/shared"]
+[submodule "test-app/app/src/main/assets/app/tns_modules/tns-core-modules/shared"]
 	path = test-app/app/src/main/assets/app/tns_modules/tns-core-modules/shared
-	url = [email protected]:NativeScript/common-runtime-tests-modules.git
+	url = https://github.com/NativeScript/common-runtime-tests-modules.git
+[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

.idea/.name

@@ -1,8 +1,12 @@
 env:
   global:
-  - NDK_VERSION=r12b
+  - NODE_VERSION=6.11.1
+  - NDK_VERSION=r15c
   - DATE=$(date +%Y-%m-%d)
   - PACKAGE_VERSION=next-$DATE-$TRAVIS_BUILD_NUMBER
+  - EMULATOR_API_LEVEL=21
+  - ANDROID_ABI=armeabi-v7a
+  - EMULATOR_NAME=runtime-emu
 sudo: true
 language: android
 jdk:
@@ -11,37 +15,42 @@ git:
   submodules: false
 android:
   components:
-  - platform-tools
-  - tools
-  - build-tools-25.0.2
-  - android-23
-  - extra-android-support
-  - extra-android-m2repository
-  - sys-img-armeabi-v7a-android-21
+    - platform-tools
+    - tools
+    - build-tools-26.0.1
+    - android-26
+    - android-$EMULATOR_API_LEVEL
+    - extra-android-support
+    - extra-android-m2repository
+    - cmake
+    - sys-img-$ANDROID_ABI-android-$EMULATOR_API_LEVEL
+  licenses:
+    - 'android-sdk-preview-license-52d11cd2'
+    - 'android-sdk-license-.+'
+    - 'google-gdk-license-.+'
 before_cache:
   - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
 cache:
   directories:
   - "$HOME/.gradle/caches/"
   - "$HOME/.gradle/wrapper/"
 before_install:
-  - curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | sudo bash
-  - sudo apt-get install git-lfs
-  - git lfs install
+  - echo "y" | sdkmanager "cmake;3.6.4111459"
   - sed -i 's/[email protected]:/https:\/\/github.com\//' .gitmodules
   - git submodule update --init --recursive
-  - wget http://dl.google.com/android/repository/android-ndk-$NDK_VERSION-linux-x86_64.zip
+  - wget https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-linux-x86_64.zip
   - chmod +x android-ndk-$NDK_VERSION-linux-x86_64.zip
   - "unzip -q android-ndk-$NDK_VERSION-linux-x86_64.zip"
   - "rm -rf android-ndk-$NDK_VERSION-linux-x86_64.zip"
   - export ANDROID_NDK_HOME=`pwd`/android-ndk-$NDK_VERSION
   - export PATH=${PATH}:${ANDROID_NDK_HOME}
+install:
+  - nvm install $NODE_VERSION
 script:
-  - git lfs pull
-  - "./gradlew createPackage -i -PpreReleaseVersion=$PACKAGE_VERSION -PgitCommitVersion=$TRAVIS_COMMIT --stacktrace"
-  - echo no | android create avd --force -n Arm21 -t android-21 -b armeabi-v7a -c 12M
-  - emulator -avd Arm21 -no-skin -no-audio -no-window &
+  - "./gradlew -PpreReleaseVersion=$PACKAGE_VERSION -PgitCommitVersion=$TRAVIS_COMMIT --stacktrace"
+  - 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 assembleDebug runtests -PembedBindingGenerator=true --stacktrace"
+  - "cd test-app && ./gradlew runtest --stacktrace"
   - adb -e logcat -d 300
   - cd ..