From 30b18c799f9b518e9505e0879dcee6a747767d50 Mon Sep 17 00:00:00 2001 From: Zdravko Branzov Date: Wed, 6 Jun 2018 09:28:46 +0300 Subject: [PATCH 01/19] fix: travis build --- .gitattributes | 1 + .travis.yml | 67 +++++++++++++++++++++++++++++++++----------------- 2 files changed, 46 insertions(+), 22 deletions(-) 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 diff --git a/.travis.yml b/.travis.yml index 60e6037..efb9429 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,47 +1,59 @@ branches: only: - - master + - next 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, Build and Test" + script: cd ../demo && npm run build.plugin && npm run ci.tslint + - stage: "Build and webpack" os: osx env: - - WebPack="iOS" - osx_image: xcode9.2 + - Webpack="iOS" + osx_image: xcode9.3 language: node_js - node_js: "6" + node_js: "8" jdk: oraclejdk8 - 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 - - language: android - os: linux + 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" + - Webpack="Android" jdk: oraclejdk8 - before_install: nvm install 6.10.3 - script: cd demo && npm run build.plugin && npm i && tns build android --bundle --env.uglify --env.snapshot && cd ../demo-angular && tns build android --bundle --env.uglify --env.snapshot --env.aot - - language: android + 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 build.plugin && npm i && tns build android --bundle --env.uglify --env.snapshot && cd ../demo-angular && tns build android --bundle --env.uglify --env.snapshot --env.aot + - os: linux env: - BuildAndroid="26" - os: linux + language: android jdk: oraclejdk8 - before_install: nvm install stable + 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 src && npm i && npm run tsc && cd ../demo && tns build android && cd ../demo-angular && tns build android + - cd ../src && npm i && npm run tsc && cd ../demo && tns build android && cd ../demo-angular && tns build android - os: osx env: - BuildiOS="11" - - Xcode="9.2" - osx_image: xcode9.2 + - Xcode="9.3" + osx_image: xcode9.3 language: node_js - node_js: "6" + node_js: "8" jdk: oraclejdk8 + before_script: + - cd ../demo && tns platform add ios@next + - 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 ../src && npm i && npm run tsc && cd ../demo && tns build ios && cd ../demo-angular && tns build ios android: components: @@ -54,6 +66,17 @@ android: - extra-android-m2repository install: - - echo no | npm install -g nativescript + - echo no | 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 + - 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 90b25f80ecd95e56f7845140592afa27d9f77ad1 Mon Sep 17 00:00:00 2001 From: Zdravko Branzov Date: Mon, 30 Jul 2018 13:48:39 +0300 Subject: [PATCH 02/19] fix: webpack angular build --- .travis.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index efb9429..0ba0e6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ matrix: - stage: "Lint" language: node_js os: linux - node_js: "6" + node_js: "8" script: cd ../demo && npm run build.plugin && npm run ci.tslint - stage: "Build and webpack" os: osx @@ -19,7 +19,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: @@ -29,7 +32,10 @@ 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 && 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 - os: linux env: - BuildAndroid="26" @@ -72,11 +78,14 @@ install: - cd src - npm uninstall tns-core-modules -D && npm install tns-core-modules@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 + - ./node_modules/.bin/update-ns-webpack --deps + - npm uninstall tns-core-modules -P && npm install tns-core-modules@next -P - npm uninstall nativescript-dev-typescript -D && npm install nativescript-dev-typescript@next -D - cd ../demo-angular + - npm uninstall nativescript-dev-webpack -D && npm install nativescript-dev-webpack@next -D + - ./node_modules/.bin/update-ns-webpack --deps + - ./node_modules/.bin/update-app-ng-deps - 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 f4c6a9320aa75f2e758efde4f6b28dfe537624d6 Mon Sep 17 00:00:00 2001 From: Dimitar Todorov Date: Wed, 22 Aug 2018 13:56:00 +0300 Subject: [PATCH 03/19] chore: update node and xcode versions --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0ba0e6a..63e0975 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ matrix: os: osx env: - Webpack="iOS" - osx_image: xcode9.3 + osx_image: xcode9.2 language: node_js node_js: "8" jdk: oraclejdk8 @@ -28,7 +28,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 @@ -41,7 +41,7 @@ matrix: - BuildAndroid="26" language: 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 @@ -50,8 +50,8 @@ matrix: - os: osx env: - BuildiOS="11" - - Xcode="9.3" - osx_image: xcode9.3 + - Xcode="9.2" + osx_image: xcode9.2 language: node_js node_js: "8" jdk: oraclejdk8 From b9196123e0af8763792f82b068b80ddc4a045e80 Mon Sep 17 00:00:00 2001 From: Dimitar Todorov Date: Wed, 22 Aug 2018 18:07:49 +0300 Subject: [PATCH 04/19] fix: udpate prepare.js ad regexp for tns version --- src/scripts/prepare.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/scripts/prepare.js b/src/scripts/prepare.js index 8b32660..0fe5655 100644 --- a/src/scripts/prepare.js +++ b/src/scripts/prepare.js @@ -8,8 +8,11 @@ exec('tns --version', (err, stdout, stderr) => { return; } - const tnsVersion = semver.major(stdout); - + const regex = /^(?:\d+\.){2}\d+.*?$/m; + const matches = stdout.match(regex); + console.log("Extracted tns version: " + matches[0]); + const tnsVersion = semver.major(semver.coerce(matches[0])); + // execute 'tns plugin build' for {N} version > 4. This command builds .aar in platforms/android folder. if (tnsVersion >= 4) { console.log(`executing 'tns plugin build'`); From 42d158a31c4822b491fb0f961a0ed2b158e8a075 Mon Sep 17 00:00:00 2001 From: Dimitar Todorov Date: Fri, 5 Oct 2018 09:53:42 +0300 Subject: [PATCH 05/19] chore: update build tools for android to 28.0.2 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 63e0975..3a2ee49 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,7 +66,7 @@ android: - tools - tools - platform-tools - - build-tools-27.0.3 + - build-tools-28.0.2 - android-26 - android-23 - extra-android-m2repository @@ -88,4 +88,4 @@ install: - ./node_modules/.bin/update-app-ng-deps - 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-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 From 9dc3e58b56599d7b276c58fe334282a75e95d51b Mon Sep 17 00:00:00 2001 From: Dimitar Todorov Date: Thu, 11 Oct 2018 09:59:09 +0300 Subject: [PATCH 06/19] chore: add android SDK 28 --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3a2ee49..9806bbf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,8 +67,7 @@ android: - tools - platform-tools - build-tools-28.0.2 - - android-26 - - android-23 + - android-28 - extra-android-m2repository install: From 4c14a669949e72e64ecb1fa07cf5ecd0f76b077e Mon Sep 17 00:00:00 2001 From: Dimitar Todorov Date: Fri, 12 Oct 2018 14:14:06 +0300 Subject: [PATCH 07/19] chore: bump xcode to 10, add pip install scripts --- .travis.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9806bbf..545d135 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ matrix: os: osx env: - Webpack="iOS" - osx_image: xcode9.2 + osx_image: xcode10.0 language: node_js node_js: "8" jdk: oraclejdk8 @@ -49,9 +49,9 @@ matrix: - cd ../src && npm i && npm run tsc && cd ../demo && tns build android && cd ../demo-angular && tns build android - os: osx env: - - BuildiOS="11" - - Xcode="9.2" - osx_image: xcode9.2 + - BuildiOS="12.0" + - Xcode="10.0" + osx_image: xcode10.0 language: node_js node_js: "8" jdk: oraclejdk8 @@ -70,6 +70,10 @@ android: - android-28 - extra-android-m2repository +before_install: + - sudo pip install --upgrade pip + - sudo pip install six + install: - echo no | npm install -g nativescript@next - tns usage-reporting disable From 8cd9b78588a8cc57e5ccf2b9caf388958f36543f Mon Sep 17 00:00:00 2001 From: Zdravko Branzov Date: Mon, 12 Nov 2018 17:51:10 +0200 Subject: [PATCH 08/19] fix: angular next build --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 545d135..5bca521 100644 --- a/.travis.yml +++ b/.travis.yml @@ -92,3 +92,4 @@ install: - 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-typescript -D && npm install nativescript-dev-typescript@next -D + - npm install typescript@3.1.6 -D From 87c9a801b95d613e031d6007ea04caf039a5e3c3 Mon Sep 17 00:00:00 2001 From: Zdravko Branzov Date: Wed, 21 Nov 2018 15:32:46 +0200 Subject: [PATCH 09/19] fix: build tools --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5bca521..f926917 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,7 +66,7 @@ android: - tools - tools - platform-tools - - build-tools-28.0.2 + - build-tools-28.0.3 - android-28 - extra-android-m2repository From 6ae998442f95e48b79d08b2253d5d19b8d495e59 Mon Sep 17 00:00:00 2001 From: Elena Hristova Date: Thu, 20 Dec 2018 13:47:49 +0200 Subject: [PATCH 10/19] chore: unify install step in travis files --- .travis.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index f926917..c176580 100644 --- a/.travis.yml +++ b/.travis.yml @@ -79,17 +79,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 install tns-core-modules@next -D - cd ../demo - - npm uninstall nativescript-dev-webpack -D && npm install nativescript-dev-webpack@next -D - - ./node_modules/.bin/update-ns-webpack --deps - - npm uninstall tns-core-modules -P && npm install tns-core-modules@next -P - - 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 --configs - cd ../demo-angular - - npm uninstall nativescript-dev-webpack -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-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 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-typescript -D && npm install nativescript-dev-typescript@next -D - - npm install typescript@3.1.6 -D From fe75fd73b09d52a1151eb65fa55f02db78c0f199 Mon Sep 17 00:00:00 2001 From: Elena Hristova Date: Thu, 6 Jun 2019 16:19:56 +0300 Subject: [PATCH 11/19] chore: merge master in next --- .gitattributes | 1 - .travis.yml | 61 ++++++++++++++++++++++++++++---------------------- 2 files changed, 34 insertions(+), 28 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 c176580..c22a714 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,67 +3,73 @@ branches: - next matrix: include: - - stage: "Lint" - language: node_js - os: linux - node_js: "8" - script: cd ../demo && npm run build.plugin && npm run ci.tslint - - stage: "Build and webpack" + - stage: "WebPack, Build and Test" os: osx env: - - Webpack="iOS" + - WebPack="iOS" osx_image: xcode10.0 language: node_js - node_js: "8" + node_js: "10" 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 ../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 + 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 + - sed -i -e 's/\"..\/src\"/"package.tgz"/g' package.json + - npm i + - tns build ios --bundle --env.uglify --env.aot + - language: android + os: linux + dist: trusty env: - - Webpack="Android" + - WebPack="Android" jdk: oraclejdk8 - before_install: nvm install 8.11.4 + before_install: nvm install 10 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 - - 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 - - os: linux + - 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 + - sed -i -e 's/\"..\/src\"/"package.tgz"/g' package.json + - npm i + - tns build android --bundle --env.uglify --env.aot + - language: android + os: linux + dist: trusty env: - - BuildAndroid="26" - language: android + - BuildAndroid="28" jdk: oraclejdk8 - before_install: nvm install 8.11.4 + before_install: nvm install 10 before_script: - cd ../demo && tns platform add android@next - 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 + - cd ../src && npm i && npm run tsc && cd ../demo && npm i && tns build android && cd ../demo-angular && npm i && tns build android - os: osx env: - BuildiOS="12.0" - Xcode="10.0" osx_image: xcode10.0 language: node_js - node_js: "8" + node_js: "10" jdk: oraclejdk8 before_script: - cd ../demo && tns platform add ios@next - 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 ../src && npm i && npm run tsc && cd ../demo && npm i && tns build ios && cd ../demo-angular && npm i && tns build ios android: components: - - tools - tools - platform-tools - build-tools-28.0.3 @@ -92,3 +98,4 @@ install: - npm install nativescript-dev-typescript@next -D - ./node_modules/.bin/update-ns-webpack --deps --configs - ./node_modules/.bin/update-app-ng-deps + \ No newline at end of file From c986e055cea058eec3414512bd740a3ddf3440f1 Mon Sep 17 00:00:00 2001 From: Elena Hristova Date: Mon, 10 Jun 2019 09:23:17 +0300 Subject: [PATCH 12/19] chore: fix installing the correct next version of webpack --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c22a714..b91fafd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,13 +88,13 @@ install: - npm install tns-core-modules@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 - 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 From 2181c12c84c46842460ec24dc71d7ea2eec96d78 Mon Sep 17 00:00:00 2001 From: Elena Hristova Date: Mon, 10 Jun 2019 11:18:31 +0300 Subject: [PATCH 13/19] chore: update platform declarations --- .travis.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index b91fafd..4d98733 100644 --- a/.travis.yml +++ b/.travis.yml @@ -85,17 +85,20 @@ install: - tns usage-reporting disable - tns error-reporting disable - cd src - - npm install tns-core-modules@next -D + - npm install tns-core-modules@next -D --save-exact + - npm install tns-platform-declarations@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 - 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 \ No newline at end of file From eaaf7a634e11f2d30840a144835e3b2f2136088a Mon Sep 17 00:00:00 2001 From: Elena Hristova Date: Mon, 10 Jun 2019 13:51:03 +0300 Subject: [PATCH 14/19] chore: do not update src --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4d98733..eac5466 100644 --- a/.travis.yml +++ b/.travis.yml @@ -84,15 +84,13 @@ 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 - - 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 - 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 - cd ../demo-angular - npm install tns-core-modules@next -P --save-exact - npm install tns-platform-declarations@next -D --save-exact @@ -101,4 +99,5 @@ install: - 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 \ No newline at end of file From a1ee889b8c92adbb3dc359f3a7b9b1bc615945e5 Mon Sep 17 00:00:00 2001 From: Dimitar Todorov Date: Thu, 20 Jun 2019 11:30:44 +0300 Subject: [PATCH 15/19] Refactor tragvis build stages. Add demo-vue build --- .travis.yml | 100 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 67 insertions(+), 33 deletions(-) diff --git a/.travis.yml b/.travis.yml index ccee57d..5f421a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,66 +7,91 @@ matrix: os: osx env: - WebPack="iOS" + - Type="TypeScript" osx_image: xcode10.2 language: node_js node_js: "10" 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 ../publish - - sh pack.sh - - cp package/*.tgz ../demo-angular/package.tgz + - cd ../demo && npm run build.plugin + - tns build ios --bundle --env.uglify + - os: osx + env: + - WebPack="iOS" + - Type="Angular" + osx_image: xcode10.2 + language: node_js + node_js: "10" + jdk: oraclejdk8 + before_script: + - cd ../demo-angular && tns platform add ios@next + script: + - cd src && npm run build + - cd ../publish && sh pack.sh - cd ../demo-angular - - sed -i -e 's/\"..\/src\"/"package.tgz"/g' package.json - - npm i + - tns plugin add ../publish/package/*.tgz - tns build ios --bundle --env.uglify --env.aot + - os: osx + env: + - WebPack="iOS" + - Type="Vue" + osx_image: xcode10.2 + language: node_js + node_js: "10" + jdk: oraclejdk8 + before_script: + - cd ../demo-vue && tns platform add ios@next + script: + - cd src && npm run build + - cd ../publish && sh pack.sh + - cd ../demo-vue + - tns plugin add ../publish/package/*.tgz + - tns build ios --bundle --env.uglify - language: android os: linux dist: trusty env: - WebPack="Android" + - Type="TypeScript" jdk: oraclejdk8 before_install: nvm install 10 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 ../publish - - sh pack.sh - - cp package/*.tgz ../demo-angular/package.tgz - - cd ../demo-angular - - sed -i -e 's/\"..\/src\"/"package.tgz"/g' package.json - - npm i - - tns build android --bundle --env.uglify --env.aot - - language: android - os: linux + - cd ../demo && npm run build.plugin + - tns build android --bundle --env.uglify --env.snapshot + - os: linux dist: trusty - env: - - BuildAndroid="28" + env: + - WebPack="Android" + - Type="Angular" jdk: oraclejdk8 before_install: nvm install 10 before_script: - - cd ../demo && tns platform add android@next - cd ../demo-angular && tns platform add android@next script: - - cd ../src && npm i && npm run tsc && cd ../demo && npm i && tns build android && cd ../demo-angular && npm i && tns build android - - os: osx - env: - - BuildiOS="12.0" - - Xcode="10.0" - osx_image: xcode10.2 - language: node_js - node_js: "10" + - cd src && npm run build + - cd ../publish && sh pack.sh + - cd ../demo-angular + - tns plugin add ../publish/package/*.tgz + - tns build android --bundle --env.uglify --env.aot + - os: linux + dist: trusty + env: + - WebPack="Android" + - Type="Vue" jdk: oraclejdk8 + before_install: nvm install 10 before_script: - - cd ../demo && tns platform add ios@next - - cd ../demo-angular && tns platform add ios@next - script: - - cd ../src && npm i && npm run tsc && cd ../demo && npm i && tns build ios && cd ../demo-angular && npm i && tns build ios + - cd ../demo-vue && tns platform add android@next + script: + - cd src && npm run build + - cd ../publish && sh pack.sh + - cd ../demo-vue + - tns plugin add ../publish/package/*.tgz + - tns build android --bundle --env.uglify --env.aot android: components: @@ -100,4 +125,13 @@ install: - ./node_modules/.bin/update-ns-webpack --deps --configs - ./node_modules/.bin/update-app-ng-deps - npx rimraf -- hooks node_modules platforms package-lock.json + - 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 From 5997e810795968cbe57f90839feecfd5e7b19f21 Mon Sep 17 00:00:00 2001 From: Dimitar Todorov Date: Thu, 20 Jun 2019 17:59:47 +0300 Subject: [PATCH 16/19] Fix: add missing language:android in build stage. --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5f421a4..7ccee2a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,7 +62,8 @@ matrix: script: - cd ../demo && npm run build.plugin - tns build android --bundle --env.uglify --env.snapshot - - os: linux + - language: android + os: linux dist: trusty env: - WebPack="Android" @@ -77,7 +78,8 @@ matrix: - cd ../demo-angular - tns plugin add ../publish/package/*.tgz - tns build android --bundle --env.uglify --env.aot - - os: linux + - language: android + os: linux dist: trusty env: - WebPack="Android" From 025de714738eaeaf38aeddc7a8c0c316f6d446b8 Mon Sep 17 00:00:00 2001 From: Elena Hristova Date: Mon, 24 Jun 2019 16:31:12 +0300 Subject: [PATCH 17/19] fix paths in travis --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7ccee2a..8016496 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ matrix: before_script: - cd ../demo-angular && tns platform add ios@next script: - - cd src && npm run build + - cd ../src && npm run build - cd ../publish && sh pack.sh - cd ../demo-angular - tns plugin add ../publish/package/*.tgz @@ -44,7 +44,7 @@ matrix: before_script: - cd ../demo-vue && tns platform add ios@next script: - - cd src && npm run build + - cd ../src && npm run build - cd ../publish && sh pack.sh - cd ../demo-vue - tns plugin add ../publish/package/*.tgz @@ -73,7 +73,7 @@ matrix: before_script: - cd ../demo-angular && tns platform add android@next script: - - cd src && npm run build + - cd ../src && npm run build - cd ../publish && sh pack.sh - cd ../demo-angular - tns plugin add ../publish/package/*.tgz @@ -89,7 +89,7 @@ matrix: before_script: - cd ../demo-vue && tns platform add android@next script: - - cd src && npm run build + - cd ../src && npm run build - cd ../publish && sh pack.sh - cd ../demo-vue - tns plugin add ../publish/package/*.tgz @@ -136,4 +136,4 @@ install: - ./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 363998bbbadccc76dfd7fa8d11d3c23fbf40c590 Mon Sep 17 00:00:00 2001 From: Elena Hristova Date: Tue, 16 Jul 2019 11:07:57 +0300 Subject: [PATCH 18/19] chore: remove dev-typescript --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8016496..269c5f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -112,27 +112,27 @@ 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 - - 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 - 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 - 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 - 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 - 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 ad3c22c3c371827ac1e9f0550d78c28a0df5f6a5 Mon Sep 17 00:00:00 2001 From: Elena Hristova Date: Fri, 19 Jul 2019 10:11:03 +0300 Subject: [PATCH 19/19] chore: remove tns migrate --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 269c5f4..86c47f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -112,14 +112,12 @@ 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 - ./node_modules/.bin/update-ns-webpack --deps --configs - npx rimraf -- hooks node_modules platforms package-lock.json - 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 @@ -128,7 +126,6 @@ install: - ./node_modules/.bin/update-app-ng-deps - npx rimraf -- hooks node_modules platforms package-lock.json - 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