Skip to content

chore: update to node 10, set trusty distribution #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 3, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 22 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,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
Expand All @@ -39,7 +39,7 @@ matrix:
- Type="VanillaJS"
osx_image: xcode10.0
language: node_js
node_js: "8"
node_js: "10"
jdk: oraclejdk8
before_script: pod repo update
script:
Expand All @@ -53,7 +53,7 @@ matrix:
- Type="VueJS"
osx_image: xcode10.0
language: node_js
node_js: "8"
node_js: "10"
jdk: oraclejdk8
before_script: pod repo update
script:
Expand All @@ -67,7 +67,7 @@ matrix:
- Type="Angular"
osx_image: xcode10.0
language: node_js
node_js: "8"
node_js: "10"
jdk: oraclejdk8
before_script: pod repo update
script:
Expand All @@ -78,56 +78,63 @@ matrix:
- "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $IOS_SAUCE_STORAGE/$IOS_PACKAGE_NG?overwrite=true --data-binary @$IOS_PACKAGE_FOLDER_NG/$IOS_PACKAGE_NG"
- 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 --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_NG?overwrite=true --data-binary @$ANDROID_PACKAGE_FOLDER_NG/app-debug.apk"
- 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 src && npm run build
- cd ../demo && tns build android
- 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 src && npm run build
- cd ../demo-angular && tns build android
Expand All @@ -138,7 +145,7 @@ matrix:
- Type="VanillaJS"
osx_image: xcode10.0
language: node_js
node_js: "8"
node_js: "10"
jdk: oraclejdk8
before_script: pod repo update
script:
Expand All @@ -151,7 +158,7 @@ matrix:
- Type="Angular"
osx_image: xcode10.0
language: node_js
node_js: "8"
node_js: "10"
jdk: oraclejdk8
before_script: pod repo update
script:
Expand All @@ -163,7 +170,7 @@ matrix:
- Type="Angular"
language: node_js
os: linux
node_js: "8"
node_js: "10"
script:
- npm i -g appium
- cd demo-angular && npm i
Expand All @@ -173,7 +180,7 @@ matrix:
- iOS="12.0"
- Type="Angular"
language: node_js
node_js: "8"
node_js: "10"
script:
- npm i -g appium
- cd demo-angular && npm i
Expand Down
3 changes: 2 additions & 1 deletion demo-angular/e2e/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"sourceMap": true,
"types": [
"mocha",
"chai"
"chai",
"node"
],
"lib": [
"es2015",
Expand Down
106 changes: 53 additions & 53 deletions demo-angular/package.json
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
{
"nativescript": {
"id": "org.nativescript.datetimepicker.demong",
"tns-android": {
"version": "5.3.0"
},
"tns-ios": {
"version": "5.3.0"
}
"nativescript": {
"id": "org.nativescript.datetimepicker.demong",
"tns-android": {
"version": "5.4.0"
},
"description": "NativeScript DateTimePicker Demo NG",
"license": "SEE LICENSE IN LICENSE FILE",
"repository": "https://github.com/NativeScript/nativescript-datetimepicker",
"scripts": {
"ci.tslint": "npm i && tslint --config '../tslint.json' 'src/**/*.ts'",
"build.plugin": "cd ../src && npm run build",
"e2e": "node ./node_modules/nativescript-dev-appium/check-dev-deps.js && tsc -p e2e && mocha --opts ./e2e/config/mocha.opts ",
"e2e-watch": "tsc -p e2e --watch"
},
"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",
"nativescript-datetimepicker": "file:../src",
"nativescript-theme-core": "~1.0.4",
"reflect-metadata": "~0.1.10",
"rxjs": "~6.4.0",
"tns-core-modules": "^5.0.0",
"zone.js": "~0.8.18"
},
"devDependencies": {
"@nativescript/schematics": "~0.5.0",
"nativescript-dev-typescript": "~0.9.0",
"nativescript-dev-webpack": "~0.21.0",
"@angular/compiler-cli": "~7.2.0",
"@ngtools/webpack": "~7.2.0",
"@types/chai": "~4.1.7",
"@types/mocha": "~5.2.5",
"@types/node": "~10.12.18",
"mocha": "~5.2.0",
"mocha-junit-reporter": "~1.18.0",
"mocha-multi": "~1.0.1",
"mochawesome": "~3.1.1",
"nativescript-dev-appium": "~5.0.0",
"tslint": "~5.11.0"
},
"readme": "NativeScript DateTimePicker Demo NG"
}
"tns-ios": {
"version": "5.4.0"
}
},
"description": "NativeScript DateTimePicker Demo NG",
"license": "SEE LICENSE IN LICENSE FILE",
"repository": "https://github.com/NativeScript/nativescript-datetimepicker",
"scripts": {
"ci.tslint": "npm i && tslint --config '../tslint.json' 'src/**/*.ts'",
"build.plugin": "cd ../src && npm run build",
"e2e": "node ./node_modules/nativescript-dev-appium/check-dev-deps.js && tsc -p e2e && mocha --opts ./e2e/config/mocha.opts ",
"e2e-watch": "tsc -p e2e --watch"
},
"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/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-datetimepicker": "file:../src",
"nativescript-theme-core": "~1.0.4",
"reflect-metadata": "~0.1.10",
"rxjs": "^6.3.3",
"tns-core-modules": "^5.0.0",
"typescript": "~3.4.5",
"zone.js": "^0.8.4"
},
"devDependencies": {
"@angular/compiler-cli": "~8.0.0",
"@ngtools/webpack": "~8.0.0",
"@types/chai": "~4.1.7",
"@types/mocha": "~5.2.5",
"@types/node": "~10.12.18",
"mocha": "~5.2.0",
"mocha-junit-reporter": "~1.18.0",
"mocha-multi": "~1.0.1",
"mochawesome": "~3.1.1",
"nativescript-dev-appium": "~5.2.0",
"nativescript-dev-typescript": "~0.10.0",
"nativescript-dev-webpack": "~0.24.0",
"tslint": "~5.11.0"
},
"readme": "NativeScript DateTimePicker Demo NG"
}
2 changes: 1 addition & 1 deletion demo-angular/src/app/home/home.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export class HomeComponent implements OnInit {
public customVisibility: string;
private _expandedId: string;

@ViewChild("scrollView") scrollView: ElementRef;
@ViewChild("scrollView", { static: false }) scrollView: ElementRef;

constructor() {
// Use the component constructor to inject providers.
Expand Down
12 changes: 6 additions & 6 deletions demo-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"nativescript": {
"id": "org.nativescript.datetimepicker.demovue",
"tns-android": {
"version": "5.3.0"
"version": "5.4.0"
},
"tns-ios": {
"version": "5.3.0"
"version": "5.4.0"
}
},
"description": "NativeScript DateTimePicker Demo Vue",
Expand All @@ -14,16 +14,16 @@
"dependencies": {
"nativescript-datetimepicker": "file:../src",
"nativescript-theme-core": "~1.0.4",
"nativescript-vue": "~2.0.0",
"nativescript-vue": "~2.2.0",
"tns-core-modules": "^5.0.0"
},
"devDependencies": {
"@babel/core": "~7.2.0",
"@babel/preset-env": "~7.2.0",
"babel-loader": "~8.0.0",
"nativescript-dev-typescript": "~0.9.0",
"nativescript-dev-webpack": "~0.21.0",
"nativescript-vue-template-compiler": "~2.0.2",
"nativescript-dev-typescript": "~0.10.0",
"nativescript-dev-webpack": "~0.24.0",
"nativescript-vue-template-compiler": "~2.2.0",
"node-sass": "~4.9.0",
"vue-loader": "~15.4.0"
},
Expand Down
8 changes: 4 additions & 4 deletions demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"nativescript": {
"id": "org.nativescript.datetimepicker.demo",
"tns-android": {
"version": "5.3.0"
"version": "5.4.0"
},
"tns-ios": {
"version": "5.3.0"
"version": "5.4.0"
}
},
"description": "NativeScript DateTimePicker Demo Core",
Expand All @@ -21,8 +21,8 @@
"tns-core-modules": "^5.0.0"
},
"devDependencies": {
"nativescript-dev-typescript": "~0.9.0",
"nativescript-dev-webpack": "~0.21.0",
"nativescript-dev-typescript": "~0.10.0",
"nativescript-dev-webpack": "~0.24.0",
"tslint": "~5.11.0"
},
"readme": "NativeScript DateTimePicker Demo Core"
Expand Down
Loading