From 6e2e0a1c79f1325d87c95405e6af2867b0a8c962 Mon Sep 17 00:00:00 2001
From: sis0k0 <stanimira.vlaeva@gmail.com>
Date: Tue, 22 May 2018 16:20:49 +0300
Subject: [PATCH 1/2] chore: update Angular dependencies to 6.0.0 official

---
 nativescript-angular/package.json | 48 +++++++++++++++----------------
 nativescript-angular/tslint.json  |  1 -
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json
index ff068f37f..37fc0bfc6 100644
--- a/nativescript-angular/package.json
+++ b/nativescript-angular/package.json
@@ -44,37 +44,35 @@
     "reflect-metadata": "^0.1.8"
   },
   "peerDependencies": {
-    "@angular/platform-browser-dynamic": "~6.0.0-rc.0",
-    "@angular/common": "~6.0.0-rc.0",
-    "@angular/compiler": "~6.0.0-rc.0",
-    "@angular/core": "~6.0.0-rc.0",
-    "@angular/forms": "~6.0.0-rc.0",
-    "@angular/http": "~6.0.0-rc.0",
-    "@angular/platform-browser": "~6.0.0-rc.0",
-    "@angular/router": "~6.0.0-rc.0",
-    "rxjs": "~6.0.0-rc.1 || >=6.1.0 || >=6.0.0",
-    "rxjs-compat": "~6.0.0-rc.1 || >=6.1.0 || >=6.0.0",
+    "@angular/platform-browser-dynamic": "~6.0.0",
+    "@angular/common": "~6.0.0",
+    "@angular/compiler": "~6.0.0",
+    "@angular/core": "~6.0.0",
+    "@angular/forms": "~6.0.0",
+    "@angular/http": "~6.0.0",
+    "@angular/platform-browser": "~6.0.0",
+    "@angular/router": "~6.0.0",
+    "rxjs": "~6.0.0 || >=6.1.0 || >=6.0.0",
     "tns-core-modules": "^4.0.0 || >4.0.0- || >4.1.0-",
-    "zone.js": "^0.8.4",
+    "zone.js": "^0.8.26",
     "typescript": "~2.7.2"
   },
   "devDependencies": {
-    "@angular/animations": "~6.0.0-rc.0",
-    "@angular/common": "~6.0.0-rc.0",
-    "@angular/compiler": "~6.0.0-rc.0",
-    "@angular/compiler-cli": "~6.0.0-rc.0",
-    "@angular/core": "~6.0.0-rc.0",
-    "@angular/forms": "~6.0.0-rc.0",
-    "@angular/http": "~6.0.0-rc.0",
-    "@angular/platform-browser": "~6.0.0-rc.0",
-    "@angular/platform-browser-dynamic": "~6.0.0-rc.0",
-    "@angular/router": "~6.0.0-rc.0",
-    "codelyzer": "^4.0.0",
-    "rxjs": "~6.0.0-rc.1",
-    "rxjs-compat": "~6.0.0-rc.1",
+    "@angular/animations": "~6.0.0",
+    "@angular/common": "~6.0.0",
+    "@angular/compiler": "~6.0.0",
+    "@angular/compiler-cli": "~6.0.0",
+    "@angular/core": "~6.0.0",
+    "@angular/forms": "~6.0.0",
+    "@angular/http": "~6.0.0",
+    "@angular/platform-browser": "~6.0.0",
+    "@angular/platform-browser-dynamic": "~6.0.0",
+    "@angular/router": "~6.0.0",
+    "codelyzer": "^4.3.0",
+    "rxjs": "~6.1.0",
     "tns-core-modules": "next",
     "tslint": "^5.5.0",
     "typescript": "~2.7.2",
-    "zone.js": "^0.8.12"
+    "zone.js": "^0.8.26"
   }
 }
diff --git a/nativescript-angular/tslint.json b/nativescript-angular/tslint.json
index b9630d813..161f8e9d4 100644
--- a/nativescript-angular/tslint.json
+++ b/nativescript-angular/tslint.json
@@ -13,7 +13,6 @@
     "pipe-naming": [true, "camelCase", "ns"],
     "component-class-suffix": true,
     "directive-class-suffix": true,
-    "invoke-injectable": true,
     "member-access": false,
     "no-any": false,
     "no-inferrable-types": false,

From 05a21252a7ecebc26480b9ec085882ab5500cd41 Mon Sep 17 00:00:00 2001
From: sis0k0 <stanimira.vlaeva@gmail.com>
Date: Tue, 22 May 2018 19:11:01 +0300
Subject: [PATCH 2/2] refactor: fix rxjs version

---
 nativescript-angular/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json
index 37fc0bfc6..0d9c85f8f 100644
--- a/nativescript-angular/package.json
+++ b/nativescript-angular/package.json
@@ -52,7 +52,7 @@
     "@angular/http": "~6.0.0",
     "@angular/platform-browser": "~6.0.0",
     "@angular/router": "~6.0.0",
-    "rxjs": "~6.0.0 || >=6.1.0 || >=6.0.0",
+    "rxjs": "~6.0.0 || >=6.1.0",
     "tns-core-modules": "^4.0.0 || >4.0.0- || >4.1.0-",
     "zone.js": "^0.8.26",
     "typescript": "~2.7.2"