Merge pull request #77 from triniwiz/v6

V6

.gitignore

@@ -34,3 +34,4 @@ package-lock.json
 !src/platforms/android/*.aar
 !src/vue/*.js
 native-src/imagecacheit/build/
+*.metadata.json

README.md

@@ -10,10 +10,15 @@
 
 ## Install
 
-#### NativeScript 4x
+#### NativeScript 6.5x
 
 * `tns plugin add nativescript-image-cache-it`
 
+
+#### NativeScript 4x
+
+* `tns plugin add [email protected]`
+
 #### NativeScript 3x
 
 * `tns plugin add [email protected]`

demo-ng/package.json

@@ -6,37 +6,41 @@
   "nativescript": {
     "id": "org.nativescript.demong",
     "tns-android": {
-      "version": "6.1.2"
+      "version": "6.5.0"
     },
     "tns-ios": {
-      "version": "6.1.1"
+      "version": "6.5.0"
     }
   },
   "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",
-    "nativescript-angular": "^8.2.1",
+    "@angular/animations": "~9.1.0",
+    "@angular/common": "~9.1.0",
+    "@angular/compiler": "~9.1.0",
+    "@angular/core": "~9.1.0",
+    "@angular/forms": "~9.1.0",
+    "@angular/platform-browser": "~9.1.0",
+    "@angular/platform-browser-dynamic": "~9.1.0",
+    "@angular/router": "~9.1.0",
+    "@nativescript/angular": "^9.0.0",
+    "@nativescript/core": "^6.5.5",
     "nativescript-image-cache-it": "file:../src",
     "nativescript-theme-core": "~1.0.4",
     "reflect-metadata": "~0.1.8",
-    "rxjs": "^6.4.0",
-    "tns-core-modules": "^6.1.1",
-    "zone.js": "^0.9.1"
+    "rxjs": "~6.5.5",
+    "zone.js": "^0.10.3"
+  },
+  "scripts": {
+    "ngcc": "ngcc --properties es2015 module main --first-only",
+    "postinstall": "npm run ngcc"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "~8.2.0",
-    "@ngtools/webpack": "~8.2.0",
+    "@angular/compiler-cli": "~9.1.0",
+    "@ngtools/webpack": "~9.1.0",
     "babel-traverse": "6.26.0",
     "babel-types": "6.26.0",
     "babylon": "6.18.0",
     "lazy": "1.0.11",
     "nativescript-dev-webpack": "^1.5.1",
-    "typescript": "~3.5.3"
+    "typescript": "~3.8.3"
   }
 }

demo-ng/src/App_Resources/iOS/Media.xcassets/broken.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "broken.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

demo-ng/src/App_Resources/iOS/Media.xcassets/fallback.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "fallback.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

demo-ng/src/App_Resources/iOS/Media.xcassets/hourglass.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "hourglass.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

demo-ng/src/App_Resources/iOS/Media.xcassets/law.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "law.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

demo-ng/src/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';
 import { AppComponent } from './app.component';
 

demo-ng/src/app.routing.ts

@@ -1,5 +1,5 @@
 import { NgModule } from "@angular/core";
-import { NativeScriptRouterModule } from "nativescript-angular/router";
+import { NativeScriptRouterModule } from "@nativescript/angular";
 import { Routes } from "@angular/router";
 
 import { ItemsComponent } from "./item/items.component";
@@ -15,4 +15,4 @@ const routes: Routes = [
     imports: [NativeScriptRouterModule.forRoot(routes)],
     exports: [NativeScriptRouterModule]
 })
-export class AppRoutingModule { }
+export class AppRoutingModule { }