Skip to content

Commit d5ccaf5

Browse files
Merge pull request #1656 from NativeScript/merge-release-in-master
chore: merge release in master
2 parents b25bd2d + 01642aa commit d5ccaf5

File tree

9 files changed

+34
-26
lines changed

9 files changed

+34
-26
lines changed

Diff for: CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
<a name="7.1.0"></a>
2+
# [7.1.0](https://github.com/NativeScript/nativescript-angular/compare/7.0.3...7.1.0) (2018-12-07)
3+
4+
5+
### Features
6+
7+
* Angular 7.1 support
8+
19
<a name="7.0.3"></a>
210
## [7.0.3](https://github.com/NativeScript/nativescript-angular/compare/7.0.2...7.0.3) (2018-12-05)
311

Diff for: e2e/modal-navigation-ng/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"reflect-metadata": "~0.1.8",
2828
"rxjs": "~6.3.3",
2929
"tns-core-modules": "next",
30-
"zone.js": "~0.8.2"
30+
"zone.js": "^0.8.4"
3131
},
3232
"devDependencies": {
3333
"@angular/compiler-cli": "~7.1.0",

Diff for: e2e/nested-router-tab-view/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
"nativescript-angular": "file:../../nativescript-angular",
2626
"nativescript-theme-core": "~1.0.4",
2727
"reflect-metadata": "~0.1.8",
28-
"rxjs": "~6.0.0-rc.1",
28+
"rxjs": "~6.3.3",
2929
"tns-core-modules": "next",
30-
"zone.js": "~0.8.2"
30+
"zone.js": "^0.8.4"
3131
},
3232
"devDependencies": {
3333
"@angular/compiler-cli": "~7.1.0",

Diff for: e2e/router-tab-view/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
"nativescript-angular": "file:../../nativescript-angular",
2626
"nativescript-theme-core": "~1.0.4",
2727
"reflect-metadata": "~0.1.8",
28-
"rxjs": "~6.0.0-rc.1",
28+
"rxjs": "~6.3.3",
2929
"tns-core-modules": "next",
30-
"zone.js": "~0.8.2"
30+
"zone.js": "^0.8.4"
3131
},
3232
"devDependencies": {
3333
"@types/chai": "^4.0.2",

Diff for: e2e/router/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"reflect-metadata": "~0.1.8",
2222
"rxjs": "~6.3.3",
2323
"tns-core-modules": "next",
24-
"zone.js": "^0.8.26"
24+
"zone.js": "^0.8.4"
2525
},
2626
"devDependencies": {
2727
"@ngtools/webpack": "~7.1.0",

Diff for: e2e/single-page/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
"nativescript-angular": "file:../../nativescript-angular",
2626
"nativescript-intl": "^3.0.0",
2727
"reflect-metadata": "~0.1.8",
28-
"rxjs": "~6.0.0-rc.1",
28+
"rxjs": "~6.3.3",
2929
"tns-core-modules": "next",
3030
"zone.js": "^0.8.4"
3131
},
3232
"devDependencies": {
3333
"@angular/compiler-cli": "~7.1.0",
34-
"@ngtools/webpack": "~6.2.0-beta.3",
34+
"@ngtools/webpack": "~7.1.0",
3535
"@types/chai": "^4.0.2",
3636
"@types/mocha": "^5.2.5",
3737
"@types/node": "^10.12.12",

Diff for: nativescript-angular/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
"@angular/router": "~7.1.0",
5555
"rxjs": "^6.3.3",
5656
"tns-core-modules": "^5.0.0 || >5.0.0- || >5.1.0-",
57-
"zone.js": "^0.8.26",
58-
"typescript": "~3.1.1"
57+
"typescript": "~3.1.1",
58+
"zone.js": "^0.8.4"
5959
},
6060
"devDependencies": {
6161
"@angular/animations": "~7.1.0",
@@ -73,6 +73,6 @@
7373
"tns-core-modules": "next",
7474
"tslint": "^5.5.0",
7575
"typescript": "~3.1.1",
76-
"zone.js": "^0.8.26"
76+
"zone.js": "^0.8.4"
7777
}
7878
}

Diff for: ng-sample/package.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"nativescript": {
33
"id": "org.nativescript.ngsample",
44
"tns-android": {
5-
"version": "4.1.0-2018.4.16.8"
5+
"version": "next"
66
},
77
"tns-ios": {
8-
"version": "4.0.2-2018-04-13-01"
8+
"version": "next"
99
}
1010
},
1111
"name": "tns-template-hello-world",
@@ -32,19 +32,19 @@
3232
},
3333
"homepage": "https://github.com/NativeScript/template-hello-world",
3434
"dependencies": {
35-
"@angular/animations": "~6.0.0-rc.3",
36-
"@angular/common": "~6.0.0-rc.3",
37-
"@angular/compiler": "~6.0.0-rc.3",
38-
"@angular/core": "~6.0.0-rc.3",
39-
"@angular/forms": "~6.0.0-rc.3",
40-
"@angular/http": "~6.0.0-rc.3",
41-
"@angular/platform-browser": "~6.0.0-rc.3",
42-
"@angular/platform-browser-dynamic": "~6.0.0-rc.3",
43-
"@angular/router": "~6.0.0-rc.3",
35+
"@angular/animations": "~7.1.0",
36+
"@angular/common": "~7.1.0",
37+
"@angular/compiler": "~7.1.0",
38+
"@angular/core": "~7.1.0",
39+
"@angular/forms": "~7.1.0",
40+
"@angular/http": "~7.1.0",
41+
"@angular/platform-browser": "~7.1.0",
42+
"@angular/platform-browser-dynamic": "~7.1.0",
43+
"@angular/router": "~7.1.0",
4444
"nativescript-angular": "file:../nativescript-angular",
45-
"rxjs": "~6.0.0-rc.1",
45+
"rxjs": "~6.3.3",
4646
"tns-core-modules": "next",
47-
"tns-platform-declarations": "^3.4.0",
47+
"tns-platform-declarations": "next",
4848
"zone.js": "^0.8.4"
4949
},
5050
"devDependencies": {

Diff for: tests/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"@angular/router": "~7.1.0",
3838
"nativescript-angular": "../nativescript-angular",
3939
"nativescript-unit-test-runner": "^0.3.4",
40-
"rxjs": "~6.0.0-rc.1",
40+
"rxjs": "~6.3.3",
4141
"tns-core-modules": "next",
4242
"zone.js": "^0.8.4"
4343
},
@@ -51,7 +51,7 @@
5151
"karma-mocha-reporter": "2.2.5",
5252
"karma-nativescript-launcher": "0.4.0",
5353
"mocha": "5.2.0",
54-
"nativescript-dev-typescript": "~0.7.0",
54+
"nativescript-dev-typescript": "~0.7.8",
5555
"babel-traverse": "6.8.0",
5656
"babel-types": "6.8.1",
5757
"babylon": "6.8.0",

0 commit comments

Comments
 (0)