Skip to content

Commit 05f05c9

Browse files
elena-pelena-p
authored
Merge branch 'master' into tgpetrov/ipad-issue
2 parents a505e2e + d2bc096 commit 05f05c9

File tree

7 files changed

+167
-159
lines changed

7 files changed

+167
-159
lines changed

‎.travis.yml‎

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ matrix:
2626
- stage: "lint"
2727
language: node_js
2828
os: linux
29-
node_js: "8"
29+
node_js: "10"
3030
script:
3131
- cd src && npm run ci.tslint
3232
- cd ../demo && npm run ci.tslint
@@ -39,7 +39,7 @@ matrix:
3939
- Type="VanillaJS"
4040
osx_image: xcode10.0
4141
language: node_js
42-
node_js: "8"
42+
node_js: "10"
4343
jdk: oraclejdk8
4444
before_script: pod repo update
4545
script:
@@ -53,7 +53,7 @@ matrix:
5353
- Type="VueJS"
5454
osx_image: xcode10.0
5555
language: node_js
56-
node_js: "8"
56+
node_js: "10"
5757
jdk: oraclejdk8
5858
before_script: pod repo update
5959
script:
@@ -67,7 +67,7 @@ matrix:
6767
- Type="Angular"
6868
osx_image: xcode10.0
6969
language: node_js
70-
node_js: "8"
70+
node_js: "10"
7171
jdk: oraclejdk8
7272
before_script: pod repo update
7373
script:
@@ -78,56 +78,63 @@ matrix:
7878
- "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"
7979
- language: android
8080
os: linux
81+
dist: trusty
8182
env:
8283
- WebpackAndroid="28"
8384
- Type="VanillaJS"
8485
jdk: oraclejdk8
85-
before_install: nvm install 8
86+
before_install: nvm install 10
8687
script:
8788
- cd src && npm run build
8889
- cd ../demo && npm i && tns build android --bundle --env.uglify --env.snapshot --copy-to "./outputs/app-debug.apk"
8990
- "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"
9091
- language: android
9192
os: linux
93+
dist: trusty
9294
env:
9395
- WebpackAndroid="28"
9496
- Type="VueJS"
9597
jdk: oraclejdk8
96-
before_install: nvm install 8
98+
before_install: nvm install 10
9799
script:
98100
- cd src && npm run build
99101
- cd ../demo-vue && npm i && tns build android --bundle --env.uglify --copy-to "./outputs/app-debug.apk"
100102
- "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"
101103
- language: android
102104
os: linux
105+
dist: trusty
103106
env:
104107
- WebpackAndroid="28"
105108
- Type="Angular"
106109
jdk: oraclejdk8
107-
before_install: nvm install 8
110+
before_install: nvm install 10
108111
script:
109112
- cd src && npm run build
110113
- cd ../publish && sh pack.sh
111114
- cd ../demo-angular && tns plugin add ../publish/package/*.tgz
112115
- npm i && tns build android --bundle --env.uglify --env.snapshot --env.aot --copy-to "./outputs/app-debug.apk"
113116
- "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"
114117
- language: android
118+
os: linux
119+
dist: trusty
115120
env:
116121
- BuildAndroid="28"
117122
- Type="VanillaJS"
118-
os: linux
123+
119124
jdk: oraclejdk8
120-
before_install: nvm install 8.11.4
125+
before_install: nvm install 10
121126
script:
122127
- cd src && npm run build
123128
- cd ../demo && tns build android
124129
- language: android
130+
os: linux
131+
dist: trusty
125132
env:
126133
- BuildAndroid="28"
127134
- Type="Angular"
128-
os: linux
135+
129136
jdk: oraclejdk8
130-
before_install: nvm install 8.11.4
137+
before_install: nvm install 10
131138
script:
132139
- cd src && npm run build
133140
- cd ../demo-angular && tns build android
@@ -138,7 +145,7 @@ matrix:
138145
- Type="VanillaJS"
139146
osx_image: xcode10.0
140147
language: node_js
141-
node_js: "8"
148+
node_js: "10"
142149
jdk: oraclejdk8
143150
before_script: pod repo update
144151
script:
@@ -151,7 +158,7 @@ matrix:
151158
- Type="Angular"
152159
osx_image: xcode10.0
153160
language: node_js
154-
node_js: "8"
161+
node_js: "10"
155162
jdk: oraclejdk8
156163
before_script: pod repo update
157164
script:
@@ -163,7 +170,7 @@ matrix:
163170
- Type="Angular"
164171
language: node_js
165172
os: linux
166-
node_js: "8"
173+
node_js: "10"
167174
script:
168175
- npm i -g appium
169176
- cd demo-angular && npm i
@@ -173,7 +180,7 @@ matrix:
173180
- iOS="12.0"
174181
- Type="Angular"
175182
language: node_js
176-
node_js: "8"
183+
node_js: "10"
177184
script:
178185
- npm i -g appium
179186
- cd demo-angular && npm i

‎demo-angular/e2e/tsconfig.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
"sourceMap": true,
99
"types": [
1010
"mocha",
11-
"chai"
11+
"chai",
12+
"node"
1213
],
1314
"lib": [
1415
"es2015",

‎demo-angular/package.json‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
11
{
2-
"nativescript": {
3-
"id": "org.nativescript.datetimepicker.demong",
4-
"tns-android": {
5-
"version": "5.3.0"
6-
},
7-
"tns-ios": {
8-
"version": "5.3.0"
9-
}
2+
"nativescript": {
3+
"id": "org.nativescript.datetimepicker.demong",
4+
"tns-android": {
5+
"version": "5.4.0"
106
},
11-
"description": "NativeScript DateTimePicker Demo NG",
12-
"license": "SEE LICENSE IN LICENSE FILE",
13-
"repository": "https://github.com/NativeScript/nativescript-datetimepicker",
14-
"scripts": {
15-
"ci.tslint": "npm i && tslint --config '../tslint.json' 'src/**/*.ts'",
16-
"build.plugin": "cd ../src && npm run build",
17-
"e2e": "node ./node_modules/nativescript-dev-appium/check-dev-deps.js && tsc -p e2e && mocha --opts ./e2e/config/mocha.opts ",
18-
"e2e-watch": "tsc -p e2e --watch"
19-
},
20-
"dependencies": {
21-
"@angular/animations": "~7.2.0",
22-
"@angular/common": "~7.2.0",
23-
"@angular/compiler": "~7.2.0",
24-
"@angular/core": "~7.2.0",
25-
"@angular/forms": "~7.2.0",
26-
"@angular/http": "~7.2.0",
27-
"@angular/platform-browser": "~7.2.0",
28-
"@angular/platform-browser-dynamic": "~7.2.0",
29-
"@angular/router": "~7.2.0",
30-
"nativescript-angular": "~7.2.0",
31-
"nativescript-datetimepicker": "file:../src",
32-
"nativescript-theme-core": "~1.0.4",
33-
"reflect-metadata": "~0.1.10",
34-
"rxjs": "~6.4.0",
35-
"tns-core-modules": "^5.0.0",
36-
"zone.js": "~0.8.18"
37-
},
38-
"devDependencies": {
39-
"@nativescript/schematics": "~0.5.0",
40-
"nativescript-dev-typescript": "~0.9.0",
41-
"nativescript-dev-webpack": "~0.21.0",
42-
"@angular/compiler-cli": "~7.2.0",
43-
"@ngtools/webpack": "~7.2.0",
44-
"@types/chai": "~4.1.7",
45-
"@types/mocha": "~5.2.5",
46-
"@types/node": "~10.12.18",
47-
"mocha": "~5.2.0",
48-
"mocha-junit-reporter": "~1.18.0",
49-
"mocha-multi": "~1.0.1",
50-
"mochawesome": "~3.1.1",
51-
"nativescript-dev-appium": "~5.0.0",
52-
"tslint": "~5.11.0"
53-
},
54-
"readme": "NativeScript DateTimePicker Demo NG"
55-
}
7+
"tns-ios": {
8+
"version": "5.4.0"
9+
}
10+
},
11+
"description": "NativeScript DateTimePicker Demo NG",
12+
"license": "SEE LICENSE IN LICENSE FILE",
13+
"repository": "https://github.com/NativeScript/nativescript-datetimepicker",
14+
"scripts": {
15+
"ci.tslint": "npm i && tslint --config '../tslint.json' 'src/**/*.ts'",
16+
"build.plugin": "cd ../src && npm run build",
17+
"e2e": "node ./node_modules/nativescript-dev-appium/check-dev-deps.js && tsc -p e2e && mocha --opts ./e2e/config/mocha.opts ",
18+
"e2e-watch": "tsc -p e2e --watch"
19+
},
20+
"dependencies": {
21+
"@angular/animations": "~8.0.0",
22+
"@angular/common": "~8.0.0",
23+
"@angular/compiler": "~8.0.0",
24+
"@angular/core": "~8.0.0",
25+
"@angular/forms": "~8.0.0",
26+
"@angular/http": "8.0.0-beta.10",
27+
"@angular/platform-browser": "~8.0.0",
28+
"@angular/platform-browser-dynamic": "~8.0.0",
29+
"@angular/router": "~8.0.0",
30+
"nativescript-angular": "~8.0.0",
31+
"nativescript-datetimepicker": "file:../src",
32+
"nativescript-theme-core": "~1.0.4",
33+
"reflect-metadata": "~0.1.10",
34+
"rxjs": "^6.3.3",
35+
"tns-core-modules": "^5.0.0",
36+
"typescript": "~3.4.5",
37+
"zone.js": "^0.8.4"
38+
},
39+
"devDependencies": {
40+
"@angular/compiler-cli": "~8.0.0",
41+
"@ngtools/webpack": "~8.0.0",
42+
"@types/chai": "~4.1.7",
43+
"@types/mocha": "~5.2.5",
44+
"@types/node": "~10.12.18",
45+
"mocha": "~5.2.0",
46+
"mocha-junit-reporter": "~1.18.0",
47+
"mocha-multi": "~1.0.1",
48+
"mochawesome": "~3.1.1",
49+
"nativescript-dev-appium": "~5.2.0",
50+
"nativescript-dev-typescript": "~0.10.0",
51+
"nativescript-dev-webpack": "~0.24.0",
52+
"tslint": "~5.11.0"
53+
},
54+
"readme": "NativeScript DateTimePicker Demo NG"
55+
}

‎demo-angular/src/app/home/home.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export class HomeComponent implements OnInit {
2626
public customVisibility: string;
2727
private _expandedId: string;
2828

29-
@ViewChild("scrollView") scrollView: ElementRef;
29+
@ViewChild("scrollView", { static: false }) scrollView: ElementRef;
3030

3131
constructor() {
3232
// Use the component constructor to inject providers.

‎demo-vue/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"nativescript": {
33
"id": "org.nativescript.datetimepicker.demovue",
44
"tns-android": {
5-
"version": "5.3.0"
5+
"version": "5.4.0"
66
},
77
"tns-ios": {
8-
"version": "5.3.0"
8+
"version": "5.4.0"
99
}
1010
},
1111
"description": "NativeScript DateTimePicker Demo Vue",
@@ -14,16 +14,16 @@
1414
"dependencies": {
1515
"nativescript-datetimepicker": "file:../src",
1616
"nativescript-theme-core": "~1.0.4",
17-
"nativescript-vue": "~2.0.0",
17+
"nativescript-vue": "~2.2.0",
1818
"tns-core-modules": "^5.0.0"
1919
},
2020
"devDependencies": {
2121
"@babel/core": "~7.2.0",
2222
"@babel/preset-env": "~7.2.0",
2323
"babel-loader": "~8.0.0",
24-
"nativescript-dev-typescript": "~0.9.0",
25-
"nativescript-dev-webpack": "~0.21.0",
26-
"nativescript-vue-template-compiler": "~2.0.2",
24+
"nativescript-dev-typescript": "~0.10.0",
25+
"nativescript-dev-webpack": "~0.24.0",
26+
"nativescript-vue-template-compiler": "~2.2.0",
2727
"node-sass": "~4.9.0",
2828
"vue-loader": "~15.4.0"
2929
},

‎demo/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"nativescript": {
33
"id": "org.nativescript.datetimepicker.demo",
44
"tns-android": {
5-
"version": "5.3.0"
5+
"version": "5.4.0"
66
},
77
"tns-ios": {
8-
"version": "5.3.0"
8+
"version": "5.4.0"
99
}
1010
},
1111
"description": "NativeScript DateTimePicker Demo Core",
@@ -21,8 +21,8 @@
2121
"tns-core-modules": "^5.0.0"
2222
},
2323
"devDependencies": {
24-
"nativescript-dev-typescript": "~0.9.0",
25-
"nativescript-dev-webpack": "~0.21.0",
24+
"nativescript-dev-typescript": "~0.10.0",
25+
"nativescript-dev-webpack": "~0.24.0",
2626
"tslint": "~5.11.0"
2727
},
2828
"readme": "NativeScript DateTimePicker Demo Core"

0 commit comments

Comments
 (0)