From bec783618a80099b0258c126f30651b1ed3038ed Mon Sep 17 00:00:00 2001
From: SvetoslavTsenov <tsenov.svetoslav@gmail.com>
Date: Fri, 19 May 2017 11:30:34 +0300
Subject: [PATCH] Update travis

---
 .travis.yml        | 25 ++++++++++++++++---------
 tests/package.json |  8 ++++----
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f186db267..0bb66fdd5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,16 +3,23 @@ env:
   - NODE_VERSION=6.9.1
   - DATE=$(date +%Y-%m-%d)
   - PACKAGE_VERSION=$DATE-$TRAVIS_BUILD_NUMBER
+  - EMULATOR_API_LEVEL=19
+  - ANDROID_VERSION=23
+  - ANDROID_BUILD_TOOLS_VERSION=23.0.1
+  - ANDROID_ABI=armeabi-v7a
+  - ANDROID_TAG=google_apis
+  - APPIUM_VERSION=1.6.3
 language: android
 jdk:
 - oraclejdk8
 android:
   components:
   - platform-tools
-  - build-tools-23.0.2
-  - android-23
+  - tools
+  - build-tools-$ANDROID_BUILD_TOOLS_VERSION
+  - android-$ANDROID_VERSION
   - extra-android-m2repository
-  - sys-img-armeabi-v7a-android-23
+  - sys-img-armeabi-v7a-android-$EMULATOR_API_LEVEL
 before_cache:
 - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
 cache:
@@ -31,16 +38,16 @@ install:
 - npm run tslint
 - cd ../tests
 - npm install
-- tns platform add android
 before_script:
-- echo no | android create avd --force -n test -t android-23 -abi armeabi-v7a
-- emulator -memory 1024 -avd test -no-audio -no-window &
+  - echo no | android create avd --force -n test -t android-$EMULATOR_API_LEVEL --abi $ANDROID_ABI
+  - emulator -memory 1024 -avd test -no-audio -no-window & 
+  - android-wait-for-emulator
 script:
-- 
-- 
+-  
+-
 - tns build android
 - android-wait-for-emulator
-- npm run appium --runtype=android23
+- npm run run-appium-android
 before_deploy:
 - cd ../nativescript-angular
 - npm install -g nativescript --ignore-scripts
diff --git a/tests/package.json b/tests/package.json
index 36d5cf0b7..a17e12135 100644
--- a/tests/package.json
+++ b/tests/package.json
@@ -2,10 +2,10 @@
   "nativescript": {
     "id": "org.nativescript.ngtests",
     "tns-android": {
-      "version": "2.5.0"
+      "version": "3.0.0"
     },
     "tns-ios": {
-      "version": "2.5.0"
+      "version": "3.0.0"
     }
   },
   "name": "ngtests",
@@ -38,7 +38,7 @@
     "nativescript-angular": "../nativescript-angular",
     "nativescript-unit-test-runner": "^0.3.4",
     "rxjs": "^5.2.0",
-    "tns-core-modules": "next",
+    "tns-core-modules": "^3.0.0",
     "zone.js": "^0.8.2"
   },
   "devDependencies": {
@@ -56,7 +56,7 @@
     "karma-nativescript-launcher": "^0.4.0",
     "lazy": "1.0.11",
     "mocha": "^2.4.5",
-    "nativescript-dev-appium": "^0.3.0",
+    "nativescript-dev-appium": "0.0.14",
     "nativescript-dev-typescript": "^0.4.0",
     "socket.io": "1.4.8",
     "socket.io-client": "1.4.8",