Skip to content

Commit 6c4a703

Browse files
Merge remote-tracking branch 'origin/master' into merge-release-in-master
2 parents 101b9a4 + 296e016 commit 6c4a703

File tree

3 files changed

+9
-97
lines changed

3 files changed

+9
-97
lines changed

Diff for: .travis.yml

+8-95
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,8 @@
1-
env:
2-
global:
3-
- NODE_VERSION=8
4-
- EMULATOR_API_LEVEL=23
5-
- ANDROID_VERSION=28
6-
- ANDROID_BUILD_TOOLS_VERSION=28.0.3
7-
- ANDROID_ABI=armeabi-v7a
8-
- EMULATOR_NAME=test
9-
- ANDROID_TAG=google_apis
10-
11-
matrix:
12-
include:
13-
- stage: "Lint"
14-
language: node_js
15-
os: linux
16-
before_install:
17-
- nvm install $NODE_VERSION
18-
script:
19-
- cd nativescript-angular
20-
- npm install
21-
- npm run tslint
22-
- stage: "Build"
23-
os: osx
24-
env:
25-
- Build="iOS"
26-
osx_image: xcode9.3
27-
language: node_js
28-
node_js: "8"
29-
jdk: oraclejdk8
30-
before_install:
31-
- cd nativescript-angular
32-
- npm install
33-
- cd ../tests
34-
- npm install
35-
- cd ..
36-
script:
37-
- cd nativescript-angular
38-
- npm run ngc
39-
- cd ../tests
40-
- tns build ios
41-
- language: android
42-
node_js: "8"
43-
os: linux
44-
env:
45-
- Build="Android"
46-
jdk: oraclejdk8
47-
before_install:
48-
- echo no | android create avd --force -n $EMULATOR_NAME -t "android-"$EMULATOR_API_LEVEL --abi $ANDROID_ABI --tag $ANDROID_TAG -c 12M
49-
- QEMU_AUDIO_DRV=none emulator -avd $EMULATOR_NAME -no-window &
50-
- nvm install $NODE_VERSION
51-
- cd nativescript-angular
52-
- npm install
53-
- cd ../tests
54-
- npm install
55-
- cd ..
56-
- android-wait-for-emulator
57-
- adb shell input keyevent 82 &
58-
script:
59-
- cd nativescript-angular
60-
- npm run ngc
61-
- cd ../tests
62-
- tns build android
63-
64-
android:
65-
components:
66-
- tools
67-
- platform-tools
68-
- android-$ANDROID_VERSION
69-
- build-tools-$ANDROID_BUILD_TOOLS_VERSION
70-
- android-$EMULATOR_API_LEVEL
71-
- extra-google-google_play_services
72-
- extra-google-m2repository
73-
- extra-android-m2repository
74-
# Specify at least one system image,
75-
# if you need to run emulator(s) during your tests
76-
- sys-img-armeabi-v7a-google_apis-$EMULATOR_API_LEVEL
77-
licenses:
78-
- ".+"
79-
80-
before_cache:
81-
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
82-
83-
cache:
84-
directories:
85-
- .nvm
86-
- $HOME/.gradle/caches/
87-
- $HOME/.gradle/wrapper/
88-
89-
install:
90-
- nvm install $NODE_VERSION
91-
- npm install -g typings
92-
- wget -O ./nativescript.tgz "https://s3.amazonaws.com/nativescript-ci/build_result/nativescript.tgz"
93-
- npm install -g nativescript.tgz --ignore-scripts
94-
- tns usage-reporting disable
95-
- tns error-reporting disable
1+
language: node_js
2+
node_js:
3+
- "node"
4+
script:
5+
- cd nativescript-angular
6+
- npm install
7+
- npm run tslint
8+
- npm pack

Diff for: LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright (c) 2015-2018 Progress Software Corporation
189+
Copyright (c) 2015-2019 Progress Software Corporation
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

Diff for: nativescript-angular/router/ns-empty-outlet.component.ts

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { PageRouterOutlet } from "./page-router-outlet";
44
@Component({
55
// tslint:disable-next-line:component-selector
66
selector: "ns-empty-outlet",
7-
moduleId: module.id,
87
template: "<page-router-outlet isEmptyOutlet='true'></page-router-outlet>"
98
})
109
export class NSEmptyOutletComponent {

0 commit comments

Comments
 (0)