Skip to content

Commit 9f09388

Browse files
elena-pelena-p
authored
Merge pull request #272 from NativeScript/hristova/update-travis-yml
chore: update to node 10, set trusty distribution
2 parents 4dada3d + 87c3388 commit 9f09388

File tree

13 files changed

+110
-335
lines changed

13 files changed

+110
-335
lines changed

‎.travis.yml

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ matrix:
2323
- stage: "Lint"
2424
language: node_js
2525
os: linux
26-
node_js: "8"
26+
node_js: "10"
2727
script: cd src && npm run ci.tslint && cd ../demo && npm run ci.tslint && cd ../demo-angular && npm run ci.tslint
2828
- stage: "WebPack and Build"
2929
os: osx
@@ -32,7 +32,7 @@ matrix:
3232
- Type="VanillaJS"
3333
osx_image: xcode10.0
3434
language: node_js
35-
node_js: "8"
35+
node_js: "10"
3636
jdk: oraclejdk8
3737
before_script: pod repo update
3838
script:
@@ -46,7 +46,7 @@ matrix:
4646
- Type="VueJS"
4747
osx_image: xcode10.0
4848
language: node_js
49-
node_js: "8"
49+
node_js: "10"
5050
jdk: oraclejdk8
5151
before_script: pod repo update
5252
script:
@@ -60,7 +60,7 @@ matrix:
6060
- Type="Angular"
6161
osx_image: xcode10.0
6262
language: node_js
63-
node_js: "8"
63+
node_js: "10"
6464
jdk: oraclejdk8
6565
before_script: pod repo update
6666
script:
@@ -69,54 +69,61 @@ matrix:
6969
- npm i && tns build ios --bundle --env.uglify --env.aot
7070
- language: android
7171
os: linux
72+
dist: trusty
7273
env:
7374
- WebpackAndroid="28"
7475
- Type="VanillaJS"
7576
jdk: oraclejdk8
76-
before_install: nvm install 8
77+
before_install: nvm install 10
7778
script:
7879
- cd src && npm run build
7980
- cd ../demo && npm i && tns build android --bundle --env.uglify --env.snapshot --copy-to "./outputs/app-debug.apk"
8081
- "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"
8182
- language: android
8283
os: linux
84+
dist: trusty
8385
env:
8486
- WebpackAndroid="28"
8587
- Type="VueJS"
8688
jdk: oraclejdk8
87-
before_install: nvm install 8
89+
before_install: nvm install 10
8890
script:
8991
- cd src && npm run build
9092
- cd ../demo-vue && npm i && tns build android --bundle --env.uglify --copy-to "./outputs/app-debug.apk"
9193
- "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"
9294
- language: android
9395
os: linux
96+
dist: trusty
9497
env:
9598
- WebpackAndroid="28"
9699
- Type="Angular"
97100
jdk: oraclejdk8
98-
before_install: nvm install 8
101+
before_install: nvm install 10
99102
script:
100103
- cd src && npm run build
101104
- cd ../publish && sh pack.sh
102105
- cd ../demo-angular && tns plugin add ../publish/package/*.tgz
103106
- npm i && tns build android --bundle --env.uglify --env.snapshot --env.aot
104107
- language: android
108+
os: linux
109+
dist: trusty
105110
env:
106111
- BuildAndroid="28"
107112
- Type="VanillaJS"
108-
os: linux
113+
109114
jdk: oraclejdk8
110-
before_install: nvm install 8.11.4
115+
before_install: nvm install 10
111116
script:
112117
- cd demo && npm run ci.android.build
113118
- language: android
119+
os: linux
120+
dist: trusty
114121
env:
115122
- BuildAndroid="28"
116123
- Type="Angular"
117-
os: linux
124+
118125
jdk: oraclejdk8
119-
before_install: nvm install 8.11.4
126+
before_install: nvm install 10
120127
script:
121128
- cd demo-angular && npm run ci.android.build
122129
- os: osx
@@ -126,7 +133,7 @@ matrix:
126133
- Type="VanillaJS"
127134
osx_image: xcode10.0
128135
language: node_js
129-
node_js: "8"
136+
node_js: "10"
130137
jdk: oraclejdk8
131138
before_script: pod repo update
132139
script:
@@ -139,7 +146,7 @@ matrix:
139146
- Type="Angular"
140147
osx_image: xcode10.0
141148
language: node_js
142-
node_js: "8"
149+
node_js: "10"
143150
jdk: oraclejdk8
144151
before_script: pod repo update
145152
script:
@@ -150,38 +157,38 @@ matrix:
150157
- Type="VanillaJS"
151158
language: node_js
152159
os: linux
153-
node_js: "8"
160+
node_js: "10"
154161
script:
155162
- npm i -g appium
156163
- cd demo && npm i
157-
- travis_wait travis_retry npm run e2e -- --runType android23 --sauceLab --appPath $ANDROID_PACKAGE_JS
164+
- travis_wait travis_retry npm run e2e -- --runType android24 --sauceLab --appPath $ANDROID_PACKAGE_JS
158165
- os: linux
159166
env:
160167
- Android="24"
161168
- Type="VueJS"
162169
language: node_js
163170
os: linux
164-
node_js: "8"
171+
node_js: "10"
165172
script:
166173
- npm i -g appium
167174
- cd demo-vue && npm i
168-
- travis_wait travis_retry npm run e2e -- --runType android23 --sauceLab --appPath $ANDROID_PACKAGE_VUE
175+
- travis_wait travis_retry npm run e2e -- --runType android24 --sauceLab --appPath $ANDROID_PACKAGE_VUE
169176
- os: linux
170177
env:
171178
- iOS="12.0"
172179
- Type="VanillaJS"
173180
language: node_js
174-
node_js: "8"
181+
node_js: "10"
175182
script:
176183
- npm i -g appium
177184
- cd demo && npm i
178-
- travis_wait travis_retry npm run e2e -- --runType sim11iPhone6 --sauceLab --appPath $IOS_PACKAGE_JS
185+
- travis_wait travis_retry npm run e2e -- --runType sim12iPhoneX --sauceLab --appPath $IOS_PACKAGE_JS
179186
- os: linux
180187
env:
181188
- iOS="12.0"
182189
- Type="VueJS"
183190
language: node_js
184-
node_js: "8"
191+
node_js: "10"
185192
script:
186193
- npm i -g appium
187194
- cd demo-vue && npm i

‎demo-angular/app/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,5 @@
33
"v8Flags": "--expose_gc",
44
"requireModules": ["nativescript-imagepicker"]
55
},
6-
"main": "main.js",
7-
"name": "tns-template-hello-world",
8-
"version": "3.1.0"
6+
"main": "main.js"
97
}

‎demo-angular/package.json

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,38 @@
22
"nativescript": {
33
"id": "org.nativescript.imagepickerdemoangular",
44
"tns-ios": {
5-
"version": "5.3.0"
5+
"version": "5.4.0"
66
},
77
"tns-android": {
8-
"version": "5.3.0"
8+
"version": "5.4.0"
99
}
1010
},
1111
"dependencies": {
12-
"@angular/common": "~7.2.0",
13-
"@angular/compiler": "~7.2.0",
14-
"@angular/core": "~7.2.0",
15-
"@angular/forms": "~7.2.0",
16-
"@angular/http": "~7.2.0",
17-
"@angular/platform-browser": "~7.2.0",
18-
"@angular/platform-browser-dynamic": "~7.2.0",
19-
"@angular/router": "~7.2.0",
20-
"nativescript-angular": "~7.2.0",
12+
"@angular/common": "~8.0.0",
13+
"@angular/compiler": "~8.0.0",
14+
"@angular/core": "~8.0.0",
15+
"@angular/forms": "~8.0.0",
16+
"@angular/http": "8.0.0-beta.10",
17+
"@angular/platform-browser": "~8.0.0",
18+
"@angular/platform-browser-dynamic": "~8.0.0",
19+
"@angular/router": "~8.0.0",
20+
"nativescript-angular": "~8.0.0",
2121
"nativescript-imagepicker": "../src",
2222
"nativescript-theme-core": "^1.0.4",
2323
"nativescript-unit-test-runner": "^0.3.4",
2424
"reflect-metadata": "~0.1.8",
2525
"rxjs": "^6.3.3",
26-
"tns-core-modules": "^5.0.0"
26+
"tns-core-modules": "^5.0.0",
27+
"typescript": "~3.4.5"
2728
},
2829
"devDependencies": {
2930
"jasmine-core": "^2.5.2",
3031
"karma": "^1.3.0",
3132
"karma-jasmine": "^1.0.2",
3233
"karma-nativescript-launcher": "^0.4.0",
3334
"nativescript-css-loader": "~0.26.0",
34-
"nativescript-dev-typescript": "~0.9.0",
35-
"nativescript-dev-webpack": "~0.21.0",
35+
"nativescript-dev-typescript": "~0.10.0",
36+
"nativescript-dev-webpack": "~0.24.0",
3637
"tns-platform-declarations": "^5.0.0",
3738
"tslint": "~5.11.0",
3839
"zone.js": "^0.8.4"

‎demo-vue/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ platforms/
66

77
# NativeScript Template
88
*.js.map
9-
!webpack.config.js
109
*.css
1110

1211
# Logs

‎demo-vue/e2e/config/appium.capabilities.json

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,17 @@
2424
"platformName": "Android",
2525
"platformVersion": "7.0",
2626
"deviceName": "Android GoogleAPI Emulator",
27-
"appium-version": "1.9.1",
27+
"appiumVersion": "1.9.1",
2828
"noReset": true,
29-
"lt": 60000,
30-
"newCommandTimeout": 720,
31-
"fullReset": false,
32-
"idleTimeout": 120,
33-
"automationName": "Appium"
29+
"app": ""
30+
},
31+
"android24.local": {
32+
"platformName": "Android",
33+
"platformVersion": "7.0",
34+
"deviceName": "Emulator-Api24-Default",
35+
"avd": "Emulator-Api24-Default",
36+
"appiumVersion": "1.9.1",
37+
"noReset": true
3438
},
3539
"sim11iPhone6": {
3640
"platformName": "iOS",

‎demo-vue/e2e/test.e2e.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ describe("Imagepicker", async function () {
6363

6464
if (isSauceRun && imagesFolder) {
6565
await imagesFolder.click();
66+
let dcimFolder = await driver.findElementByText("DCIM", SearchOptions.contains);
67+
await dcimFolder.click();
6668
imagesFolder = await driver.findElementByClassName(driver.locators.image);
6769
await imagesFolder.click();
6870
}

‎demo-vue/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
"nativescript": {
33
"id": "org.nativescript.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
"dependencies": {
1212
"nativescript-imagepicker": "../src",
1313
"nativescript-theme-core": "~1.0.4",
14-
"nativescript-vue": "^2.0.0",
14+
"nativescript-vue": "~2.2.0",
1515
"tns-core-modules": "^5.0.0"
1616
},
1717
"devDependencies": {
@@ -27,10 +27,10 @@
2727
"mocha-junit-reporter": "^1.18.0",
2828
"mocha-multi": "^1.0.1",
2929
"mochawesome": "^3.1.1",
30-
"nativescript-dev-appium": "^4.0.9",
31-
"nativescript-dev-webpack": "~0.21.0",
32-
"nativescript-dev-typescript": "~0.9.0",
33-
"nativescript-vue-template-compiler": "^2.0.0",
30+
"nativescript-dev-appium": "~5.2.0",
31+
"nativescript-dev-webpack": "~0.24.0",
32+
"nativescript-dev-typescript": "~0.10.0",
33+
"nativescript-vue-template-compiler": "~2.2.0",
3434
"node-sass": "~4.9.0",
3535
"vue-loader": "~15.4.0"
3636
},

0 commit comments

Comments
 (0)