Merge pull request #3569 from NativeScript/vladimirov/merge-rel-master

chore: Merge release in master

Author: rosen-vladimirov

PublicAPI.md

@@ -48,6 +48,8 @@ const tns = require("nativescript");
 * [assetsGenerationService](#assetsgenerationservice)
 	* [generateIcons](#generateicons)
 	* [generateSplashScreens](#generatesplashscreens)
+* [androidProcessService](#androidprocessservice)
+	* [getAppProcessId](#getappprocessid)
 
 ## Module projectService
 
@@ -1125,6 +1127,29 @@ tns.assetsGenerationService.generateSplashScreens({ projectDir: "/Users/username
 	});
 ```
 
+## androidProcessService
+The `androidProcessService` exposes methods for getting information about the applications working on Android devices.
+
+### getAppProcessId
+The `getAppProcessId` returns the PID of the specified application. If the app is not running on device, the method will return null.
+
+* Definition
+```TypeScript
+/**
+ * Gets the PID of a running application.
+ * @param deviceIdentifier {string} The identifier of the device.
+ * @param appIdentifier The identifier of the application.
+ * @return {string} Returns the process id matching the application identifier in the device process list.
+ */
+getAppProcessId(deviceIdentifier: string, appIdentifier: string): Promise<string>;
+```
+
+* Usage
+```JavaScript
+tns.androidProcessService.getAppProcessId("4df18f307d8a8f1b", "org.nativescript.demoapp")
+	.then(pid => console.log(`The PID is ${pid}`))
+	.catch(err => console.error(`Error while checking for PID: ${err}`));
+```
 
 
 ## How to add a new method to Public API

docs/man_pages/project/testing/run-ios.md

@@ -8,8 +8,10 @@ position: 11
 Usage | Synopsis
 ---|---
 Run on all connected devices | `$ tns run ios [--release] [--justlaunch] [--bundle [<value>] [--env.*]]`
-Run on a selected connected device. Will start simulator with specified `Device Identifier`, if not already running. | `$ tns run ios [--device <Device ID>] [--release] [--justlaunch] [--bundle [<value>] [--env.*]]`
+Run on a selected connected device. Will start simulator with specified `Device Identifier` or `Device Name`, if not already running. | `$ tns run ios [--device <Device ID>] [--release] [--justlaunch] [--bundle [<value>] [--env.*]]`
 Start an emulator and run the app inside it | `$ tns run ios --emulator [--release] [--bundle [<value>] [--env.*]]`
+Start an emulator with specified device name and sdk | `$ tns run ios [--device <Device Name>] [--sdk <sdk>]`
+Start an emulator with specified device identifier and sdk | `$ tns run ios [--device <Device Identifier>] [--sdk <sdk>]`
 
 Runs your project on a connected iOS device or in the iOS Simulator, if configured. This is shorthand for prepare, build and deploy. While your app is running, prints the output from the application in the console and watches for changes in your code. Once a change is detected, it synchronizes the change with all selected devices and restarts/refreshes the application.
 
@@ -20,6 +22,7 @@ Runs your project on a connected iOS device or in the iOS Simulator, if configur
 ### Options
 * `--device` - Specifies a connected device/simulator to start and run the app.
 * `--emulator` - If set, runs the app in all available and configured ios simulators. It will start a simulator if none are already running.
+* `--sdk` - Specifies the target simulator's sdk.
 * `--justlaunch` - If set, does not print the application output in the console.
 * `--clean` - If set, forces rebuilding the native application.
 * `--no-watch` - If set, changes in your code will not be reflected during the execution of this command.
@@ -30,6 +33,7 @@ Runs your project on a connected iOS device or in the iOS Simulator, if configur
 
 ### Attributes
 * `<Device ID>` is the index or `Device Identifier` of the target device as listed by `$ tns device ios --available-devices`
+* `<Device Name>` is the name of the target simulator as listed by `$ tns device ios --available-devices`
 <% } %>
 <% if(isHtml) { %>
 ### Prerequisites

lib/common

@@ -13,3 +13,25 @@ interface IAndroidPluginBuildService {
 	buildAar(options: IBuildOptions): Promise<boolean>;
 	migrateIncludeGradle(options: IBuildOptions): boolean;
 }
+
+/**
+ * Describes data required for building plugin for Android.
+ * The data can be consumed in the buildAndroidPlugin hook.
+ */
+interface IBuildAndroidPluginData {
+	/**
+	 * Directory where the plugin will be build.
+	 * Usually this is the `<project dir>/platforms/tempPlugin/<plugin name>` dir.
+	 */
+	pluginDir: string;
+
+	/**
+	 * The name of the plugin.
+	 */
+	pluginName: string;
+
+	/**
+	 * Information about tools that will be used to build the plugin, for example compile SDK version, build tools version, etc.
+	 */
+	androidToolsInfo: IAndroidToolsInfoData;
+}

lib/definitions/android-plugin-migrator.d.ts

@@ -58,6 +58,7 @@ export class AnalyticsService extends AnalyticsServiceBase {
 			gaSettings.customDimensions[GoogleAnalyticsCustomDimensions.client] = this.$options.analyticsClient || (isInteractive() ? AnalyticsClients.Cli : AnalyticsClients.Unknown);
 
 			const googleAnalyticsData: IGoogleAnalyticsTrackingInformation = _.merge({ type: TrackingTypes.GoogleAnalyticsData, category: AnalyticsClients.Cli }, gaSettings);
+			this.$logger.trace("Will send the following information to Google Analytics:", googleAnalyticsData);
 			return this.sendMessageToBroker(googleAnalyticsData);
 		}
 	}
@@ -99,8 +100,6 @@ export class AnalyticsService extends AnalyticsServiceBase {
 			customDimensions
 		};
 
-		this.$logger.trace("Will send the following information to Google Analytics:", googleAnalyticsEventData);
-
 		await this.trackInGoogleAnalytics(googleAnalyticsEventData);
 	}
 

lib/services/analytics/analytics-service.ts

@@ -1,12 +1,20 @@
 import * as path from "path";
 import { MANIFEST_FILE_NAME, INCLUDE_GRADLE_NAME, ASSETS_DIR, RESOURCES_DIR } from "../constants";
-import { getShortPluginName } from "../common/helpers";
+import { getShortPluginName, hook } from "../common/helpers";
 import { Builder, parseString } from "xml2js";
 import { ILogger } from "log4js";
 
 export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 
-	constructor(private $fs: IFileSystem,
+	/**
+	 * Required for hooks execution to work.
+	 */
+	private get $hooksService(): IHooksService {
+		return this.$injector.resolve("hooksService");
+	}
+
+	constructor(private $injector: IInjector,
+		private $fs: IFileSystem,
 		private $childProcess: IChildProcess,
 		private $hostInfo: IHostInfo,
 		private $androidToolsInfo: IAndroidToolsInfo,
@@ -240,30 +248,9 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 			}
 
 			// finally build the plugin
-			const gradlew = this.$hostInfo.isWindows ? "gradlew.bat" : "./gradlew";
-			const localArgs = [
-				gradlew,
-				"-p",
-				newPluginDir,
-				"assembleRelease"
-			];
-
 			this.$androidToolsInfo.validateInfo({ showWarningsAsErrors: true, validateTargetSdk: true });
-
 			const androidToolsInfo = this.$androidToolsInfo.getToolsInfo();
-			const compileSdk = androidToolsInfo.compileSdkVersion;
-			const buildToolsVersion = androidToolsInfo.buildToolsVersion;
-			const supportVersion = androidToolsInfo.supportRepositoryVersion;
-
-			localArgs.push(`-PcompileSdk=android-${compileSdk}`);
-			localArgs.push(`-PbuildToolsVersion=${buildToolsVersion}`);
-			localArgs.push(`-PsupportVersion=${supportVersion}`);
-
-			try {
-				await this.$childProcess.exec(localArgs.join(" "), { cwd: newPluginDir });
-			} catch (err) {
-				throw new Error(`Failed to build plugin ${options.pluginName} : \n${err}`);
-			}
+			await this.buildPlugin( { pluginDir: newPluginDir, pluginName: options.pluginName, androidToolsInfo });
 
 			const finalAarName = `${shortPluginName}-release.aar`;
 			const pathToBuiltAar = path.join(newPluginDir, "build", "outputs", "aar", finalAarName);
@@ -318,6 +305,26 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 		return false;
 	}
 
+	@hook("buildAndroidPlugin")
+	private async buildPlugin(pluginBuildSettings: IBuildAndroidPluginData): Promise<void> {
+		const gradlew = this.$hostInfo.isWindows ? "gradlew.bat" : "./gradlew";
+
+		const localArgs = [
+			"-p",
+			pluginBuildSettings.pluginDir,
+			"assembleRelease",
+			`-PcompileSdk=android-${pluginBuildSettings.androidToolsInfo.compileSdkVersion}`,
+			`-PbuildToolsVersion=${pluginBuildSettings.androidToolsInfo.buildToolsVersion}`,
+			`-PsupportVersion=${pluginBuildSettings.androidToolsInfo.supportRepositoryVersion}`
+		];
+
+		try {
+			await this.$childProcess.spawnFromEvent(gradlew, localArgs, "close", { cwd: pluginBuildSettings.pluginDir });
+		} catch (err) {
+			throw new Error(`Failed to build plugin ${pluginBuildSettings.pluginName} : \n${err}`);
+		}
+	}
+
 	private validateOptions(options: IBuildOptions): void {
 		if (!options) {
 			throw new Error("Android plugin cannot be built without passing an 'options' object.");

lib/services/android-plugin-build-service.ts

@@ -125,7 +125,7 @@ export class ProjectDataService implements IProjectDataService {
 
 	private async getIOSAssetSubGroup(dirPath: string): Promise<IAssetSubGroup> {
 		const pathToContentJson = path.join(dirPath, AssetConstants.iOSResourcesFileName);
-		const content = <IAssetSubGroup>this.$fs.readJson(pathToContentJson);
+		const content = this.$fs.exists(pathToContentJson) && <IAssetSubGroup>this.$fs.readJson(pathToContentJson) || { images: [] };
 
 		const imageDefinitions = this.getImageDefinitions().ios;