Merge pull request #167 from NativeScript/dtodorov-next/update-output-dir

Update packages output dir

Author: DimitarTodorov

.travis.yml

@@ -5,10 +5,10 @@ env:
   global:
     - ANDROID_PACKAGE='camera-debug.apk'
     - ANDROID_PACKAGE_NEXT='camera-debug-next.apk'
-    - ANDROID_PACKAGE_FOLDER=$TRAVIS_BUILD_DIR/demo/platforms/android/app/build/outputs/apk/debug
+    - ANDROID_PACKAGE_FOLDER=$TRAVIS_BUILD_DIR/demo/outputs
     - ANDROID_SAUCE_STORAGE="https://saucelabs.com/rest/v1/storage/$SAUCE_USER/$ANDROID_PACKAGE_NEXT?overwrite=true"
     - IOS_PACKAGE_NEXT='camera-next.zip'
-    - IOS_PACKAGE_FOLDER=$TRAVIS_BUILD_DIR/demo/platforms/ios/build/emulator
+    - IOS_PACKAGE_FOLDER=$TRAVIS_BUILD_DIR/demo/outputs
     - IOS_SAUCE_STORAGE="https://saucelabs.com/rest/v1/storage/$SAUCE_USER/$IOS_PACKAGE_NEXT?overwrite=true"
 
 git:
@@ -20,57 +20,105 @@ matrix:
       os: osx
       env:
         - WebPackiOS="12.0"
+        - Type="VanillaJS"
       osx_image: xcode10.0
       language: node_js 
       node_js: "8"
       jdk: oraclejdk8
       before_script:
         - cd ../demo && tns platform add ios@next
+      script:
+        - cd ../demo && npm run build.plugin && npm i && tns build ios --bundle --env.uglify --copy-to "./outputs/demo.app"
+        - cd $IOS_PACKAGE_FOLDER && zip -r $IOS_PACKAGE_NEXT demo.app
+        - "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $IOS_SAUCE_STORAGE --data-binary @$IOS_PACKAGE_FOLDER/$IOS_PACKAGE_NEXT"
+    - os: osx
+      env:
+        - WebPackiOS="12.0"
+        - Type="Angular"
+      osx_image: xcode10.0
+      language: node_js 
+      node_js: "8"
+      jdk: oraclejdk8
+      before_script:
         - cd ../demo-angular && tns platform add ios@next
       script:
-        - cd ../demo && npm run build.plugin && npm i && tns build ios --bundle --env.uglify
-        - cd ../publish && sh pack.sh && cp package/*.tgz ../demo-angular/package.tgz
-        - cd ../demo-angular && tns plugin add package.tgz && npm i && tns build ios --bundle --env.uglify --env.aot
+        - cd ../src && npm run build && npm pack
+        - cd ../demo-angular && tns plugin add ../src/*.tgz
+        - npm i && tns build ios --bundle --env.uglify --env.aot
     - language: android
       os: linux
       env:
         - WebPackAndroid="28"
+        - Type="VanillaJS"
       jdk: oraclejdk8
       before_install: nvm install 8.11.4
       before_script:
         - cd ../demo && tns platform add android@next
+      script:
+        - cd ../demo && npm run build.plugin && npm i && tns build android --bundle --env.uglify --env.snapshot --copy-to "./outputs/app-debug.apk"
+        - "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $ANDROID_SAUCE_STORAGE --data-binary @$ANDROID_PACKAGE_FOLDER/app-debug.apk"
+    - language: android
+      os: linux
+      env:
+        - WebPackAndroid="28"
+        - Type="Angular"
+      jdk: oraclejdk8
+      before_install: nvm install 8.11.4
+      before_script:
         - cd ../demo-angular && tns platform add android@next
       script:
-        - cd ../demo && npm run build.plugin && npm i && tns build android --bundle --env.uglify --env.snapshot
-        - cd ../publish && sh pack.sh && cp package/*.tgz ../demo-angular/package.tgz
-        - cd ../demo-angular && tns plugin add package.tgz && npm i && tns build android --bundle --env.uglify --env.snapshot --env.aot
+        - cd ../src && npm run build
+        - cd ../publish && sh pack.sh
+        - cd ../demo-angular && tns plugin add ../publish/package/*.tgz
+        - npm i && tns build android --bundle --env.uglify --env.snapshot --env.aot
     - env: 
         - BuildAndroid="28"
+        - Type="VanillaJS"
       language: android
       os: linux
       jdk: oraclejdk8
       before_install: nvm install 8.11.4
       before_script:
         - cd ../demo && tns platform add android@next
+      script:
+        - cd ../src && npm i && npm run tsc && cd ../demo && tns build android
+    - env: 
+        - BuildAndroid="28"
+        - Type="Angular"
+      language: android
+      os: linux
+      jdk: oraclejdk8
+      before_install: nvm install 8.11.4
+      before_script:
         - cd ../demo-angular && tns platform add android@next
       script:
-        - cd ../src && npm i && npm run tsc && cd ../demo && tns build android && cd ../demo-angular && tns build android
-        - "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $ANDROID_SAUCE_STORAGE --data-binary @$ANDROID_PACKAGE_FOLDER/app-debug.apk"
+        - cd ../src && npm i && npm run tsc && cd ../demo-angular && tns build android
     - os: osx
       env: 
         - BuildiOS="12.0"
         - Xcode="10.0"
+        - Type="VanillaJS"
       osx_image: xcode10.0
       language: node_js 
       node_js: "8"
       jdk: oraclejdk8
       before_script:
         - cd ../demo && tns platform add ios@next
+      script: 
+        - cd ../src && npm i && npm run tsc && cd ../demo && tns build ios
+    - os: osx
+      env: 
+        - BuildiOS="12.0"
+        - Xcode="10.0"
+        - Type="Angular"
+      osx_image: xcode10.0
+      language: node_js 
+      node_js: "8"
+      jdk: oraclejdk8
+      before_script:
         - cd ../demo-angular && tns platform add ios@next
       script: 
-        - cd ../src && npm i && npm run tsc && cd ../demo && tns build ios && cd ../demo-angular && tns build ios
-        - cd $IOS_PACKAGE_FOLDER && zip -r $IOS_PACKAGE_NEXT demo.app
-        - "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $IOS_SAUCE_STORAGE --data-binary @$IOS_PACKAGE_FOLDER/$IOS_PACKAGE_NEXT"
+        - cd ../src && npm i && npm run tsc && cd ../demo-angular && tns build ios
     - stage: "UI Tests"
       env: 
         - Android="23"
@@ -89,7 +137,7 @@ matrix:
       script:
         - npm i -g appium
         - cd ../demo && npm i
-        - travis_wait travis_retry npm run e2e -- --runType sim.iPhone8.iOS11.2 --sauceLab --reuseDevice --appPath $IOS_PACKAGE_NEXT
+        - travis_wait travis_retry npm run e2e -- --runType sim.iPhoneX.iOS12 --sauceLab --reuseDevice --appPath $IOS_PACKAGE_NEXT
 
 android:
   components:

demo/e2e/config/appium.capabilities.json

@@ -96,10 +96,10 @@
             "deviceName": "iPhone 6",
             "app": ""
     },
-    "sim.iPhone8.iOS110": {
+    "sim.iPhone8.iOS11.2": {
         "platformName": "iOS",
-        "platformVersion": "11.0",
-        "deviceName": "iPhone 8 110",
+        "platformVersion": "11.2",
+        "deviceName": "iPhone 8 112",
         "noReset": true,
         "fullReset": false,
         "app": ""