From 126ecf9dfd4485448fafe13d7cd1ed4a6a62ae71 Mon Sep 17 00:00:00 2001 From: Elena Hristova Date: Fri, 31 May 2019 17:59:18 +0300 Subject: [PATCH 1/2] chore: update to node 10, set trusty distribution --- .travis.yml | 39 ++++++++++++++++++++++----------------- demo-angular/package.json | 33 ++++++++++++++++++--------------- 2 files changed, 40 insertions(+), 32 deletions(-) diff --git a/.travis.yml b/.travis.yml index c6e256e..6da6db9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ matrix: - stage: "Lint" language: node_js os: linux - node_js: "8" + node_js: "10" script: cd src && npm run ci.tslint && cd ../demo && npm run ci.tslint && cd ../demo-angular && npm run ci.tslint - stage: "Build and WebPack" os: osx @@ -28,7 +28,7 @@ matrix: - Type="VanillaJS" osx_image: xcode10.0 language: node_js - node_js: "8" + node_js: "10" jdk: oraclejdk8 script: - cd demo && npm run build.plugin @@ -41,7 +41,7 @@ matrix: - Type="Angular" osx_image: xcode10.0 language: node_js - node_js: "8" + node_js: "10" jdk: oraclejdk8 script: - cd src && npm run build && npm pack @@ -53,7 +53,7 @@ matrix: - Type="VueJS" osx_image: xcode10.0 language: node_js - node_js: "8" + node_js: "10" jdk: oraclejdk8 script: - cd src && npm run build @@ -62,54 +62,59 @@ matrix: - "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" - language: android os: linux + dist: trusty env: - WebpackAndroid="28" - Type="VanillaJS" jdk: oraclejdk8 - before_install: nvm install 8 + before_install: nvm install 10 script: - 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 + dist: trusty env: - WebpackAndroid="28" - Type="VueJS" jdk: oraclejdk8 - before_install: nvm install 8 + before_install: nvm install 10 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 + dist: trusty env: - WebpackAndroid="28" - Type="Angular" jdk: oraclejdk8 - before_install: nvm install 8 + before_install: nvm install 10 script: - 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 - language: android + os: linux + dist: trusty env: - BuildAndroid="28" - Type="VanillaJS" - os: linux jdk: oraclejdk8 - before_install: nvm install 8.11.4 + before_install: nvm install 10 script: - cd demo && npm run ci.android.build - language: android + os: linux + dist: trusty env: - BuildAndroid="28" - Type="Angular" - os: linux jdk: oraclejdk8 - before_install: nvm install 8.11.4 + before_install: nvm install 10 script: - cd demo-angular && npm run ci.android.build - os: osx @@ -119,7 +124,7 @@ matrix: - Type="VanillaJS" osx_image: xcode10.0 language: node_js - node_js: "8" + node_js: "10" jdk: oraclejdk8 script: - cd demo && npm run ci.ios.build @@ -130,7 +135,7 @@ matrix: - Type="Angular" osx_image: xcode10.0 language: node_js - node_js: "8" + node_js: "10" jdk: oraclejdk8 script: - cd demo-angular && npm run ci.ios.build @@ -140,7 +145,7 @@ matrix: - Type="VanillaJS" language: node_js os: linux - node_js: "8" + node_js: "10" script: - npm i -g appium - cd demo && npm i @@ -151,7 +156,7 @@ matrix: - Type="VueJS" language: node_js os: linux - node_js: "8" + node_js: "10" script: - npm i -g appium - cd demo-vue && npm i @@ -161,7 +166,7 @@ matrix: - iOS="12.0" - Type="VanillaJS" language: node_js - node_js: "8" + node_js: "10" script: - npm i -g appium - cd demo && npm i @@ -171,7 +176,7 @@ matrix: - iOS="12.0" - Type="VueJS" language: node_js - node_js: "8" + node_js: "10" script: - npm i -g appium - cd demo-vue && npm i diff --git a/demo-angular/package.json b/demo-angular/package.json index 14b56d1..8798239 100644 --- a/demo-angular/package.json +++ b/demo-angular/package.json @@ -6,10 +6,10 @@ "nativescript": { "id": "org.nativescript.demo.angular", "tns-android": { - "version": "5.4.0" + "version": "6.0.0-2019-05-29-132216-01" }, "tns-ios": { - "version": "5.4.0" + "version": "6.0.0-2019-05-28-180227-02" } }, "scripts": { @@ -19,26 +19,29 @@ "ci.ios.build": "cd ../src && npm run build && cd ../demo-angular && tns build ios" }, "dependencies": { - "@angular/animations": "~7.2.0", - "@angular/common": "~7.2.0", - "@angular/compiler": "~7.2.0", - "@angular/core": "~7.2.0", - "@angular/forms": "~7.2.0", - "@angular/http": "~7.2.0", - "@angular/platform-browser": "~7.2.0", - "@angular/platform-browser-dynamic": "~7.2.0", - "@angular/router": "~7.2.0", - "nativescript-angular": "~7.2.0", + "@angular/animations": "8.0.0", + "@angular/common": "8.0.0", + "@angular/compiler": "8.0.0", + "@angular/core": "8.0.0", + "@angular/forms": "8.0.0", + "@angular/http": "8.0.0-beta.10", + "@angular/platform-browser": "8.0.0", + "@angular/platform-browser-dynamic": "8.0.0", + "@angular/router": "8.0.0", + "nativescript-angular": "^8.0.0", "nativescript-camera": "../src", "nativescript-theme-core": "^1.0.4", "rxjs": "^6.3.3", - "tns-core-modules": "^5.0.0", + "tns-core-modules": "^5.4.1", + "typescript": "~3.4.5", "zone.js": "^0.8.4" }, "devDependencies": { + "@angular/compiler-cli": "~7.2.0", + "@ngtools/webpack": "~7.2.0", "nativescript-css-loader": "~0.26.0", - "nativescript-dev-typescript": "~0.9.0", - "nativescript-dev-webpack": "~0.22.0", + "nativescript-dev-typescript": "^0.10.0", + "nativescript-dev-webpack": "^0.22.0", "tns-platform-declarations": "^5.0.0", "tslint": "~5.11.0" } From f578c14813ddbd02cac7e1bc6b74e9a98e605505 Mon Sep 17 00:00:00 2001 From: Elena Hristova Date: Fri, 31 May 2019 22:19:49 +0300 Subject: [PATCH 2/2] chore: update angular dependencies --- demo-angular/package.json | 36 ++++++++++++++++++------------------ demo-vue/package.json | 4 ++-- demo/package.json | 4 ++-- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/demo-angular/package.json b/demo-angular/package.json index 8798239..e1e0270 100644 --- a/demo-angular/package.json +++ b/demo-angular/package.json @@ -6,10 +6,10 @@ "nativescript": { "id": "org.nativescript.demo.angular", "tns-android": { - "version": "6.0.0-2019-05-29-132216-01" + "version": "5.4.0" }, "tns-ios": { - "version": "6.0.0-2019-05-28-180227-02" + "version": "5.4.0" } }, "scripts": { @@ -19,29 +19,29 @@ "ci.ios.build": "cd ../src && npm run build && cd ../demo-angular && tns build ios" }, "dependencies": { - "@angular/animations": "8.0.0", - "@angular/common": "8.0.0", - "@angular/compiler": "8.0.0", - "@angular/core": "8.0.0", - "@angular/forms": "8.0.0", + "@angular/animations": "~8.0.0", + "@angular/common": "~8.0.0", + "@angular/compiler": "~8.0.0", + "@angular/core": "~8.0.0", + "@angular/forms": "~8.0.0", "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "8.0.0", - "@angular/platform-browser-dynamic": "8.0.0", - "@angular/router": "8.0.0", - "nativescript-angular": "^8.0.0", + "@angular/platform-browser": "~8.0.0", + "@angular/platform-browser-dynamic": "~8.0.0", + "@angular/router": "~8.0.0", + "nativescript-angular": "~8.0.0", "nativescript-camera": "../src", "nativescript-theme-core": "^1.0.4", "rxjs": "^6.3.3", - "tns-core-modules": "^5.4.1", - "typescript": "~3.4.5", - "zone.js": "^0.8.4" + "tns-core-modules": "^5.0.0", + "zone.js": "^0.8.4", + "typescript": "~3.4.5" }, "devDependencies": { - "@angular/compiler-cli": "~7.2.0", - "@ngtools/webpack": "~7.2.0", + "@angular/compiler-cli": "~8.0.0", + "@ngtools/webpack": "~8.0.0", "nativescript-css-loader": "~0.26.0", - "nativescript-dev-typescript": "^0.10.0", - "nativescript-dev-webpack": "^0.22.0", + "nativescript-dev-typescript": "~0.10.0", + "nativescript-dev-webpack": "~0.24.0", "tns-platform-declarations": "^5.0.0", "tslint": "~5.11.0" } diff --git a/demo-vue/package.json b/demo-vue/package.json index 3d98ca2..4cade8d 100644 --- a/demo-vue/package.json +++ b/demo-vue/package.json @@ -30,8 +30,8 @@ "mocha-multi": "^1.0.1", "mochawesome": "^3.1.1", "nativescript-dev-appium": "~5.2.0", - "nativescript-dev-typescript": "~0.9.0", - "nativescript-dev-webpack": "~0.22.0", + "nativescript-dev-typescript": "~0.10.0", + "nativescript-dev-webpack": "~0.24.0", "nativescript-vue-template-compiler": "~2.2.0", "node-sass": "~4.9.0", "tslint": "~5.12.1", diff --git a/demo/package.json b/demo/package.json index 6ca7bb6..bf9b803 100644 --- a/demo/package.json +++ b/demo/package.json @@ -35,8 +35,8 @@ "mochawesome": "^3.1.1", "nativescript-css-loader": "~0.26.1", "nativescript-dev-appium": "~5.2.0", - "nativescript-dev-typescript": "~0.9.0", - "nativescript-dev-webpack": "~0.22.0", + "nativescript-dev-typescript": "~0.10.0", + "nativescript-dev-webpack": "~0.24.0", "tns-platform-declarations": "^5.0.0", "tslint": "~5.11.0" }