Skip to content
This repository was archived by the owner on Feb 10, 2023. It is now read-only.

Commit cd69391

Browse files
committed
feat(NativeScript 5): Resolve Upgrade issues
1 parent 45fa7d8 commit cd69391

20 files changed

+8724
-9821
lines changed

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v8
1+
v10

.travis.yml

Lines changed: 36 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
env:
22
global:
3-
- NATIVESCRIPT_CLI_VERSION='4.2.3'
43
- ANDROID_PACKAGE='demo-debug.apk'
54
- ANDROID_PACKAGE_FOLDER=$TRAVIS_BUILD_DIR/demo/platforms/android/build/outputs/apk/debug
65
- ANDROID_SAUCE_STORAGE="https://saucelabs.com/rest/v1/storage/$SAUCE_USER/$ANDROID_PACKAGE?overwrite=true"
76
- IOS_PACKAGE='demo.zip'
87
- IOS_PACKAGE_FOLDER=$TRAVIS_BUILD_DIR/demo/platforms/ios/build/emulator
98
- IOS_SAUCE_STORAGE="https://saucelabs.com/rest/v1/storage/$SAUCE_USER/$IOS_PACKAGE?overwrite=true"
109
- EMULATOR_NAME=test
11-
- EMULATOR_API_LEVEL=23
12-
- ANDROID_API_LEVEL=26
13-
- ANDROID_BUILD_TOOLS_VERSION=27.0.3
10+
- ANDROID_API_LEVEL=28
11+
- ANDROID_BUILD_TOOLS_VERSION=28.0.3
1412
- ANDROID_ABI=armeabi-v7a
1513
- ANDROID_TAG=google_apis
1614
- ADB_INSTALL_TIMEOUT=20 # minutes (2 minutes by default)
@@ -20,18 +18,24 @@ matrix:
2018
- stage: "Lint"
2119
language: node_js
2220
os: linux
23-
node_js: "8"
21+
node_js: "10"
2422
before_install:
2523
- cd publish && npm run setup-dev-env && cd ..
2624
script: cd src && npm run ci.tslint && npm run build && cd ../demo && npm run ci.tslint && cd ../demo-angular && npm run ci.tslint
2725
- stage: "WebPack and Build"
2826
os: osx
2927
env:
30-
- WebpackiOS="11"
31-
osx_image: xcode9.4
28+
- WebpackiOS="12"
29+
osx_image: xcode10.0
3230
language: node_js
33-
node_js: "8"
31+
node_js: "10"
3432
jdk: oraclejdk8
33+
before_script:
34+
- gem install cocoapods
35+
- gem install xcodeproj
36+
- brew install xcproj
37+
- pod repo update
38+
- sudo pip install six
3539
before_install:
3640
- pod repo update
3741
- cd publish && npm run setup-dev-env && cd ..
@@ -43,7 +47,7 @@ matrix:
4347
- Webpack="Android"
4448
jdk: oraclejdk8
4549
before_install:
46-
- nvm install 8.11.3
50+
- nvm install 10
4751
- cd publish && npm run setup-dev-env && cd ..
4852
- cd src && npm i && cd ..
4953
script: cd demo npm run build-android-bundle && cd ../demo-angular && npm run build-android-bundle
@@ -53,10 +57,9 @@ matrix:
5357
os: linux
5458
jdk: oraclejdk8
5559
before_install:
56-
- nvm install 8.11.3
60+
- nvm install 10
5761
- android list targets
58-
- android list
59-
- echo no | android create avd --force -n $EMULATOR_NAME -t "android-"$EMULATOR_API_LEVEL --abi $ANDROID_ABI --tag $ANDROID_TAG
62+
- echo no | android create avd --force -n $EMULATOR_NAME -t android-25 --abi $ANDROID_ABI --tag $ANDROID_TAG
6063
- QEMU_AUDIO_DRV=none emulator -avd $EMULATOR_NAME -no-window &
6164
- cd src && npm i && cd ..
6265
- cd publish && npm run setup-dev-env && cd ..
@@ -65,12 +68,17 @@ matrix:
6568
- "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $ANDROID_SAUCE_STORAGE --data-binary @$ANDROID_PACKAGE_FOLDER/$ANDROID_PACKAGE"
6669
- os: osx
6770
env:
68-
- BuildiOS="11"
69-
- Xcode="9.2"
70-
osx_image: xcode9.4
71+
- BuildiOS="12"
72+
osx_image: xcode10.0
7173
language: node_js
72-
node_js: "8"
74+
node_js: "10"
7375
jdk: oraclejdk8
76+
before_script:
77+
- gem install cocoapods
78+
- gem install xcodeproj
79+
- brew install xcproj
80+
- pod repo update
81+
- sudo pip install six
7482
before_install:
7583
- pod repo update
7684
- cd publish && npm run setup-dev-env && cd ..
@@ -81,10 +89,10 @@ matrix:
8189
- "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $IOS_SAUCE_STORAGE --data-binary @$IOS_PACKAGE_FOLDER/$IOS_PACKAGE"
8290
- stage: "UI Tests"
8391
env:
84-
- Android="23"
92+
- Android="25"
8593
language: node_js
8694
os: linux
87-
node_js: "8"
95+
node_js: "10"
8896
before_install:
8997
- cd src && npm i && cd ..
9098
script:
@@ -96,7 +104,7 @@ matrix:
96104
env:
97105
- iOS="10"
98106
language: node_js
99-
node_js: "8"
107+
node_js: "10"
100108
before_install:
101109
- cd src && npm i && cd ..
102110
script:
@@ -107,15 +115,12 @@ matrix:
107115

108116
android:
109117
components:
110-
- tools # to get the new `repository-11.xml`
111118
- platform-tools
112-
- tools # to install Android SDK tools 25.1.x
119+
- tools # to install Android SDK tools
113120
- build-tools-$ANDROID_BUILD_TOOLS_VERSION
114121
- android-$ANDROID_API_LEVEL
115-
- android-$EMULATOR_API_LEVEL
116122
# For Google APIs
117123
- addon-google_apis-google-$ANDROID_API_LEVEL
118-
- addon-google_apis-google-$EMULATOR_API_LEVEL
119124
# Google Play Services
120125
- extra-google-google_play_services
121126
# Support library
@@ -124,8 +129,13 @@ android:
124129
- extra-google-m2repository
125130
- extra-android-m2repository
126131
# Specify at least one system image
127-
- sys-img-armeabi-v7a-google_apis-$ANDROID_API_LEVEL
128-
- sys-img-armeabi-v7a-google_apis-$EMULATOR_API_LEVEL
132+
- sys-img-armeabi-v7a-android-21
133+
- sys-img-armeabi-v7a-google_apis-25
134+
- sys-img-armeabi-v7a-android-$ANDROID_API_LEVEL
135+
136+
before_install:
137+
- sudo pip install --upgrade pip
138+
- sudo pip install six
129139
licenses:
130140
- ".+"
131141

@@ -139,6 +149,6 @@ cache:
139149
- $HOME/.gradle/wrapper/
140150

141151
install:
142-
- npm install -g nativescript@$NATIVESCRIPT_CLI_VERSION
152+
- echo no | npm install -g nativescript
143153
- tns usage-reporting disable
144154
- tns error-reporting disable

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ properties properties: [
66
@Library('mare-build-library')
77
def nodeJS = new de.mare.ci.jenkins.NodeJS()
88

9-
timeout(150) {
9+
timeout(60) {
1010
node('nativescript') {
1111
def buildNumber = env.BUILD_NUMBER
1212
def branchName = env.BRANCH_NAME

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ handleOpenURL((appURL: AppURL) => {
6666

6767
```
6868

69+
>Note: see `demo` app for sample usage. Start by adding handleOpenURL in app main!
6970
7071

7172
## Installation

0 commit comments

Comments
 (0)