adjust travis

Author: bradmartin

.travis.yml

@@ -1,65 +1,78 @@
-branches:
-  only: 
-    - master
+android:
+  components:
+    - tools
+    - platform-tools
+    - build-tools-25.0.2
+    - android-25
+    - extra-android-m2repository
+    - sys-img-armeabi-v7a-android-21
+
+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
+    - npm install
+    - cd src
+    - npm run setup
+
+script:
+
+
 matrix:
   include:
-      - stage: "Lint"
+    - stage: "Lint"
       language: node_js
       os: linux
       node_js: "6"
       script: "npm run ci.tslint" 
-      - stage: "WebPack"
+    - stage: "WebPack"
       os: osx
       env:
-        - Platform="iOS"
+        - Webpack="iOS"
       osx_image: xcode8.3
       language: node_js 
       node_js: "6"
       jdk: oraclejdk8
-      script: cd demo && npm run build.plugin && npm i && npm run build-ios-bundle && cd ../demo-angular && npm run build.plugin && npm i && npm run build-ios-bundle
+      before_install:
+        - gem install cocoapods
+        - pod repo update
+      script: cd ../demo && npm run build-ios-bundle
     - language: android
       os: linux
       env:
-        - Platform="Android"
+        - Webpack="Android"
       jdk: oraclejdk8
       before_install: nvm install 6.10.3
-      script: cd demo && npm run build.plugin && npm i && npm run build-android-bundle && cd ../demo-angular && npm run build.plugin && npm i && npm run build-android-bundle
+      script: cd ../demo &&  npm run build-android-bundle
     - stage: "Build"
       env: 
-        - Android="25"
+        - BuildAndroid="25"
       language: android
       os: linux
       jdk: oraclejdk8
       before_install: nvm install 6.10.3
-      script: cd demo && npm run ci.android.build && cd ../demo-angular && npm run ci.android.build
+      script:
+        - cd ../demo && tns build android
     - os: osx
       env: 
-        - iOS="10.3"
+        - BuildiOS="10.3"
         - Xcode="8.3"
       osx_image: xcode8.3
       language: node_js 
       node_js: "6"
       jdk: oraclejdk8
-      script: cd demo && npm run ci.ios.build && cd ../demo-angular && npm run ci.ios.build
-
-android:
-  components:
-    - tools
-    - platform-tools
-    - build-tools-25.0.2
-    - android-25
-    - 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
+      before_install:
+        - gem install cocoapods
+        - pod repo update
+      script:
+        - cd ../demo && tns build ios
+