From 2caa9265b5e49ddd1a105d784869816c0dd5cbcd Mon Sep 17 00:00:00 2001 From: Zdravko Branzov Date: Wed, 6 Jun 2018 09:19:16 +0300 Subject: [PATCH 01/30] fix: travis file --- .travis.yml | 101 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 61 insertions(+), 40 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3dd75e6..acb0f53 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,49 +1,32 @@ branches: only: - - master + - next env: global: - - ANDROID_PACKAGE='facebook-debug.apk' + - ANDROID_PACKAGE='app-debug.apk' + - ANDROID_PACKAGE_NEXT='demo-debug-next.apk' - ANDROID_PACKAGE_FOLDER=$TRAVIS_BUILD_DIR/demo/platforms/android/app/build/outputs/apk/debug - - ANDROID_SAUCE_STORAGE="https://saucelabs.com/rest/v1/storage/$SAUCE_USER/$ANDROID_PACKAGE?overwrite=true" - - IOS_PACKAGE='demo.zip' + - ANDROID_SAUCE_STORAGE="https://saucelabs.com/rest/v1/storage/$SAUCE_USER/$ANDROID_PACKAGE_NEXT?overwrite=true" + - IOS_PACKAGE_NEXT='demo-next.zip' - IOS_PACKAGE_FOLDER=$TRAVIS_BUILD_DIR/demo/platforms/ios/build/emulator - - IOS_SAUCE_STORAGE="https://saucelabs.com/rest/v1/storage/$SAUCE_USER/$IOS_PACKAGE?overwrite=true" + - IOS_SAUCE_STORAGE="https://saucelabs.com/rest/v1/storage/$SAUCE_USER/$IOS_PACKAGE_NEXT?overwrite=true" matrix: include: - - stage: "Lint" - language: node_js - os: linux - node_js: "6" - script: cd src && npm run ci.tslint && cd ../demo && npm run ci.tslint && cd ../demo-angular && npm run ci.tslint - - stage: "WebPack and Build" - os: osx - env: - - WebpackiOS="11" - osx_image: xcode9.2 - language: node_js - node_js: "6" - jdk: oraclejdk8 - script: cd demo && npm run build.plugin && npm i && tns build ios --env.uglify && cd ../demo-angular && npm run build.plugin && npm i && tns build ios --env.uglify --env.aot - - language: android - os: linux - env: - - WebpackAndroid="26" - jdk: oraclejdk8 - before_install: nvm install 6 - script: - - cd demo && npm run build.plugin && cd ../src && tns plugin build && cd ../demo && npm i && tns build android --env.uglify --env.snapshot - - cd ../demo-angular && npm i && tns build android --env.uglify --env.snapshot --env.aot - - language: android + - stage: "Build" env: - BuildAndroid="26" + language: android os: linux jdk: oraclejdk8 - before_install: nvm install 8.9.4 + before_install: + - nvm install 8.9.4 + before_script: + - cd ../demo && tns platform add android@next + - cd ../demo-angular && tns platform add android@next script: - - cd demo && npm run ci.android.build && cd ../demo-angular && npm run ci.android.build - - "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 ../demo && npm run ci.android.build && cd ../demo-angular && npm run ci.android.build + - "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $ANDROID_SAUCE_STORAGE --data-binary @$ANDROID_PACKAGE_FOLDER/$ANDROID_PACKAGE" - os: osx env: - BuildiOS="11" @@ -52,29 +35,55 @@ matrix: language: node_js node_js: "8" jdk: oraclejdk8 + before_script: + - cd ../demo && tns platform add ios@next + - cd ../demo-angular && tns platform add ios@next script: - - cd demo && npm run ci.ios.build && cd ../demo-angular && npm run ci.ios.build - - cd $IOS_PACKAGE_FOLDER && zip -r $IOS_PACKAGE 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" + - cd ../demo && npm run ci.ios.build && cd ../demo-angular && npm run ci.ios.build + - 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: + - Webpack="iOS" + osx_image: xcode9.2 + language: node_js + node_js: "6" + jdk: oraclejdk8 + before_script: + - cd ../demo && tns platform add ios@next + - cd ../demo-angular && tns platform add ios@next + script: cd ../demo && npm run build.plugin && npm i && tns build ios --bundle --env.uglify && cd ../demo-angular && npm i && tns build ios --bundle --env.uglify --env.aot + - os: linux + language: android + env: + - Webpack="Android" + jdk: oraclejdk8 + before_install: nvm install 6.10.3 + before_script: + - cd ../demo && tns platform add android@next + - 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 ../demo-angular && npm i && tns build android --bundle --env.uglify --env.snapshot --env.aot - stage: "UI Tests" env: - - Android="23" + - Android="23" language: node_js os: linux node_js: "6" + install: true script: - npm i -g appium - cd demo && npm i - - travis_retry npm run e2e -- --runType android23 --sauceLab --reuseDevice --appPath $ANDROID_PACKAGE + - travis_retry npm run e2e -- --runType android23 --sauceLab --reuseDevice --appPath $ANDROID_PACKAGE_NEXT - os: linux env: - iOS="10" language: node_js node_js: "6" + install: true script: - npm i -g appium - cd demo && npm i - - travis_wait travis_retry npm run e2e -- --runType sim103iPhone6 --sauceLab --reuseDevice --appPath $IOS_PACKAGE + - travis_wait travis_retry npm run e2e -- --runType sim103iPhone6 --sauceLab --reuseDevice --appPath $IOS_PACKAGE_NEXT android: components: @@ -95,6 +104,18 @@ cache: - $HOME/.gradle/wrapper/ install: - - npm install -g nativescript + - npm install -g nativescript@next - tns usage-reporting disable - - tns error-reporting disable \ No newline at end of file + - tns error-reporting disable + - cd src + - npm uninstall tns-core-modules -D && npm install tns-core-modules@next -D + - npm uninstall nativescript-angular -D && npm install nativescript-angular@next -D + - cd ../demo + - npm uninstall tns-core-modules -P && npm install tns-core-modules@next -P + - npm uninstall nativescript-dev-webpack -D && npm install nativescript-dev-webpack@next -D + - npm uninstall nativescript-dev-typescript -D && npm install nativescript-dev-typescript@next -D + - cd ../demo-angular + - npm uninstall tns-core-modules -P && npm install tns-core-modules@next -P + - npm uninstall nativescript-angular -P && npm install nativescript-angular@next -P + - npm uninstall nativescript-dev-webpack -D && npm install nativescript-dev-webpack@next -D + - npm uninstall nativescript-dev-typescript -D && npm install nativescript-dev-typescript@next -D \ No newline at end of file From 96b6c96e0f3d17e426543df8f527640c6568e3a4 Mon Sep 17 00:00:00 2001 From: Zdravko Branzov Date: Wed, 6 Jun 2018 09:29:35 +0300 Subject: [PATCH 02/30] chore: add gitattributes file --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..317a26c --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +.travis.yml merge=ours \ No newline at end of file From de069dff735f7763e0e240bc919ef94d185cd1ab Mon Sep 17 00:00:00 2001 From: Zdravko Branzov Date: Fri, 15 Jun 2018 12:55:30 +0300 Subject: [PATCH 03/30] chore: update travis file --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index acb0f53..a0522b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,7 +47,7 @@ matrix: - Webpack="iOS" osx_image: xcode9.2 language: node_js - node_js: "6" + node_js: "8" jdk: oraclejdk8 before_script: - cd ../demo && tns platform add ios@next @@ -58,7 +58,7 @@ matrix: env: - Webpack="Android" jdk: oraclejdk8 - before_install: nvm install 6.10.3 + before_install: nvm install 8.9.4 before_script: - cd ../demo && tns platform add android@next - cd ../demo-angular && tns platform add android@next @@ -114,8 +114,10 @@ install: - npm uninstall tns-core-modules -P && npm install tns-core-modules@next -P - npm uninstall nativescript-dev-webpack -D && npm install nativescript-dev-webpack@next -D - npm uninstall nativescript-dev-typescript -D && npm install nativescript-dev-typescript@next -D + - ./node_modules/.bin/update-ns-webpack --deps - cd ../demo-angular - npm uninstall tns-core-modules -P && npm install tns-core-modules@next -P - npm uninstall nativescript-angular -P && npm install nativescript-angular@next -P - npm uninstall nativescript-dev-webpack -D && npm install nativescript-dev-webpack@next -D - - npm uninstall nativescript-dev-typescript -D && npm install nativescript-dev-typescript@next -D \ No newline at end of file + - npm uninstall nativescript-dev-typescript -D && npm install nativescript-dev-typescript@next -D + - ./node_modules/.bin/update-ns-webpack --deps \ No newline at end of file From 4863274924dd390da8e3d77e909ec2f24c0da204 Mon Sep 17 00:00:00 2001 From: Zdravko Branzov Date: Fri, 15 Jun 2018 14:06:36 +0300 Subject: [PATCH 04/30] chore: remove npm uninstalls as they make install --- .travis.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index a0522b3..ceea279 100644 --- a/.travis.yml +++ b/.travis.yml @@ -108,16 +108,16 @@ install: - tns usage-reporting disable - tns error-reporting disable - cd src - - npm uninstall tns-core-modules -D && npm install tns-core-modules@next -D - - npm uninstall nativescript-angular -D && npm install nativescript-angular@next -D + - npm install tns-core-modules@next -D + - npm install nativescript-angular@next -D - cd ../demo - - npm uninstall tns-core-modules -P && npm install tns-core-modules@next -P - - npm uninstall nativescript-dev-webpack -D && npm install nativescript-dev-webpack@next -D - - npm uninstall nativescript-dev-typescript -D && npm install nativescript-dev-typescript@next -D + - npm install tns-core-modules@next -P + - npm install nativescript-dev-webpack@next -D + - npm install nativescript-dev-typescript@next -D - ./node_modules/.bin/update-ns-webpack --deps - cd ../demo-angular - - npm uninstall tns-core-modules -P && npm install tns-core-modules@next -P - - npm uninstall nativescript-angular -P && npm install nativescript-angular@next -P - - npm uninstall nativescript-dev-webpack -D && npm install nativescript-dev-webpack@next -D - - npm uninstall nativescript-dev-typescript -D && npm install nativescript-dev-typescript@next -D + - npm install tns-core-modules@next -P + - npm install nativescript-angular@next -P + - npm install nativescript-dev-webpack@next -D + - npm install nativescript-dev-typescript@next -D - ./node_modules/.bin/update-ns-webpack --deps \ No newline at end of file From b0cd2d2586abf3192cde6df72d0b8b2c981214dc Mon Sep 17 00:00:00 2001 From: Zdravko Branzov Date: Mon, 30 Jul 2018 15:21:07 +0300 Subject: [PATCH 05/30] fix: webpack angular build --- .travis.yml | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index ceea279..6260f3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,7 +52,10 @@ matrix: before_script: - cd ../demo && tns platform add ios@next - cd ../demo-angular && tns platform add ios@next - script: cd ../demo && npm run build.plugin && npm i && tns build ios --bundle --env.uglify && cd ../demo-angular && npm i && tns build ios --bundle --env.uglify --env.aot + 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 - os: linux language: android env: @@ -62,13 +65,16 @@ matrix: before_script: - cd ../demo && tns platform add android@next - 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 ../demo-angular && npm i && tns build android --bundle --env.uglify --env.snapshot --env.aot + script: + - cd ../demo && npm run build.plugin && npm i && tns build android --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 android --bundle --env.uglify --env.aot - stage: "UI Tests" env: - - Android="23" + - Android="23" language: node_js os: linux - node_js: "6" + node_js: "8" install: true script: - npm i -g appium @@ -78,7 +84,7 @@ matrix: env: - iOS="10" language: node_js - node_js: "6" + node_js: "8" install: true script: - npm i -g appium @@ -111,13 +117,16 @@ install: - npm install tns-core-modules@next -D - npm install nativescript-angular@next -D - cd ../demo - - npm install tns-core-modules@next -P - npm install nativescript-dev-webpack@next -D + - ./node_modules/.bin/update-ns-webpack --deps + - npm install tns-core-modules@next -P - npm install nativescript-dev-typescript@next -D - ./node_modules/.bin/update-ns-webpack --deps - cd ../demo-angular + - npm install nativescript-dev-webpack@next -D + - ./node_modules/.bin/update-ns-webpack --deps + - ./node_modules/.bin/update-app-ng-deps - npm install tns-core-modules@next -P - npm install nativescript-angular@next -P - - npm install nativescript-dev-webpack@next -D - npm install nativescript-dev-typescript@next -D - ./node_modules/.bin/update-ns-webpack --deps \ No newline at end of file From e03aac23e4569768204f7ed6479241d8f361a3f1 Mon Sep 17 00:00:00 2001 From: Zdravko Branzov Date: Mon, 30 Jul 2018 15:21:07 +0300 Subject: [PATCH 06/30] fix: webpack angular build --- .travis.yml | 4 +--- demo/package.json | 1 + src/login-manager.android.ts | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6260f3e..e9a0169 100644 --- a/.travis.yml +++ b/.travis.yml @@ -121,12 +121,10 @@ install: - ./node_modules/.bin/update-ns-webpack --deps - npm install tns-core-modules@next -P - npm install nativescript-dev-typescript@next -D - - ./node_modules/.bin/update-ns-webpack --deps - cd ../demo-angular - npm install nativescript-dev-webpack@next -D - ./node_modules/.bin/update-ns-webpack --deps - ./node_modules/.bin/update-app-ng-deps - npm install tns-core-modules@next -P - npm install nativescript-angular@next -P - - npm install nativescript-dev-typescript@next -D - - ./node_modules/.bin/update-ns-webpack --deps \ No newline at end of file + - npm install nativescript-dev-typescript@next -D \ No newline at end of file diff --git a/demo/package.json b/demo/package.json index 009ae35..4b2e89e 100644 --- a/demo/package.json +++ b/demo/package.json @@ -31,6 +31,7 @@ "nativescript-dev-appium": "3.2.0", "nativescript-dev-typescript": "^0.7.1", "nativescript-dev-webpack": "~0.14.0", + "rxjs-compat": "^6.2.2", "tslint": "~5.4.3", "typescript": "~2.7.2", "wd": "~1.7.0", diff --git a/src/login-manager.android.ts b/src/login-manager.android.ts index a47d508..a7109a7 100644 --- a/src/login-manager.android.ts +++ b/src/login-manager.android.ts @@ -6,6 +6,7 @@ declare let com: any; const LOGIN_PERMISSIONS = ["public_profile", "email"]; +export let onLoginCallback; export let onLogoutCallback; let androidApplication; let _act: android.app.Activity; From ddf40a64df47c1e4dc1db551982d0e21d3af2585 Mon Sep 17 00:00:00 2001 From: Zdravko Branzov Date: Wed, 22 Aug 2018 09:45:08 +0300 Subject: [PATCH 07/30] fix: webpack ios build --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e9a0169..0617d3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,8 +53,8 @@ matrix: - cd ../demo && tns platform add ios@next - 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 ../src && npm run build.iosOnly && npm pack && cp *.tgz ../demo-angular/package.tgz + - cd ../demo && npm i && tns build ios --bundle --env.uglify - cd ../demo-angular && tns plugin add package.tgz && npm i && tns build ios --bundle --env.uglify --env.aot - os: linux language: android From ff57aebcd687a8e9f934f4012c0ca8d0dd7dc6b6 Mon Sep 17 00:00:00 2001 From: Dimitar Todorov Date: Wed, 22 Aug 2018 13:59:45 +0300 Subject: [PATCH 08/30] chore: update node version in travis --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e9a0169..b510489 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ matrix: os: linux jdk: oraclejdk8 before_install: - - nvm install 8.9.4 + - nvm install 8.11.4 before_script: - cd ../demo && tns platform add android@next - cd ../demo-angular && tns platform add android@next @@ -61,7 +61,7 @@ matrix: env: - Webpack="Android" jdk: oraclejdk8 - before_install: nvm install 8.9.4 + before_install: nvm install 8.11.4 before_script: - cd ../demo && tns platform add android@next - cd ../demo-angular && tns platform add android@next From f857633667e2c4516a82ce5b434b4868644f1569 Mon Sep 17 00:00:00 2001 From: Dimitar Todorov Date: Wed, 22 Aug 2018 18:17:53 +0300 Subject: [PATCH 09/30] update demos path in before_script --- .travis.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index b510489..7824330 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,8 +22,8 @@ matrix: before_install: - nvm install 8.11.4 before_script: - - cd ../demo && tns platform add android@next - - cd ../demo-angular && tns platform add android@next + - cd demo && tns platform add android@next + - cd demo-angular && tns platform add android@next script: - cd ../demo && npm run ci.android.build && cd ../demo-angular && npm run ci.android.build - "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $ANDROID_SAUCE_STORAGE --data-binary @$ANDROID_PACKAGE_FOLDER/$ANDROID_PACKAGE" @@ -36,8 +36,8 @@ matrix: node_js: "8" jdk: oraclejdk8 before_script: - - cd ../demo && tns platform add ios@next - - cd ../demo-angular && tns platform add ios@next + - cd demo && tns platform add ios@next + - cd demo-angular && tns platform add ios@next script: - cd ../demo && npm run ci.ios.build && cd ../demo-angular && npm run ci.ios.build - cd $IOS_PACKAGE_FOLDER && zip -r $IOS_PACKAGE_NEXT demo.app @@ -50,8 +50,8 @@ matrix: node_js: "8" jdk: oraclejdk8 before_script: - - cd ../demo && tns platform add ios@next - - cd ../demo-angular && tns platform add ios@next + - cd demo && tns platform add ios@next + - 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 @@ -63,8 +63,8 @@ matrix: jdk: oraclejdk8 before_install: nvm install 8.11.4 before_script: - - cd ../demo && tns platform add android@next - - cd ../demo-angular && tns platform add android@next + - cd demo && tns platform add android@next + - cd demo-angular && tns platform add android@next script: - cd ../demo && npm run build.plugin && npm i && tns build android --bundle --env.uglify - cd ../publish && sh pack.sh && cp package/*.tgz ../demo-angular/package.tgz @@ -127,4 +127,4 @@ install: - ./node_modules/.bin/update-app-ng-deps - npm install tns-core-modules@next -P - npm install nativescript-angular@next -P - - npm install nativescript-dev-typescript@next -D \ No newline at end of file + - npm install nativescript-dev-typescript@next -D From b31536009493c9b73ac71f5a8aa96894b1f46257 Mon Sep 17 00:00:00 2001 From: Dimitar Todorov Date: Thu, 23 Aug 2018 10:46:23 +0300 Subject: [PATCH 10/30] chore: add pip install six, update xcode to 9.4 --- .travis.yml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7824330..6cf79dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,22 +22,22 @@ matrix: before_install: - nvm install 8.11.4 before_script: - - cd demo && tns platform add android@next - - cd demo-angular && tns platform add android@next + - cd ../demo && tns platform add android@next + - cd ../demo-angular && tns platform add android@next script: - cd ../demo && npm run ci.android.build && cd ../demo-angular && npm run ci.android.build - "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $ANDROID_SAUCE_STORAGE --data-binary @$ANDROID_PACKAGE_FOLDER/$ANDROID_PACKAGE" - os: osx env: - BuildiOS="11" - - Xcode="9.2" - osx_image: xcode9.2 + - Xcode="9.4" + osx_image: xcode9.4 language: node_js node_js: "8" jdk: oraclejdk8 before_script: - - cd demo && tns platform add ios@next - - cd demo-angular && tns platform add ios@next + - cd ../demo && tns platform add ios@next + - cd ../demo-angular && tns platform add ios@next script: - cd ../demo && npm run ci.ios.build && cd ../demo-angular && npm run ci.ios.build - cd $IOS_PACKAGE_FOLDER && zip -r $IOS_PACKAGE_NEXT demo.app @@ -45,13 +45,13 @@ matrix: - os: osx env: - Webpack="iOS" - osx_image: xcode9.2 + osx_image: xcode9.4 language: node_js node_js: "8" jdk: oraclejdk8 before_script: - - cd demo && tns platform add ios@next - - cd demo-angular && tns platform add ios@next + - cd ../demo && tns platform add ios@next + - 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 @@ -63,8 +63,8 @@ matrix: jdk: oraclejdk8 before_install: nvm install 8.11.4 before_script: - - cd demo && tns platform add android@next - - cd demo-angular && tns platform add android@next + - cd ../demo && tns platform add android@next + - cd ../demo-angular && tns platform add android@next script: - cd ../demo && npm run build.plugin && npm i && tns build android --bundle --env.uglify - cd ../publish && sh pack.sh && cp package/*.tgz ../demo-angular/package.tgz @@ -113,6 +113,7 @@ install: - npm install -g nativescript@next - tns usage-reporting disable - tns error-reporting disable + - pip install six - cd src - npm install tns-core-modules@next -D - npm install nativescript-angular@next -D From 5011369e563e8d33121f69936adef4aaa2225caa Mon Sep 17 00:00:00 2001 From: Dimitar Todorov Date: Fri, 5 Oct 2018 09:51:15 +0300 Subject: [PATCH 11/30] chore: update build tools for android to 28.0.2 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b5ff1d0..1ff5388 100644 --- a/.travis.yml +++ b/.travis.yml @@ -95,7 +95,7 @@ android: components: - tools - platform-tools - - build-tools-27.0.3 + - build-tools-28.0.2 - android-26 - android-23 - extra-android-m2repository From 8813e8d7cdeae32bd18bc55ef28f2be7dcf5b8f9 Mon Sep 17 00:00:00 2001 From: Dimitar Todorov Date: Thu, 11 Oct 2018 09:55:52 +0300 Subject: [PATCH 12/30] chore: add android SDK 28 --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1ff5388..2ac8afb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -96,8 +96,7 @@ android: - tools - platform-tools - build-tools-28.0.2 - - android-26 - - android-23 + - android-28 - extra-android-m2repository before_cache: From 344c6e9aa01d5c2ee37958243d45b64fe7821919 Mon Sep 17 00:00:00 2001 From: Dimitar Todorov Date: Fri, 12 Oct 2018 12:41:51 +0300 Subject: [PATCH 13/30] chore: bump xcode to 10, add pip install scripts --- .travis.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2ac8afb..bb85625 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,9 +29,9 @@ matrix: - "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $ANDROID_SAUCE_STORAGE --data-binary @$ANDROID_PACKAGE_FOLDER/$ANDROID_PACKAGE" - os: osx env: - - BuildiOS="11" - - Xcode="9.4" - osx_image: xcode9.4 + - BuildiOS="12.0" + - Xcode="10.0" + osx_image: xcode10.0 language: node_js node_js: "8" jdk: oraclejdk8 @@ -45,7 +45,7 @@ matrix: - os: osx env: - Webpack="iOS" - osx_image: xcode9.4 + osx_image: xcode10.0 language: node_js node_js: "8" jdk: oraclejdk8 @@ -82,7 +82,7 @@ matrix: - travis_retry npm run e2e -- --runType android23 --sauceLab --reuseDevice --appPath $ANDROID_PACKAGE_NEXT - os: linux env: - - iOS="10" + - iOS="12.0" language: node_js node_js: "8" install: true @@ -107,6 +107,10 @@ cache: - .nvm - $HOME/.gradle/caches/ - $HOME/.gradle/wrapper/ + +before_install: + - sudo pip install --upgrade pip + - sudo pip install six install: - npm install -g nativescript@next From efb68da9149d359837412f61858bc89cf0a7123a Mon Sep 17 00:00:00 2001 From: Zdravko Branzov Date: Mon, 12 Nov 2018 16:48:16 +0200 Subject: [PATCH 14/30] fix: next build of angular app --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index bb85625..5fadd42 100644 --- a/.travis.yml +++ b/.travis.yml @@ -132,3 +132,4 @@ install: - npm install tns-core-modules@next -P - npm install nativescript-angular@next -P - npm install nativescript-dev-typescript@next -D + - npm install typescript@3.1.6 -D From 0d7a4b3e7d2878f6436df7aca4381d46a21a0664 Mon Sep 17 00:00:00 2001 From: Zdravko Branzov Date: Fri, 23 Nov 2018 10:18:30 +0200 Subject: [PATCH 15/30] fix: build tools --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5fadd42..12c307f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -95,7 +95,7 @@ android: components: - tools - platform-tools - - build-tools-28.0.2 + - build-tools-28.0.3 - android-28 - extra-android-m2repository @@ -121,15 +121,14 @@ install: - npm install tns-core-modules@next -D - npm install nativescript-angular@next -D - cd ../demo + - npm install nativescript-dev-typescript@next -D - npm install nativescript-dev-webpack@next -D - ./node_modules/.bin/update-ns-webpack --deps - npm install tns-core-modules@next -P - - npm install nativescript-dev-typescript@next -D - cd ../demo-angular + - npm install nativescript-dev-typescript@next -D - npm install nativescript-dev-webpack@next -D - ./node_modules/.bin/update-ns-webpack --deps - ./node_modules/.bin/update-app-ng-deps - npm install tns-core-modules@next -P - npm install nativescript-angular@next -P - - npm install nativescript-dev-typescript@next -D - - npm install typescript@3.1.6 -D From 70eb7326a75c73bbf52143e24e7b4f9efdddd659 Mon Sep 17 00:00:00 2001 From: Elena Hristova Date: Thu, 20 Dec 2018 13:58:24 +0200 Subject: [PATCH 16/30] chore: unify install step in travis files --- .travis.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 12c307f..99d16fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -113,22 +113,23 @@ before_install: - sudo pip install six install: - - npm install -g nativescript@next + - echo no | npm install -g nativescript@next - tns usage-reporting disable - tns error-reporting disable - - pip install six - cd src - npm install tns-core-modules@next -D - npm install nativescript-angular@next -D - cd ../demo - - npm install nativescript-dev-typescript@next -D - - npm install nativescript-dev-webpack@next -D - - ./node_modules/.bin/update-ns-webpack --deps - npm install tns-core-modules@next -P - - cd ../demo-angular - - npm install nativescript-dev-typescript@next -D - npm install nativescript-dev-webpack@next -D - - ./node_modules/.bin/update-ns-webpack --deps - - ./node_modules/.bin/update-app-ng-deps + - npm install nativescript-dev-typescript@next -D + - ./node_modules/.bin/update-ns-webpack --deps --configs + - npm install -D wd@latest + - cd ../demo-angular - npm install tns-core-modules@next -P - npm install nativescript-angular@next -P + - npm install nativescript-dev-webpack@next -D + - npm install nativescript-dev-typescript@next -D + - ./node_modules/.bin/update-ns-webpack --deps --configs + - ./node_modules/.bin/update-app-ng-deps + - npm install -D wd@latest From 522460eec64ddf906402060d19319e2167d81d77 Mon Sep 17 00:00:00 2001 From: Elena Hristova Date: Thu, 17 Jan 2019 13:33:26 +0200 Subject: [PATCH 17/30] add pod repo update command --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 99d16fe..4d7fe9a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,6 +36,7 @@ matrix: node_js: "8" jdk: oraclejdk8 before_script: + - pod repo update - cd ../demo && tns platform add ios@next - cd ../demo-angular && tns platform add ios@next script: @@ -50,6 +51,7 @@ matrix: node_js: "8" jdk: oraclejdk8 before_script: + - pod repo update - cd ../demo && tns platform add ios@next - cd ../demo-angular && tns platform add ios@next script: From 4aae5435574acc4b38b35e0bccc6c6a694e43a38 Mon Sep 17 00:00:00 2001 From: Dimitar Todorov Date: Thu, 31 Jan 2019 16:40:43 +0200 Subject: [PATCH 18/30] update output dir of packages --- .travis.yml | 67 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 58 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4d7fe9a..b946a72 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,10 @@ env: global: - ANDROID_PACKAGE='app-debug.apk' - ANDROID_PACKAGE_NEXT='demo-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='demo-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" matrix: @@ -16,6 +16,7 @@ matrix: - stage: "Build" env: - BuildAndroid="26" + - Type="VanillaJS" language: android os: linux jdk: oraclejdk8 @@ -23,14 +24,25 @@ matrix: - nvm install 8.11.4 before_script: - cd ../demo && tns platform add android@next + script: + - cd ../demo && npm run ci.android.build + - env: + - BuildAndroid="26" + - 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 ../demo && npm run ci.android.build && cd ../demo-angular && npm run ci.android.build - - "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $ANDROID_SAUCE_STORAGE --data-binary @$ANDROID_PACKAGE_FOLDER/$ANDROID_PACKAGE" + - cd ../demo-angular && npm run ci.android.build - os: osx env: - BuildiOS="12.0" - Xcode="10.0" + - Type="VanillaJS" osx_image: xcode10.0 language: node_js node_js: "8" @@ -38,37 +50,74 @@ matrix: before_script: - pod repo update - cd ../demo && tns platform add ios@next + script: + - cd ../demo && npm run ci.ios.build + - 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: + - pod repo update - cd ../demo-angular && tns platform add ios@next script: - - cd ../demo && npm run ci.ios.build && cd ../demo-angular && npm run ci.ios.build + - cd ../demo-angular && npm run ci.ios.build + - os: osx + env: + - Webpack="iOS" + - Type="VanillaJS" + osx_image: xcode10.0 + language: node_js + node_js: "8" + jdk: oraclejdk8 + before_script: + - pod repo update + - cd ../demo && tns platform add ios@next + script: + - cd ../src && npm run build.iosOnly + - cd ../demo && npm i && tns build ios --bundle --env.uglify --copy-to "./options/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: - Webpack="iOS" + - Type="Angular" osx_image: xcode10.0 language: node_js node_js: "8" jdk: oraclejdk8 before_script: - pod repo update - - cd ../demo && tns platform add ios@next - - cd ../demo-angular && tns platform add ios@next + - cd ../demo-angulatr && tns platform add ios@next script: - cd ../src && npm run build.iosOnly && npm pack && cp *.tgz ../demo-angular/package.tgz - - cd ../demo && npm i && tns build ios --bundle --env.uglify - cd ../demo-angular && tns plugin add package.tgz && npm i && tns build ios --bundle --env.uglify --env.aot - os: linux language: android env: - Webpack="Android" + - 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 --copy-to "./options/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/$ANDROID_PACKAGE" + - os: linux + language: android + env: + - Webpack="Android" + - 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 - 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.aot - stage: "UI Tests" From f08e8f32edb546bcf82c31f5a045a8a2845c6bcc Mon Sep 17 00:00:00 2001 From: Dimitar Todorov Date: Thu, 31 Jan 2019 17:15:25 +0200 Subject: [PATCH 19/30] typos in path of packages --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b946a72..d125342 100644 --- a/.travis.yml +++ b/.travis.yml @@ -79,7 +79,7 @@ matrix: - cd ../demo && tns platform add ios@next script: - cd ../src && npm run build.iosOnly - - cd ../demo && npm i && tns build ios --bundle --env.uglify --copy-to "./options/demo.app" + - cd ../demo && 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 @@ -92,7 +92,7 @@ matrix: jdk: oraclejdk8 before_script: - pod repo update - - cd ../demo-angulatr && tns platform add ios@next + - cd ../demo-angular && tns platform add ios@next script: - cd ../src && npm run build.iosOnly && npm pack && cp *.tgz ../demo-angular/package.tgz - cd ../demo-angular && tns plugin add package.tgz && npm i && tns build ios --bundle --env.uglify --env.aot @@ -106,7 +106,7 @@ matrix: before_script: - cd ../demo && tns platform add android@next script: - - cd ../demo && npm run build.plugin && npm i && tns build android --bundle --env.uglify --copy-to "./options/app-debug.apk" + - cd ../demo && npm run build.plugin && npm i && tns build android --bundle --env.uglify --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/$ANDROID_PACKAGE" - os: linux language: android From ec5aaa12519a62776f18e9681fb43178227f892f Mon Sep 17 00:00:00 2001 From: Dimitar Todorov Date: Fri, 1 Feb 2019 14:42:14 +0200 Subject: [PATCH 20/30] update to iPhoneXios12 in capabilities for build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d125342..bb3f716 100644 --- a/.travis.yml +++ b/.travis.yml @@ -140,7 +140,7 @@ matrix: script: - npm i -g appium - cd demo && npm i - - travis_wait travis_retry npm run e2e -- --runType sim103iPhone6 --sauceLab --reuseDevice --appPath $IOS_PACKAGE_NEXT + - travis_wait travis_retry npm run e2e -- --runType sim12iPhoneX --sauceLab --reuseDevice --appPath $IOS_PACKAGE_NEXT android: components: From 5bc29706636ff37836445433140f3f413ef81559 Mon Sep 17 00:00:00 2001 From: Elena Hristova Date: Tue, 28 May 2019 09:59:50 +0300 Subject: [PATCH 21/30] chore: update travis configuration to be as master, test next without not-webpack builds --- .gitattributes | 1 - .travis.yml | 226 +++++++++++++++++++++++++------------------------ 2 files changed, 117 insertions(+), 110 deletions(-) delete mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 317a26c..0000000 --- a/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -.travis.yml merge=ours \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index bb3f716..6108058 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,146 +1,154 @@ branches: - only: + only: - next env: global: - - ANDROID_PACKAGE='app-debug.apk' - - ANDROID_PACKAGE_NEXT='demo-debug-next.apk' - - 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='demo-next.zip' - - IOS_PACKAGE_FOLDER=$TRAVIS_BUILD_DIR/demo/outputs - - IOS_SAUCE_STORAGE="https://saucelabs.com/rest/v1/storage/$SAUCE_USER/$IOS_PACKAGE_NEXT?overwrite=true" + - ANDROID_PACKAGE_JS='facebook-debug-js-next.apk' + - ANDROID_PACKAGE_VUE='facebook-debug-vue-next.apk' + - ANDROID_PACKAGE_FOLDER_JS=$TRAVIS_BUILD_DIR/demo/outputs + - ANDROID_PACKAGE_FOLDER_VUE=$TRAVIS_BUILD_DIR/demo-vue/outputs + - ANDROID_SAUCE_STORAGE="https://saucelabs.com/rest/v1/storage/$SAUCE_USER" + - IOS_PACKAGE_JS='facebook-demo-js-next.zip' + - IOS_PACKAGE_VUE='facebook-demo-vue-next.zip' + - IOS_PACKAGE_FOLDER_JS=$TRAVIS_BUILD_DIR/demo/outputs + - IOS_PACKAGE_FOLDER_VUE=$TRAVIS_BUILD_DIR/demo-vue/outputs + - IOS_SAUCE_STORAGE="https://saucelabs.com/rest/v1/storage/$SAUCE_USER" matrix: include: - - stage: "Build" - env: - - BuildAndroid="26" - - 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 ../demo && npm run ci.android.build - - env: - - BuildAndroid="26" - - 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 ../demo-angular && npm run ci.android.build - - os: osx - env: - - BuildiOS="12.0" - - Xcode="10.0" + - stage: "WebPack and Build" + os: osx + env: + - WebpackiOS="12.0" - Type="VanillaJS" osx_image: xcode10.0 - language: node_js - node_js: "8" + language: node_js + node_js: "10" jdk: oraclejdk8 - before_script: + before_script: - pod repo update - cd ../demo && tns platform add ios@next - script: - - cd ../demo && npm run ci.ios.build - - 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: - - pod repo update - - cd ../demo-angular && tns platform add ios@next - script: - - cd ../demo-angular && npm run ci.ios.build + script: + - cd ../src && npm run build.iosOnly + - cd ../demo && npm i && tns build ios --bundle --env.uglify --copy-to "./outputs/demo.app" + - cd $IOS_PACKAGE_FOLDER_JS && zip -r $IOS_PACKAGE_JS demo.app + - "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $IOS_SAUCE_STORAGE/$IOS_PACKAGE_JS?overwrite=true --data-binary @$IOS_PACKAGE_FOLDER_JS/$IOS_PACKAGE_JS" - os: osx env: - - Webpack="iOS" - - Type="VanillaJS" + - WebpackiOS="12.0" + - Type="VueJS" osx_image: xcode10.0 - language: node_js - node_js: "8" + language: node_js + node_js: "10" jdk: oraclejdk8 - before_script: + before_script: - pod repo update - - cd ../demo && tns platform add ios@next + - cd ../demo-vue && tns platform add ios@next script: - cd ../src && npm run build.iosOnly - - cd ../demo && 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" + - cd ../demo-vue && npm i && tns build ios --bundle --env.uglify --copy-to "./outputs/demovue.app" + - cd $IOS_PACKAGE_FOLDER_VUE && zip -r $IOS_PACKAGE_VUE demovue.app + - "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $IOS_SAUCE_STORAGE/$IOS_PACKAGE_VUE?overwrite=true --data-binary @$IOS_PACKAGE_FOLDER_VUE/$IOS_PACKAGE_VUE" - os: osx env: - - Webpack="iOS" + - WebpackiOS="12.0" - Type="Angular" osx_image: xcode10.0 - language: node_js - node_js: "8" + language: node_js + node_js: "10" jdk: oraclejdk8 - before_script: + before_script: - pod repo update - cd ../demo-angular && tns platform add ios@next script: - - cd ../src && npm run build.iosOnly && npm pack && cp *.tgz ../demo-angular/package.tgz - - cd ../demo-angular && tns plugin add package.tgz && npm i && tns build ios --bundle --env.uglify --env.aot - - os: linux - language: android + - cd ../src && npm run build.iosOnly && 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: - - Webpack="Android" + - WebpackAndroid="28" - Type="VanillaJS" jdk: oraclejdk8 - before_install: nvm install 8.11.4 - before_script: + before_install: + - nvm install 10 + before_script: - cd ../demo && tns platform add android@next script: - - cd ../demo && npm run build.plugin && npm i && tns build android --bundle --env.uglify --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/$ANDROID_PACKAGE" - - os: linux - language: android + - cd ../src && npm run build + - cd ../demo && 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/$ANDROID_PACKAGE_JS?overwrite=true --data-binary @$ANDROID_PACKAGE_FOLDER_JS/app-debug.apk" + - language: android + os: linux + env: + - WebpackAndroid="28" + - Type="VueJS" + jdk: oraclejdk8 + before_install: + - nvm install 10 + before_script: + - cd ../demo-vue && tns platform add android@next + script: + - cd ../src && npm run build + - cd ../demo-vue && npm i && tns build android --bundle --env.uglify --copy-to "./outputs/app-debug.apk" + - "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $ANDROID_SAUCE_STORAGE/$ANDROID_PACKAGE_VUE?overwrite=true --data-binary @$ANDROID_PACKAGE_FOLDER_VUE/app-debug.apk" + - language: android + os: linux env: - - Webpack="Android" + - WebpackAndroid="28" - Type="Angular" jdk: oraclejdk8 - before_install: nvm install 8.11.4 - before_script: + before_install: + - nvm install 10 + before_script: - cd ../demo-angular && tns platform add android@next script: - - 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.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 - stage: "UI Tests" - env: - - Android="23" + env: + - Android="24" + - Type="VanillaJS" + language: node_js + os: linux + node_js: "10" + script: + - npm i -g appium + - cd ../demo && npm i + - travis_wait travis_retry npm run e2e -- --runType android24 --sauceLab --appPath $ANDROID_PACKAGE_JS + - os: linux + env: + - Android="24" + - Type="VueJS" language: node_js os: linux - node_js: "8" - install: true + node_js: "10" script: - npm i -g appium - - cd demo && npm i - - travis_retry npm run e2e -- --runType android23 --sauceLab --reuseDevice --appPath $ANDROID_PACKAGE_NEXT + - cd ../demo-vue && npm i + - travis_wait travis_retry npm run e2e -- --runType android24 --sauceLab --appPath $ANDROID_PACKAGE_VUE - os: linux - env: + env: - iOS="12.0" - language: node_js - node_js: "8" - install: true - script: + - Type="VanillaJS" + language: node_js + node_js: "10" + script: - npm i -g appium - - cd demo && npm i - - travis_wait travis_retry npm run e2e -- --runType sim12iPhoneX --sauceLab --reuseDevice --appPath $IOS_PACKAGE_NEXT + - cd ../demo && npm i + - travis_wait travis_retry npm run e2e -- --runType sim12iPhoneX --sauceLab --appPath $IOS_PACKAGE_JS + - os: linux + env: + - iOS="12.0" + - Type="VueJS" + language: node_js + node_js: "10" + script: + - npm i -g appium + - cd ../demo-vue && npm i + - travis_wait travis_retry npm run e2e -- --runType sim12iPhoneX --sauceLab --appPath $IOS_PACKAGE_VUE android: components: @@ -150,18 +158,9 @@ android: - 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/ - before_install: - - sudo pip install --upgrade pip - - sudo pip install six + - sudo pip install --upgrade pip + - sudo pip install six install: - echo no | npm install -g nativescript@next @@ -175,6 +174,7 @@ install: - npm install nativescript-dev-webpack@next -D - npm install nativescript-dev-typescript@next -D - ./node_modules/.bin/update-ns-webpack --deps --configs + - npx rimraf -- hooks node_modules platforms package-lock.json - npm install -D wd@latest - cd ../demo-angular - npm install tns-core-modules@next -P @@ -183,4 +183,12 @@ install: - npm install nativescript-dev-typescript@next -D - ./node_modules/.bin/update-ns-webpack --deps --configs - ./node_modules/.bin/update-app-ng-deps + - npx rimraf -- hooks node_modules platforms package-lock.json - npm install -D wd@latest + - cd ../demo-vue + - npm install tns-core-modules@next -P + - npm install nativescript-dev-webpack@next -D + - npm install nativescript-dev-typescript@next -D + - ./node_modules/.bin/update-ns-webpack --deps --configs + - npx rimraf -- hooks node_modules platforms package-lock.json + - npm install -D wd@latest \ No newline at end of file From d8e5312f9244afc73cba1c9654a9264ae8d0f62a Mon Sep 17 00:00:00 2001 From: Elena Hristova Date: Mon, 10 Jun 2019 09:26:22 +0300 Subject: [PATCH 22/30] chore: fix installing the correct next version of webpack --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1b94b01..3be0c45 100644 --- a/.travis.yml +++ b/.travis.yml @@ -171,7 +171,7 @@ install: - npm install nativescript-angular@next -D - cd ../demo - npm install tns-core-modules@next -P - - npm install nativescript-dev-webpack@next -D + - npm install nativescript-dev-webpack@next -D --save-exact - npm install nativescript-dev-typescript@next -D - ./node_modules/.bin/update-ns-webpack --deps --configs - npx rimraf -- hooks node_modules platforms package-lock.json @@ -179,7 +179,7 @@ install: - cd ../demo-angular - npm install tns-core-modules@next -P - npm install nativescript-angular@next -P - - npm install nativescript-dev-webpack@next -D + - npm install nativescript-dev-webpack@next -D --save-exact - npm install nativescript-dev-typescript@next -D - ./node_modules/.bin/update-ns-webpack --deps --configs - ./node_modules/.bin/update-app-ng-deps @@ -187,7 +187,7 @@ install: - npm install -D wd@latest - cd ../demo-vue - npm install tns-core-modules@next -P - - npm install nativescript-dev-webpack@next -D + - npm install nativescript-dev-webpack@next -D --save-exact - npm install nativescript-dev-typescript@next -D - ./node_modules/.bin/update-ns-webpack --deps --configs - npx rimraf -- hooks node_modules platforms package-lock.json From 8269e46038326d3c31d9991fe3d86d39153bccfb Mon Sep 17 00:00:00 2001 From: Elena Hristova Date: Mon, 10 Jun 2019 11:46:51 +0300 Subject: [PATCH 23/30] chore: update platform-declarations to next --- .travis.yml | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3be0c45..9e3a36d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -167,28 +167,32 @@ install: - tns usage-reporting disable - tns error-reporting disable - cd src - - npm install tns-core-modules@next -D - - npm install nativescript-angular@next -D + - npm install tns-core-modules@next -D --save-exact + - npm install tns-platform-declarations@next -D --save-exact + - npm install nativescript-angular@next -D --save-exact - cd ../demo - - npm install tns-core-modules@next -P + - npm install tns-core-modules@next -P --save-exact + - npm install tns-platform-declarations@next -D --save-exact - npm install nativescript-dev-webpack@next -D --save-exact - - npm install nativescript-dev-typescript@next -D + - npm install nativescript-dev-typescript@next -D --save-exact - ./node_modules/.bin/update-ns-webpack --deps --configs - npx rimraf -- hooks node_modules platforms package-lock.json - npm install -D wd@latest - cd ../demo-angular - - npm install tns-core-modules@next -P - - npm install nativescript-angular@next -P + - npm install tns-core-modules@next -P --save-exact + - npm install tns-platform-declarations@next -D --save-exact + - npm install nativescript-angular@next -P --save-exact - npm install nativescript-dev-webpack@next -D --save-exact - - npm install nativescript-dev-typescript@next -D + - npm install nativescript-dev-typescript@next -D --save-exact - ./node_modules/.bin/update-ns-webpack --deps --configs - ./node_modules/.bin/update-app-ng-deps - npx rimraf -- hooks node_modules platforms package-lock.json - npm install -D wd@latest - cd ../demo-vue - - npm install tns-core-modules@next -P + - npm install tns-core-modules@next -P --save-exact + - npm install tns-platform-declarations@next -D --save-exact - npm install nativescript-dev-webpack@next -D --save-exact - - npm install nativescript-dev-typescript@next -D + - npm install nativescript-dev-typescript@next -D --save-exact - ./node_modules/.bin/update-ns-webpack --deps --configs - npx rimraf -- hooks node_modules platforms package-lock.json - npm install -D wd@latest \ No newline at end of file From 38c7781d71f25990759d40801e6e5f8c38bcda6e Mon Sep 17 00:00:00 2001 From: Elena Hristova Date: Mon, 10 Jun 2019 16:02:15 +0300 Subject: [PATCH 24/30] chore: do not update dependencies in src --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9e3a36d..b80ca07 100644 --- a/.travis.yml +++ b/.travis.yml @@ -166,11 +166,7 @@ install: - echo no | npm install -g nativescript@next - tns usage-reporting disable - tns error-reporting disable - - cd src - - npm install tns-core-modules@next -D --save-exact - - npm install tns-platform-declarations@next -D --save-exact - - npm install nativescript-angular@next -D --save-exact - - cd ../demo + - cd demo - npm install tns-core-modules@next -P --save-exact - npm install tns-platform-declarations@next -D --save-exact - npm install nativescript-dev-webpack@next -D --save-exact From 2838ae39e7e8bc117573ff8e950fba904ea7927d Mon Sep 17 00:00:00 2001 From: dtodorov Date: Thu, 20 Jun 2019 11:10:32 +0300 Subject: [PATCH 25/30] Chore: update nativescript-vue@next in demo-vue --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9023c7d..60a826e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -186,9 +186,10 @@ install: - npm install -D wd@latest - cd ../demo-vue - npm install tns-core-modules@next -P --save-exact + - npm install nativescript-vue@next -P --save-exact - npm install tns-platform-declarations@next -D --save-exact - npm install nativescript-dev-webpack@next -D --save-exact - npm install nativescript-dev-typescript@next -D --save-exact - ./node_modules/.bin/update-ns-webpack --deps --configs - npx rimraf -- hooks node_modules platforms package-lock.json - - npm install -D wd@latest \ No newline at end of file + - npm install -D wd@latest From e92396d198a3aadf0384d1c3363eea3e30d9b45e Mon Sep 17 00:00:00 2001 From: Zdravko Branzov Date: Thu, 11 Jul 2019 16:09:44 +0300 Subject: [PATCH 26/30] fix: packages names --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c8f2ac1..4c38b04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,9 +10,9 @@ env: - ANDROID_PACKAGE_FOLDER_VUE=$TRAVIS_BUILD_DIR/demo-vue/outputs - ANDROID_PACKAGE_FOLDER_NG=$TRAVIS_BUILD_DIR/demo-angular/outputs - SAUCE_STORAGE="https://saucelabs.com/rest/v1/storage/$SAUCE_USER" - - IOS_PACKAGE_JS='facebook-demo-js.zip' - - IOS_PACKAGE_VUE='facebook-demo-vue.zip' - - IOS_PACKAGE_NG='facebook-demo-ng.zip' + - IOS_PACKAGE_JS='facebook-demo-js-next.zip' + - IOS_PACKAGE_VUE='facebook-demo-vue-next.zip' + - IOS_PACKAGE_NG='facebook-demo-ng-next.zip' - IOS_PACKAGE_FOLDER_JS=$TRAVIS_BUILD_DIR/demo/outputs - IOS_PACKAGE_FOLDER_VUE=$TRAVIS_BUILD_DIR/demo-vue/outputs - IOS_PACKAGE_FOLDER_NG=$TRAVIS_BUILD_DIR/demo-angular/outputs From be27bfdad94e5fc181c546f80fe1bd17e549e250 Mon Sep 17 00:00:00 2001 From: Zdravko Branzov Date: Thu, 11 Jul 2019 16:30:20 +0300 Subject: [PATCH 27/30] fix: angular tests paths --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4c38b04..87b7f4e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -164,7 +164,7 @@ matrix: node_js: "10" script: - npm i -g appium - - cd tests && npm i + - cd ../tests && npm i - travis_wait travis_retry npm run e2e -- --runType android24 --sauceLab --appPath $ANDROID_PACKAGE_NG - os: linux env: @@ -174,7 +174,7 @@ matrix: node_js: "10" script: - npm i -g appium - - cd tests && npm i + - cd ../tests && npm i - travis_wait travis_retry npm run e2e -- --runType sim12iPhoneX --sauceLab --appPath $IOS_PACKAGE_NG android: From 0e1657d0ad1248ab65712728dfb016f05c94f417 Mon Sep 17 00:00:00 2001 From: Elena Hristova Date: Tue, 16 Jul 2019 10:59:48 +0300 Subject: [PATCH 28/30] chore: migrate app --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 87b7f4e..a1a52d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -194,6 +194,7 @@ install: - tns usage-reporting disable - tns error-reporting disable - cd demo + - tns migrate - npm install tns-core-modules@next -P --save-exact - npm install tns-platform-declarations@next -D --save-exact - npm install nativescript-dev-webpack@next -D --save-exact @@ -202,6 +203,7 @@ install: - npx rimraf -- hooks node_modules platforms package-lock.json - npm install -D wd@latest - cd ../demo-angular + - tns migrate - npm install tns-core-modules@next -P --save-exact - npm install tns-platform-declarations@next -D --save-exact - npm install nativescript-angular@next -P --save-exact @@ -212,6 +214,7 @@ install: - npx rimraf -- hooks node_modules platforms package-lock.json - npm install -D wd@latest - cd ../demo-vue + - tns migrate - npm install tns-core-modules@next -P --save-exact - npm install nativescript-vue@next -P --save-exact - npm install tns-platform-declarations@next -D --save-exact From 506a488e121b7edd8e55145baccedbcc553c1154 Mon Sep 17 00:00:00 2001 From: Elena Hristova Date: Tue, 16 Jul 2019 11:07:16 +0300 Subject: [PATCH 29/30] chore: remove dev-typescript --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a1a52d2..f6b7e8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -198,7 +198,6 @@ install: - npm install tns-core-modules@next -P --save-exact - npm install tns-platform-declarations@next -D --save-exact - npm install nativescript-dev-webpack@next -D --save-exact - - npm install nativescript-dev-typescript@next -D --save-exact - ./node_modules/.bin/update-ns-webpack --deps --configs - npx rimraf -- hooks node_modules platforms package-lock.json - npm install -D wd@latest @@ -208,7 +207,6 @@ install: - npm install tns-platform-declarations@next -D --save-exact - npm install nativescript-angular@next -P --save-exact - npm install nativescript-dev-webpack@next -D --save-exact - - npm install nativescript-dev-typescript@next -D --save-exact - ./node_modules/.bin/update-ns-webpack --deps --configs - ./node_modules/.bin/update-app-ng-deps - npx rimraf -- hooks node_modules platforms package-lock.json @@ -219,7 +217,6 @@ install: - npm install nativescript-vue@next -P --save-exact - npm install tns-platform-declarations@next -D --save-exact - npm install nativescript-dev-webpack@next -D --save-exact - - npm install nativescript-dev-typescript@next -D --save-exact - ./node_modules/.bin/update-ns-webpack --deps --configs - npx rimraf -- hooks node_modules platforms package-lock.json - npm install -D wd@latest From 19f17b717eedc7a3c3831d7a0b2831ef2feb338f Mon Sep 17 00:00:00 2001 From: Elena Hristova Date: Fri, 19 Jul 2019 10:10:49 +0300 Subject: [PATCH 30/30] chore: remove tns migrate --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f6b7e8e..55b13ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -194,7 +194,6 @@ install: - tns usage-reporting disable - tns error-reporting disable - cd demo - - tns migrate - npm install tns-core-modules@next -P --save-exact - npm install tns-platform-declarations@next -D --save-exact - npm install nativescript-dev-webpack@next -D --save-exact @@ -202,7 +201,6 @@ install: - npx rimraf -- hooks node_modules platforms package-lock.json - npm install -D wd@latest - cd ../demo-angular - - tns migrate - npm install tns-core-modules@next -P --save-exact - npm install tns-platform-declarations@next -D --save-exact - npm install nativescript-angular@next -P --save-exact @@ -212,7 +210,6 @@ install: - npx rimraf -- hooks node_modules platforms package-lock.json - npm install -D wd@latest - cd ../demo-vue - - tns migrate - npm install tns-core-modules@next -P --save-exact - npm install nativescript-vue@next -P --save-exact - npm install tns-platform-declarations@next -D --save-exact