Merge pull request #11 from GeoTecINIT/NS7Migration

Ns7 Support

Author: agonper

README.md

@@ -40,12 +40,19 @@ android {
 
 ## Installation
 
-Run the following command in your project's root folder:
+Run the following command in your project's root folder.
+
+NS7+:
 
 ```javascript
 tns plugin add nativescript-context-apis
 ```
 
+NS6:
+```javascript
+tns plugin add nativescript-context-apis@1.0.3
+```
+
 (Optional) You'll need RxJS also to properly work with geolocation streams
 
 ```javascript

azure-pipelines.yml

@@ -7,7 +7,7 @@ trigger:
       - v*
 pr:
   - master
-  
+
 
 pool:
   vmImage: 'macos-latest'
@@ -19,7 +19,7 @@ steps:
   displayName: 'Install Node.js'
 
 - script: |
-    echo no | npm install -g nativescript@6.8.0
+    echo no | npm install -g nativescript@7
     tns usage-reporting disable
     tns error-reporting disable
   displayName: 'Install NativeScript CLI'

demo/app/app.ts

@@ -1,9 +1,9 @@
-import * as app from "tns-core-modules/application";
+import { Application } from "@nativescript/core";
 import { contextApis } from "nativescript-context-apis";
 
 contextApis.init();
 
-app.run({ moduleName: "app-root" });
+Application.run({ moduleName: "app-root" });
 
 /*
 Do not place any code after the application has been started as it will not

demo/app/home/home-page.ts

@@ -4,12 +4,7 @@ a code-behind file. The code-behind is a great place to place your view
 logic, and to set up your page’s data binding.
 */
 
-import { NavigatedData, Page } from "tns-core-modules/ui/page";
-import {
-    on,
-    resumeEvent,
-    suspendEvent,
-} from "tns-core-modules/application/application";
+import { NavigatedData, Page, Application } from "@nativescript/core";
 
 import { HomeViewModel } from "./home-view-model";
 
@@ -31,7 +26,7 @@ export function onNavigatingTo(args: NavigatedData) {
 
     let locationSubscription: Subscription;
 
-    on(resumeEvent, () => {
+    Application.on(Application.resumeEvent, () => {
         if (!_preparing) {
             printCurrentLocation().catch((err) => {
                 console.error(`Could not print current location: ${err}`);
@@ -46,7 +41,7 @@ export function onNavigatingTo(args: NavigatedData) {
         listenToActivityChanges();
     });
 
-    on(suspendEvent, () => {
+    Application.on(Application.suspendEvent, () => {
         if (locationSubscription) {
             locationSubscription.unsubscribe();
         }

demo/app/home/home-view-model.ts

@@ -1,4 +1,4 @@
-import { Observable } from "tns-core-modules/data/observable";
+import { Observable } from "@nativescript/core";
 
 export class HomeViewModel extends Observable {
     constructor() {

demo/app/tests/internal/activity-recognition/index.ts

@@ -1,4 +1,4 @@
-import { android as androidApp } from "tns-core-modules/application/application";
+import { Application } from "@nativescript/core";
 import {
     getActivityRecognizer,
     Resolution,
@@ -9,7 +9,7 @@ import { AndroidMediumResRecognizer } from "nativescript-context-apis/internal/a
 describe("Activity recognition module", () => {
     it("returns a low res recognizer when asked", () => {
         const lowResRecognizer = getActivityRecognizer(Resolution.LOW);
-        if (androidApp) {
+        if (Application.android) {
             expect(lowResRecognizer).toBeInstanceOf(AndroidLowResRecognizer);
         } else {
             expect(lowResRecognizer).not.toBeNull();
@@ -18,7 +18,7 @@ describe("Activity recognition module", () => {
 
     it("returns a medium res recognizer when asked", () => {
         const mediumResRecognizer = getActivityRecognizer(Resolution.MEDIUM);
-        if (androidApp) {
+        if (Application.android) {
             expect(mediumResRecognizer).toBeInstanceOf(
                 AndroidMediumResRecognizer
             );

demo/app/tests/internal/geolocation/provider.ts

@@ -126,7 +126,7 @@ describe("Geolocation provider", () => {
                 onChange(locations[i]);
                 i++;
             });
-            return intervalId;
+            return (intervalId as unknown) as number;
         });
         spyOn(adapter, "stopListening").and.callFake((listenerId) => {
             clearInterval(listenerId);

demo/nativescript.config.ts

@@ -0,0 +1,17 @@
+import { NativeScriptConfig } from '@nativescript/core';
+
+export default {
+    id: 'org.nativescript.demo',
+    main: './app/app.js',
+    appResourcesPath: './app/App_Resources',
+    webpackConfigPath: 'webpack.config.js',
+    ios: {
+        discardUncaughtJsExceptions: true
+    },
+    android: {
+        discardUncaughtJsExceptions: true,
+        v8Flags: '--nolazy --expose_gc',
+        "markingMode": "none",
+        "suppressCallJSMethodExceptions": false
+    }
+} as NativeScriptConfig;