Merge branch 'release/2.0.0'

* release/2.0.0:
  bump version to 2.0.0
  update dependencies
  update demo app to ns7
  Update plugin src to ns7

README.md

@@ -14,8 +14,8 @@ tns plugin add nativescript-qr-generator
 
 	```typescript
     import { Component } from "@angular/core";
-    import { ImageSource } from "tns-core-modules/image-source";
-    import { Image } from "tns-core-modules/ui/image";
+    import { ImageSource } from "@nativescript/core";
+    import { Image } from "@nativescript/core";
     import { QrGenerator } from "nativescript-qr-generator";
 
     @Component({

demo-angular/nativescript.config.ts

@@ -0,0 +1,11 @@
+import { NativeScriptConfig } from '@nativescript/core'
+
+export default {
+  id: 'org.nativescript.demoangular',
+  appResourcesPath: 'App_Resources',
+  android: {
+    v8Flags: '--expose_gc',
+    markingMode: 'none',
+  },
+  appPath: 'src',
+} as NativeScriptConfig

demo-angular/package.json

@@ -1,39 +1,33 @@
 {
-  "nativescript": {
-    "id": "org.nativescript.demoangular",
-    "tns-android": {
-      "version": "6.3.1"
-    },
-    "tns-ios": {
-      "version": "6.3.0"
-    }
-  },
   "description": "NativeScript Application",
   "license": "SEE LICENSE IN <your-license-filename>",
   "repository": "<fill-your-repository-here>",
   "dependencies": {
-    "@angular/animations": "~8.2.0",
-    "@angular/common": "~8.2.0",
-    "@angular/compiler": "~8.2.0",
-    "@angular/core": "~8.2.0",
-    "@angular/forms": "~8.2.0",
-    "@angular/platform-browser": "~8.2.0",
-    "@angular/platform-browser-dynamic": "~8.2.0",
-    "@angular/router": "~8.2.0",
+    "@angular/animations": "~10.0.0",
+    "@angular/common": "~10.0.0",
+    "@angular/compiler": "~10.0.0",
+    "@angular/core": "~10.0.0",
+    "@angular/forms": "~10.0.0",
+    "@angular/platform-browser": "~10.0.0",
+    "@angular/platform-browser-dynamic": "~10.0.0",
+    "@angular/router": "~10.0.0",
     "@nativescript/theme": "~2.2.1",
-    "nativescript-angular": "~8.20.3",
     "nativescript-qr-generator": "file:../src",
     "reflect-metadata": "~0.1.12",
     "rxjs": "^6.4.0",
-    "tns-core-modules": "~6.3.0",
-    "zone.js": "~0.9.1"
+    "zone.js": "~0.9.1",
+    "@nativescript/core": "7.0.0",
+    "@nativescript/webpack": "3.0.0",
+    "@nativescript/angular": "10.0.0"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "~8.2.0",
-    "@ngtools/webpack": "~8.2.0",
-    "nativescript-dev-webpack": "~1.4.0",
-    "typescript": "~3.5.3"
+    "@angular/compiler-cli": "~10.0.0",
+    "@nativescript/android": "7.0.0",
+    "@nativescript/ios": "7.0.0",
+    "@ngtools/webpack": "~10.0.0",
+    "typescript": "3.9.7"
   },
   "gitHead": "fa98f785df3fba482e5e2a0c76f4be1fa6dc7a14",
-  "readme": "NativeScript Application"
+  "readme": "NativeScript Application",
+  "main": "main.js"
 }

demo-angular/src/app/app-routing.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from "@angular/core";
 import { Routes } from "@angular/router";
-import { NativeScriptRouterModule } from "nativescript-angular/router";
+import { NativeScriptRouterModule } from "@nativescript/angular";
 
 const routes: Routes = [
     { path: "", redirectTo: "/home", pathMatch: "full" },

demo-angular/src/app/app.module.ts

@@ -1,5 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptModule } from "@nativescript/angular";
 
 import { AppRoutingModule } from "./app-routing.module";
 import { AppComponent } from "./app.component";

demo-angular/src/app/home/home-routing.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from "@angular/core";
 import { Routes } from "@angular/router";
-import { NativeScriptRouterModule } from "nativescript-angular/router";
+import { NativeScriptRouterModule } from "@nativescript/angular";
 
 import { HomeComponent } from "./home.component";
 

demo-angular/src/app/home/home.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit } from "@angular/core";
 import { QrGenerator } from 'nativescript-qr-generator';
-import { ImageSource } from "tns-core-modules/image-source";
-import { Image } from "tns-core-modules/ui/image";
+import { ImageSource } from "@nativescript/core";
+import { Image } from "@nativescript/core";
 
 @Component({
     selector: "Home",

demo-angular/src/app/home/home.module.ts

@@ -1,5 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptCommonModule } from "nativescript-angular/common";
+import { NativeScriptCommonModule } from "@nativescript/angular";
 
 import { HomeRoutingModule } from "./home-routing.module";
 import { HomeComponent } from "./home.component";

demo-angular/src/main.ts

@@ -1,5 +1,5 @@
 // this import should be first in order to load some required settings (like globals and reflect-metadata)
-import { platformNativeScriptDynamic } from "nativescript-angular/platform";
+import { platformNativeScriptDynamic } from "@nativescript/angular";
 
 import { AppModule } from "./app/app.module";
 

demo-angular/tsconfig.json

@@ -1,7 +1,7 @@
 {
 	"compilerOptions": {
-		"module": "commonjs",
-		"target": "es5",
+		"module": "esnext",
+		"target": "es2017",
 		"experimentalDecorators": true,
 		"emitDecoratorMetadata": true,
 		"noEmitHelpers": true,
@@ -10,7 +10,8 @@
 		"lib": [
 			"es6",
 			"dom",
-			"es2015.iterable"
+			"es2015.iterable",
+			"es2017"
 		],
 		"baseUrl": ".",
 		"paths": {
@@ -20,7 +21,9 @@
 			"*": [
 				"./node_modules/*"
 			]
-		}
+		},
+		"moduleResolution": "node",
+		"removeComments": false
 	},
 	"exclude": [
 		"node_modules",