Merge pull request #1656 from NativeScript/merge-release-in-master

chore: merge release in master
NativeScript · Dec 9, 2018 · d5ccaf5 · d5ccaf5
2 parents b25bd2d + 01642aa
commit d5ccaf5
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+<a name="7.1.0"></a>
+# [7.1.0](https://github.com/NativeScript/nativescript-angular/compare/7.0.3...7.1.0) (2018-12-07)
+
+
+### Features
+
+* Angular 7.1 support
+
 <a name="7.0.3"></a>
 ## [7.0.3](https://github.com/NativeScript/nativescript-angular/compare/7.0.2...7.0.3) (2018-12-05)
 

diff --git a/e2e/modal-navigation-ng/package.json b/e2e/modal-navigation-ng/package.json
@@ -27,7 +27,7 @@
     "reflect-metadata": "~0.1.8",
     "rxjs": "~6.3.3",
     "tns-core-modules": "next",
-    "zone.js": "~0.8.2"
+    "zone.js": "^0.8.4"
   },
   "devDependencies": {
     "@angular/compiler-cli": "~7.1.0",

diff --git a/e2e/nested-router-tab-view/package.json b/e2e/nested-router-tab-view/package.json
@@ -25,9 +25,9 @@
     "nativescript-angular": "file:../../nativescript-angular",
     "nativescript-theme-core": "~1.0.4",
     "reflect-metadata": "~0.1.8",
-    "rxjs": "~6.0.0-rc.1",
+    "rxjs": "~6.3.3",
     "tns-core-modules": "next",
-    "zone.js": "~0.8.2"
+    "zone.js": "^0.8.4"
   },
   "devDependencies": {
     "@angular/compiler-cli": "~7.1.0",

diff --git a/e2e/router-tab-view/package.json b/e2e/router-tab-view/package.json
@@ -25,9 +25,9 @@
     "nativescript-angular": "file:../../nativescript-angular",
     "nativescript-theme-core": "~1.0.4",
     "reflect-metadata": "~0.1.8",
-    "rxjs": "~6.0.0-rc.1",
+    "rxjs": "~6.3.3",
     "tns-core-modules": "next",
-    "zone.js": "~0.8.2"
+    "zone.js": "^0.8.4"
   },
   "devDependencies": {
     "@types/chai": "^4.0.2",

diff --git a/e2e/router/package.json b/e2e/router/package.json
@@ -21,7 +21,7 @@
     "reflect-metadata": "~0.1.8",
     "rxjs": "~6.3.3",
     "tns-core-modules": "next",
-    "zone.js": "^0.8.26"
+    "zone.js": "^0.8.4"
   },
   "devDependencies": {
     "@ngtools/webpack": "~7.1.0",

diff --git a/e2e/single-page/package.json b/e2e/single-page/package.json
@@ -25,13 +25,13 @@
     "nativescript-angular": "file:../../nativescript-angular",
     "nativescript-intl": "^3.0.0",
     "reflect-metadata": "~0.1.8",
-    "rxjs": "~6.0.0-rc.1",
+    "rxjs": "~6.3.3",
     "tns-core-modules": "next",
     "zone.js": "^0.8.4"
   },
   "devDependencies": {
     "@angular/compiler-cli": "~7.1.0",
-    "@ngtools/webpack": "~6.2.0-beta.3",
+    "@ngtools/webpack": "~7.1.0",
     "@types/chai": "^4.0.2",
     "@types/mocha": "^5.2.5",
     "@types/node": "^10.12.12",

diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json
@@ -54,8 +54,8 @@
     "@angular/router": "~7.1.0",
     "rxjs": "^6.3.3",
     "tns-core-modules": "^5.0.0 || >5.0.0- || >5.1.0-",
-    "zone.js": "^0.8.26",
-    "typescript": "~3.1.1"
+    "typescript": "~3.1.1",
+    "zone.js": "^0.8.4"
   },
   "devDependencies": {
     "@angular/animations": "~7.1.0",
@@ -73,6 +73,6 @@
     "tns-core-modules": "next",
     "tslint": "^5.5.0",
     "typescript": "~3.1.1",
-    "zone.js": "^0.8.26"
+    "zone.js": "^0.8.4"
   }
 }
diff --git a/ng-sample/package.json b/ng-sample/package.json
@@ -2,10 +2,10 @@
   "nativescript": {
     "id": "org.nativescript.ngsample",
     "tns-android": {
-      "version": "4.1.0-2018.4.16.8"
+      "version": "next"
     },
     "tns-ios": {
-      "version": "4.0.2-2018-04-13-01"
+      "version": "next"
     }
   },
   "name": "tns-template-hello-world",
@@ -32,19 +32,19 @@
   },
   "homepage": "https://github.com/NativeScript/template-hello-world",
   "dependencies": {
-    "@angular/animations": "~6.0.0-rc.3",
-    "@angular/common": "~6.0.0-rc.3",
-    "@angular/compiler": "~6.0.0-rc.3",
-    "@angular/core": "~6.0.0-rc.3",
-    "@angular/forms": "~6.0.0-rc.3",
-    "@angular/http": "~6.0.0-rc.3",
-    "@angular/platform-browser": "~6.0.0-rc.3",
-    "@angular/platform-browser-dynamic": "~6.0.0-rc.3",
-    "@angular/router": "~6.0.0-rc.3",
+    "@angular/animations": "~7.1.0",
+    "@angular/common": "~7.1.0",
+    "@angular/compiler": "~7.1.0",
+    "@angular/core": "~7.1.0",
+    "@angular/forms": "~7.1.0",
+    "@angular/http": "~7.1.0",
+    "@angular/platform-browser": "~7.1.0",
+    "@angular/platform-browser-dynamic": "~7.1.0",
+    "@angular/router": "~7.1.0",
     "nativescript-angular": "file:../nativescript-angular",
-    "rxjs": "~6.0.0-rc.1",
+    "rxjs": "~6.3.3",
     "tns-core-modules": "next",
-    "tns-platform-declarations": "^3.4.0",
+    "tns-platform-declarations": "next",
     "zone.js": "^0.8.4"
   },
   "devDependencies": {

diff --git a/tests/package.json b/tests/package.json
@@ -37,7 +37,7 @@
     "@angular/router": "~7.1.0",
     "nativescript-angular": "../nativescript-angular",
     "nativescript-unit-test-runner": "^0.3.4",
-    "rxjs": "~6.0.0-rc.1",
+    "rxjs": "~6.3.3",
     "tns-core-modules": "next",
     "zone.js": "^0.8.4"
   },
@@ -51,7 +51,7 @@
     "karma-mocha-reporter": "2.2.5",
     "karma-nativescript-launcher": "0.4.0",
     "mocha": "5.2.0",
-    "nativescript-dev-typescript": "~0.7.0",
+    "nativescript-dev-typescript": "~0.7.8",
     "babel-traverse": "6.8.0",
     "babel-types": "6.8.1",
     "babylon": "6.8.0",