Merge pull request #4488 from NativeScript/tachev/merge-release-into-master

Merge release into master

Author: Dimitar Tachev

PublicAPI.md

@@ -58,6 +58,10 @@ const tns = require("nativescript");
 * [devicesService](#devicesservice)
 	* [getEmulatorImages](#getemulatorimages)
 	* [startEmulator](#startemulator)
+	* [startDeviceDetectionInterval](#startdevicedetectioninterval)
+	* [stopDeviceDetectionInterval](#stopdevicedetectioninterval)
+	* [startEmulatorDetectionInterval](#startemulatordetectioninterval)
+	* [stopEmulatorDetectionInterval](#stopemulatordetectioninterval)
 * [deviceEmitter](#deviceemitter)
 	* [events](#deviceemitterevents)
 * [previewDevicesService](#previewdevicesservice)
@@ -1287,6 +1291,59 @@ tns.devicesService.startEmulator({imageIdentifier: "my emulator imageIdentifier"
 	.then(errors => { });
 ```
 
+### startDeviceDetectionInterval
+Starts device detection interval, which is run on specified number of seconds. This allows detection of new attached devices, started emulators/simulators, detection when device/emulator/simulator is disconnected, etc.
+> NOTE: The interval is started automatically when you call `devicesService.initialize` without passing `skipDeviceDetectionInterval: true`.
+
+> NOTE: iOS Device detection interval cannot be stopped, so once started, it will always report connected/disconnected devices.
+
+* Definition
+```TypeScript
+startDeviceDetectionInterval({ detectionInterval?: number, platform?: string }): void
+```
+
+* Usage
+```JavaScript
+tns.devicesService.startDeviceDetectionInterval({ detectionInterval: 1000 });
+```
+
+### stopDeviceDetectionInterval
+Stops device detection interval started by `devicesService.initialize` or `devicesService.startDeviceDetectionInterval`.
+* Definition
+```TypeScript
+stopDeviceDetectionInterval(): void
+```
+
+* Usage
+```JavaScript
+tns.devicesService.stopDeviceDetectionInterval();
+```
+
+### startEmulatorDetectionInterval
+Starts emulator images detection interval, which is run on specified number of seconds. This allows detection of new installed emulator/simulator images.
+
+* Definition
+```TypeScript
+startEmulatorDetectionInterval({ detectionInterval?: number }): void
+```
+
+* Usage
+```JavaScript
+tns.devicesService.startEmulatorDetectionInterval({ detectionInterval: 1000 });
+```
+
+### stopEmulatorDetectionInterval
+Stops device detection interval started by `devicesService.startEmulatorDetectionInterval`.
+* Definition
+```TypeScript
+stopEmulatorDetectionInterval(): void
+```
+
+* Usage
+```JavaScript
+tns.devicesService.stopEmulatorDetectionInterval();
+```
+
 ## deviceEmitter
 This module is used to emit information for devices, applications on them, etc.
 

lib/common/bootstrap.ts

@@ -6,6 +6,7 @@ $injector.require("errors", "./errors");
 $injector.requirePublic("fs", "./file-system");
 $injector.require("hostInfo", "./host-info");
 $injector.require("osInfo", "./os-info");
+$injector.require("timers", "./timers");
 
 $injector.require("dispatcher", "./dispatchers");
 $injector.require("commandDispatcher", "./dispatchers");

lib/common/child-process.ts

@@ -9,7 +9,7 @@ export class ChildProcess extends EventEmitter implements IChildProcess {
 
 	public async exec(command: string, options?: any, execOptions?: IExecOptions): Promise<any> {
 		return new Promise<any>((resolve, reject) => {
-			const callback = (error: Error, stdout: NodeBuffer, stderr: NodeBuffer) => {
+			const callback = (error: Error, stdout: string | NodeBuffer, stderr: string | NodeBuffer) => {
 				this.$logger.trace("Exec %s \n stdout: %s \n stderr: %s", command, stdout.toString(), stderr.toString());
 
 				if (error) {
@@ -33,7 +33,7 @@ export class ChildProcess extends EventEmitter implements IChildProcess {
 		this.$logger.debug("execFile: %s %s", command, this.getArgumentsAsQuotedString(args));
 
 		return new Promise<any>((resolve, reject) => {
-			child_process.execFile(command, args, (error: any, stdout: NodeBuffer) => {
+			child_process.execFile(command, args, (error: any, stdout: string | NodeBuffer) => {
 				if (error) {
 					reject(error);
 				} else {

lib/common/declarations.d.ts

@@ -992,6 +992,18 @@ interface ISysInfo {
  	 */
 	getJavaCompilerVersion(): Promise<string>;
 
+	/**
+	 * Gets JAVA version based on the executable in PATH.
+	 * @return {Promise<string>}
+	 */
+	getJavaVersionFromPath(): Promise<string>;
+
+	/**
+	 * Gets JAVA version based on the JAVA from JAVA_HOME.
+	 * @return {Promise<string>}
+	 */
+	getJavaVersionFromJavaHome(): Promise<string>;
+
 	/**
 	 * Gets all global warnings for the current environment, for example Node.js version compatibility, OS compatibility, etc.
 	 * @return {Promise<ISystemWarning[]>} All warnings. Empty array is returned in case the system is setup correctly.

lib/common/definitions/cli-global.d.ts

@@ -1,11 +1,12 @@
+declare var _: _.LoDashStatic;
 /**
  * Defines additional properties added to global object from CLI.
  */
 interface ICliGlobal extends NodeJS.Global {
 	/**
 	 * Lodash instance.
 	 */
-	_: any;
+	_: _.LoDashStatic;
 
 	/**
 	 * Global instance of the module used for dependency injection.