Merge pull request #30 from GeoTecINIT/migrate-ns8

Migrate to NS8

Author: agonper

azure-pipelines.yml

@@ -52,4 +52,4 @@ steps:
   condition: succeededOrFailed()
   inputs:
     testResultsFormat: 'JUnit'
-    testResultsFiles: 'demo/test-reports/**/report.xml'
+    testResultsFiles: 'demo/app/test-reports/**/report.xml'

ci-tools/wait-for-emulator.sh

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 
 # Install AVD files
-echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --install 'system-images;android-30;google_apis;x86'
+echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --install 'system-images;android-27;google_apis;x86'
 
 # Create emulator
-echo "no" | $ANDROID_HOME/cmdline-tools/latest/bin/avdmanager create avd -n xamarin_android_emulator -k 'system-images;android-30;google_apis;x86' --force
+echo "no" | $ANDROID_HOME/cmdline-tools/latest/bin/avdmanager create avd -n xamarin_android_emulator -k 'system-images;android-27;google_apis;x86' --force
 
 $ANDROID_HOME/emulator/emulator -list-avds
 

demo/.gitignore

@@ -16,6 +16,7 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 test-reports
+coverage
 
 # General
 .DS_Store

demo/app/App_Resources/Android/app.gradle

@@ -10,12 +10,8 @@
 // create a file named before-plugins.gradle in the current directory and place it there
 
 android {
-  // todo: remove once ndk 23+ is supported
-  ndkVersion "22.1.7171670"
-  compileSdkVersion 30
   defaultConfig {
     minSdkVersion 22
-    targetSdkVersion 30
     generatedDensities = []
   }
   aaptOptions {

demo/app/App_Resources/Android/src/main/AndroidManifest.xml

@@ -37,7 +37,8 @@
 			android:name="com.tns.NativeScriptActivity"
 			android:label="@string/title_activity_kimera"
 			android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|locale|uiMode"
-			android:theme="@style/LaunchScreenTheme">
+			android:theme="@style/LaunchScreenTheme"
+			android:exported="true">
 
 			<meta-data android:name="SET_THEME_ON_LAUNCH" android:resource="@style/AppTheme" />
 

demo/app/app.css

@@ -1,5 +1,5 @@
-@import "~@nativescript/theme/css/core.css";
-@import "~@nativescript/theme/css/blue.css";
+@import "@nativescript/theme/css/core.css";
+@import "@nativescript/theme/css/blue.css";
 
 /* Place any CSS rules you want to apply on both iOS and Android here.
 This is where the vast majority of your CSS code goes. */

demo/app/home/home-page.ts

@@ -21,39 +21,39 @@ export function onNavigatingTo(args: NavigatedData) {
 
     page.bindingContext = new HomeViewModel();
 
+    let preparing = true;
     let locationSubscription: Subscription;
-
     Application.on(Application.resumeEvent, () => {
-        if (!_preparing) {
+        if (!preparing) {
             printCurrentLocation().catch((err) => {
                 console.error(`Could not print current location: ${err}`);
-            });
-            printLocationUpdates()
+            }).then(() => printLocationUpdates()
                 .then((subscription) => (locationSubscription = subscription))
                 .catch(
                     (err) =>
-                        `An error occurred while getting location updates: ${err}`
-                );
+                        `An error occurred while getting location updates: ${err}`)
+            ).then(() => listenToActivityChanges());
         }
-        listenToActivityChanges();
     });
 
     Application.on(Application.suspendEvent, () => {
-        if (locationSubscription) {
-            locationSubscription.unsubscribe();
+        if (!preparing) {
+            if (locationSubscription) {
+                locationSubscription.unsubscribe();
+            }
+            stopListeningToChanges();
         }
-        stopListeningToChanges();
     });
 
     printCurrentLocation().catch((err) => {
         console.error(`Could not print current location: ${err}`);
-    });
-    printLocationUpdates()
+    }).then(() => printLocationUpdates()
         .then((subscription) => (locationSubscription = subscription))
         .catch(
             (err) => `An error occurred while getting location updates: ${err}`
-        );
-    listenToActivityChanges(true);
+        )
+    ).then(() => listenToActivityChanges(true))
+        .then(() => preparing = false);
 }
 
 async function printCurrentLocation() {
@@ -90,14 +90,16 @@ async function printLocationUpdates(): Promise<Subscription> {
     });
 }
 
-export function listenToActivityChanges(addListener = false) {
-    activityRecognizers.forEach((recognizerType) => {
-        listenToActivityChangesFor(recognizerType, addListener).catch((err) => {
+export async function listenToActivityChanges(addListener = false) {
+    for (const recognizerType of activityRecognizers) {
+        try {
+            await listenToActivityChangesFor(recognizerType, addListener);
+        } catch (err) {
             console.error(
                 `An error occurred while listening to ${recognizerType} res activity changes: ${JSON.stringify(err)}`
             );
-        });
-    });
+        }
+    }
 }
 
 function stopListeningToChanges() {

demo/app/package.json

@@ -0,0 +1,11 @@
+import { runTestApp } from "@nativescript/unit-test-runner";
+// import other polyfills here
+
+declare let require: any;
+
+runTestApp({
+    runTests: () => {
+        const tests = require.context("./", true, /\.spec\.ts$/);
+        tests.keys().map(tests);
+    },
+});

demo/app/test.ts

@@ -1,106 +1,98 @@
 module.exports = function (config) {
   const options = {
+
     // base path that will be used to resolve all patterns (eg. files, exclude)
-    basePath: "",
+    basePath: 'app',
+
 
     // frameworks to use
     // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
-    frameworks: ["jasmine"],
+    frameworks: ['jasmine'],
+
+
+    // list of files / patterns to load in the browser. Leave empty for webpack projects
+    // files: [],
 
-    // list of files / patterns to load in the browser
-    files: ["app/tests/**/*.ts"],
 
     // list of files to exclude
-    exclude: [],
+    exclude: [
+    ],
+
 
     // preprocess matching files before serving them to the browser
     // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
-    preprocessors: {},
+    preprocessors: {
+    },
+
 
     // test results reporter to use
     // possible values: 'dots', 'progress'
     // available reporters: https://npmjs.org/browse/keyword/karma-reporter
-    reporters: ["progress", "junit"],
+    reporters: ['progress', 'junit'],
+
+    // configure optional coverage, enable via --env.codeCoverage
+    coverageReporter: {
+      dir: require('path').join(__dirname, './coverage'),
+      subdir: '.',
+      reporters: [
+        { type: 'html' },
+        { type: 'text-summary' }
+      ]
+    },
+
+    // web server hostname
+    hostname: '127.0.0.1',
 
     // web server port
     port: 9876,
 
+
     // enable / disable colors in the output (reporters and logs)
     colors: true,
 
+
     // level of logging
     // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
     logLevel: config.LOG_INFO,
 
+
     // enable / disable watching file and executing tests whenever any file changes
     autoWatch: true,
 
+
     // start these browsers
     // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
     browsers: [],
 
     customLaunchers: {
       android: {
-        base: "NS",
-        platform: "android",
+        base: 'NS',
+        platform: 'android'
       },
       ios: {
-        base: "NS",
-        platform: "ios",
+        base: 'NS',
+        platform: 'ios'
       },
       ios_simulator: {
-        base: "NS",
-        platform: "ios",
-        arguments: ["--emulator"],
-      },
+        base: 'NS',
+        platform: 'ios',
+        arguments: ['--emulator']
+      }
     },
 
     // Continuous Integration mode
     // if true, Karma captures browsers, runs the tests and exits
     singleRun: false,
 
     junitReporter: {
-      outputDir: "test-reports",
-      outputFile: "report.xml",
+      outputDir: 'test-reports',
+      outputFile: 'report.xml',
     },
   };
 
-  setWebpackPreprocessor(config, options);
-  setWebpack(config, options);
-
-  config.set(options);
-};
-
-function setWebpackPreprocessor(config, options) {
-  if (config && config.bundle) {
-    if (!options.preprocessors) {
-      options.preprocessors = {};
-    }
-
-    options.files.forEach((file) => {
-      if (!options.preprocessors[file]) {
-        options.preprocessors[file] = [];
-      }
-      options.preprocessors[file].push("webpack");
-    });
+  if(config._NS && config._NS.env && config._NS.env.codeCoverage) {
+    options.reporters = (options.reporters || []).concat(['coverage']);
   }
-}
 
-function setWebpack(config, options) {
-  if (config && config.bundle) {
-    const env = {};
-    env[config.platform] = true;
-    env.sourceMap = config.debugBrk;
-    env.appPath = config.appPath;
-    options.webpack = require("./webpack.config")(env);
-    delete options.webpack.entry;
-    delete options.webpack.output.libraryTarget;
-    const invalidPluginsForUnitTesting = [
-      "GenerateBundleStarterPlugin",
-      "GenerateNativeScriptEntryPointsPlugin",
-    ];
-    options.webpack.plugins = options.webpack.plugins.filter(
-      (p) => !invalidPluginsForUnitTesting.includes(p.constructor.name)
-    );
-  }
+  config.set(options);
 }

demo/app/tests/internal/activity-recognition/index.ts renamed to demo/app/tests/internal/activity-recognition/index.spec.ts

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