diff --git a/.travis.yml b/.travis.yml
index 8d23863..c35e432 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,74 +1,64 @@
-android:
-  components:
-    - tools
-    - platform-tools
-    - build-tools-27.0.3
-    - build-tools-28.0.3
-    - android-23
-    - android-26
-    - android-28
-    - extra-android-m2repository
-
-before_cache:
-  - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
-
-cache:
-    directories:
-        - .nvm
-        - $HOME/.gradle/caches/
-        - $HOME/.gradle/wrapper/
-
-install:
-    - echo no | npm install -g nativescript
-    - tns usage-reporting disable
-    - tns error-reporting disable
-    - cd demo
-    - npm i
-    - cd ../src
-    - npm run build
-
-script:
-
-
 matrix:
   include:
     - stage: "Lint"
       language: node_js
       os: linux
-      node_js: "8"
+      node_js: "10"
       script: "npm run ci.tslint"
     - stage: "WebPack"
       os: osx
       env:
-        - Webpack="iOS"
-      osx_image: xcode9.2
+        - WebPack="iOS"
+      osx_image: xcode10.2
       language: node_js
-      node_js: "8"
+      node_js: "10"
       jdk: oraclejdk8
-      script: cd ../demo && travis_wait travis_retry tns build ios --bundle
+      before_script: pod repo update
+      script: cd ../demo && travis_wait travis_retry tns build ios --bundle --env.uglify
     - language: android
       os: linux
       env:
-        - Webpack="Android"
+        - WebPack="Android"
       jdk: oraclejdk8
-      before_install: nvm install 8.11.4
-      script: cd ../demo && travis_wait travis_retry tns build android --bundle
+      before_install: nvm install 8
+      script: cd ../demo && travis_wait travis_retry tns build android --bundle --env.uglify --env.snapshot
     - stage: "Build"
       env:
-        - BuildAndroid="26"
+        - BuildAndroid="28"
       language: android
       os: linux
+      dist: trusty
       jdk: oraclejdk8
-      before_install: nvm install 8.11.4
+      before_install: nvm install 10
       script:
         - cd ../demo && travis_wait travis_retry tns build android
     - os: osx
-      env:
-        - BuildiOS="11"
-        - Xcode="9.2"
-      osx_image: xcode9.2
+      osx_image: xcode10.2
       language: node_js
-      node_js: "8"
+      node_js: "10"
       jdk: oraclejdk8
+      before_script: pod repo update
       script:
         - cd ../demo && travis_wait travis_retry tns build ios
+
+android:
+  components:
+    - tools
+    - platform-tools
+    - build-tools-28.0.3
+    - android-28
+    - extra-android-m2repository
+    - sys-img-armeabi-v7a-android-21
+
+before_install:
+  - sudo pip install --upgrade pip
+  - sudo pip install six
+
+install:
+  - echo no | npm install -g nativescript
+  - tns usage-reporting disable
+  - tns error-reporting disable
+  - cd demo
+  - npm i
+  - cd ../src
+  - npm run build