feat: many new android features

lib/commands/build.ts

@@ -52,7 +52,11 @@ export abstract class BuildCommandBase extends ValidatePlatformCommandBase {
 		const buildData = this.$buildDataService.getBuildData(
 			this.$projectData.projectDir,
 			platform,
-			this.$options
+			{
+				...this.$options.argv,
+				// we disable buildFilterDevicesArch for build only to ensure we dont use it in production builds
+				buildFilterDevicesArch: false,
+			}
 		);
 		const outputPath = await this.$buildController.prepareAndBuild(buildData);
 

lib/commands/clean.ts

@@ -6,6 +6,7 @@ import {
 	IProjectCleanupResult,
 	IProjectCleanupService,
 	IProjectConfigService,
+	IProjectData,
 	IProjectService,
 } from "../definitions/project";
 
@@ -83,6 +84,7 @@ export class CleanCommand implements ICommand {
 	constructor(
 		private $projectCleanupService: IProjectCleanupService,
 		private $projectConfigService: IProjectConfigService,
+		private $projectData: IProjectData,
 		private $terminalSpinnerService: ITerminalSpinnerService,
 		private $projectService: IProjectService,
 		private $prompter: IPrompter,
@@ -108,7 +110,7 @@ export class CleanCommand implements ICommand {
 
 		let pathsToClean = [
 			constants.HOOKS_DIR_NAME,
-			constants.PLATFORMS_DIR_NAME,
+			this.$projectData.getBuildRelativeDirectoryPath(),
 			constants.NODE_MODULES_FOLDER_NAME,
 			constants.PACKAGE_LOCK_JSON_FILE_NAME,
 		];

lib/commands/config.ts

@@ -4,19 +4,26 @@ import { IProjectConfigService } from "../definitions/project";
 import { SupportedConfigValues } from "../tools/config-manipulation/config-transformer";
 import { IErrors } from "../common/declarations";
 import { color } from "../color";
+import { IOptions } from "../declarations";
 
 export class ConfigListCommand implements ICommand {
 	public allowedParameters: ICommandParameter[] = [];
 
 	constructor(
 		private $projectConfigService: IProjectConfigService,
+		private $options: IOptions,
 		private $logger: ILogger
 	) {}
 
 	public async execute(args: string[]): Promise<void> {
 		try {
 			const config = this.$projectConfigService.readConfig();
-			this.$logger.info(this.getValueString(config as SupportedConfigValues));
+			if (this.$options.json) {
+				console.log(JSON.stringify(config))
+			} else {
+				this.$logger.info(this.getValueString(config as SupportedConfigValues));
+
+			}
 		} catch (error) {
 			this.$logger.info("Failed to read config. Error is: ", error);
 		}

lib/commands/typings.ts

@@ -67,7 +67,7 @@ export class TypingsCommand implements ICommand {
 
 		const dtsGeneratorPath = path.resolve(
 			this.$projectData.projectDir,
-			"platforms",
+			this.$projectData.getBuildRelativeDirectoryPath(),
 			"android",
 			"build-tools",
 			"dts-generator.jar"

lib/common/declarations.d.ts

@@ -1276,6 +1276,11 @@ interface IDashedOption {
 	 * Specifies either a single option key (string), or an array of options that must be followed by option values.
 	 */
 	requiresArg?: any;
+
+	/**
+	 * Set to true to define the option as an array option https://github.com/yargs/yargs/blob/main/docs/api.md#array
+	 */
+	array?: any;
 }
 
 /**

lib/common/definitions/mobile.d.ts

@@ -99,6 +99,12 @@ declare global {
 			 * For iOS simulators - same as the identifier.
 			 */
 			imageIdentifier?: string;
+
+			/**
+			 *  Optional property describing the architecture of the device
+			 *  Available for Android only
+			 */
+			 abis?: string[];
 		}
 
 		interface IDeviceError extends Error, IDeviceIdentifier {}

lib/common/mobile/android/android-device.ts

@@ -13,6 +13,9 @@ interface IAndroidDeviceDetails {
 	name: string;
 	release: string;
 	brand: string;
+	"cpu.abi": string;
+	"cpu.abilist64": string;
+	"cpu.abilist32": string;
 }
 
 interface IAdbDeviceStatusInfo {
@@ -96,6 +99,10 @@ export class AndroidDevice implements Mobile.IAndroidDevice {
 			identifier: this.identifier,
 			displayName: details.name,
 			model: details.model,
+			abis: [
+				...details["cpu.abilist64"].split(","),
+				...details["cpu.abilist32"].split(","),
+			],
 			version,
 			vendor: details.brand,
 			platform: this.$devicePlatformsConstants.Android,
@@ -111,12 +118,14 @@ export class AndroidDevice implements Mobile.IAndroidDevice {
 			: [DeviceConnectionType.USB];
 
 		if (this.isEmulator) {
-			this.deviceInfo.displayName = await this.$androidEmulatorServices.getRunningEmulatorName(
-				this.identifier
-			);
-			this.deviceInfo.imageIdentifier = await this.$androidEmulatorServices.getRunningEmulatorImageIdentifier(
-				this.identifier
-			);
+			this.deviceInfo.displayName =
+				await this.$androidEmulatorServices.getRunningEmulatorName(
+					this.identifier
+				);
+			this.deviceInfo.imageIdentifier =
+				await this.$androidEmulatorServices.getRunningEmulatorImageIdentifier(
+					this.identifier
+				);
 		}
 
 		this.$logger.trace(this.deviceInfo);
@@ -161,9 +170,10 @@ export class AndroidDevice implements Mobile.IAndroidDevice {
 				// sample line is "ro.build.version.release=4.4" in /system/build.prop
 				// sample line from getprop is:  [ro.build.version.release]: [6.0]
 				// NOTE: some props do not have value: [ro.build.version.base_os]: []
-				const match = /(?:\[?ro\.build\.version|ro\.product|ro\.build)\.(.+?)]?(?:\:|=)(?:\s*?\[)?(.*?)]?$/.exec(
-					value
-				);
+				const match =
+					/(?:\[?ro\.build\.version|ro\.product|ro\.build)\.(.+?)]?(?:\:|=)(?:\s*?\[)?(.*?)]?$/.exec(
+						value
+					);
 				if (match) {
 					parsedDetails[match[1]] = match[2];
 				}
@@ -189,7 +199,8 @@ export class AndroidDevice implements Mobile.IAndroidDevice {
 	}
 
 	private async getType(): Promise<string> {
-		const runningEmulatorIds = await this.$androidEmulatorServices.getRunningEmulatorIds();
+		const runningEmulatorIds =
+			await this.$androidEmulatorServices.getRunningEmulatorIds();
 		if (
 			_.find(runningEmulatorIds, (emulatorId) => emulatorId === this.identifier)
 		) {

lib/constants.ts

@@ -58,6 +58,7 @@ export const BUNDLE_DIR = "bundle";
 export const RESOURCES_DIR = "res";
 export const CONFIG_NS_FILE_NAME = "nsconfig.json";
 export const CONFIG_NS_APP_RESOURCES_ENTRY = "appResourcesPath";
+export const CONFIG_NS_BUILD_ENTRY = "buildPath";
 export const CONFIG_NS_APP_ENTRY = "appPath";
 export const CONFIG_FILE_NAME_DISPLAY = "nativescript.config.(js|ts)";
 export const CONFIG_FILE_NAME_JS = "nativescript.config.js";

lib/controllers/build-controller.ts

@@ -116,7 +116,7 @@ export class BuildController extends EventEmitter implements IBuildController {
 		);
 
 		if (buildData.copyTo) {
-			this.$buildArtifactsService.copyLatestAppPackage(
+			this.$buildArtifactsService.copyAppPackages(
 				buildData.copyTo,
 				platformData,
 				buildData
@@ -165,9 +165,8 @@ export class BuildController extends EventEmitter implements IBuildController {
 			return true;
 		}
 
-		const validBuildOutputData = platformData.getValidBuildOutputData(
-			buildData
-		);
+		const validBuildOutputData =
+			platformData.getValidBuildOutputData(buildData);
 		const packages = this.$buildArtifactsService.getAllAppPackages(
 			outputPath,
 			validBuildOutputData
@@ -176,9 +175,8 @@ export class BuildController extends EventEmitter implements IBuildController {
 			return true;
 		}
 
-		const prepareInfo = this.$projectChangesService.getPrepareInfo(
-			platformData
-		);
+		const prepareInfo =
+			this.$projectChangesService.getPrepareInfo(platformData);
 		const buildInfo = this.$buildInfoFileService.getLocalBuildInfo(
 			platformData,
 			buildData

lib/controllers/deploy-controller.ts

@@ -23,12 +23,11 @@ export class DeployController {
 				},
 			};
 			await this.$prepareController.prepare(prepareData);
-			const packageFilePath = await deviceDescriptor.buildAction();
-			await this.$deviceInstallAppService.installOnDevice(
-				device,
-				{ ...deviceDescriptor.buildData, buildForDevice: !device.isEmulator },
-				packageFilePath
-			);
+			await deviceDescriptor.buildAction();
+			await this.$deviceInstallAppService.installOnDevice(device, {
+				...deviceDescriptor.buildData,
+				buildForDevice: !device.isEmulator,
+			});
 		};
 
 		await this.$devicesService.execute(

lib/controllers/migrate-controller.ts

@@ -67,6 +67,7 @@ export class MigrateController
 		private $pluginsService: IPluginsService,
 		private $projectDataService: IProjectDataService,
 		private $projectConfigService: IProjectConfigService,
+		private $projectData: IProjectData,
 		private $options: IOptions,
 		private $resources: IResourceLoader,
 		private $injector: IInjector,
@@ -721,7 +722,7 @@ export class MigrateController
 	private async cleanUpProject(projectData: IProjectData): Promise<void> {
 		await this.$projectCleanupService.clean([
 			constants.HOOKS_DIR_NAME,
-			constants.PLATFORMS_DIR_NAME,
+			this.$projectData.getBuildRelativeDirectoryPath(),
 			constants.NODE_MODULES_FOLDER_NAME,
 			constants.PACKAGE_LOCK_JSON_FILE_NAME,
 		]);

lib/controllers/platform-controller.ts

@@ -62,16 +62,15 @@ export class PlatformController implements IPlatformController {
 
 		this.$logger.trace("Determined package to install is", packageToInstall);
 
-		const installedPlatformVersion = await this.$addPlatformService.addPlatformSafe(
-			projectData,
-			platformData,
-			packageToInstall,
-			addPlatformData
-		);
-
-		this.$fs.ensureDirectoryExists(
-			path.join(projectData.platformsDir, platform)
-		);
+		const installedPlatformVersion =
+			await this.$addPlatformService.addPlatformSafe(
+				projectData,
+				platformData,
+				packageToInstall,
+				addPlatformData
+			);
+		const buildPath = projectData.platformsDir;
+		this.$fs.ensureDirectoryExists(path.join(buildPath, platform));
 
 		if (this.$mobileHelper.isAndroidPlatform(platform)) {
 			const gradlePropertiesPath = path.resolve(
@@ -80,7 +79,8 @@ export class PlatformController implements IPlatformController {
 			);
 			const commentHeader = "# App configuration";
 			const appPath = projectData.getAppDirectoryRelativePath();
-			const appResourcesPath = projectData.getAppResourcesRelativeDirectoryPath();
+			const appResourcesPath =
+				projectData.getAppResourcesRelativeDirectoryPath();
 
 			let gradlePropertiesContents = "";
 			if (this.$fs.exists(gradlePropertiesPath)) {
@@ -96,6 +96,7 @@ export class PlatformController implements IPlatformController {
 					commentHeader,
 					`appPath = ${appPath}`,
 					`appResourcesPath = ${appResourcesPath}`,
+					`buildPath = ${buildPath}`,
 					"",
 				].join("\n");
 
@@ -161,9 +162,10 @@ export class PlatformController implements IPlatformController {
 
 			if (!desiredRuntimePackage.version) {
 				// if no version is explicitly added, then we use the latest
-				desiredRuntimePackage.version = await this.$packageInstallationManager.getLatestCompatibleVersion(
-					desiredRuntimePackage.name
-				);
+				desiredRuntimePackage.version =
+					await this.$packageInstallationManager.getLatestCompatibleVersion(
+						desiredRuntimePackage.name
+					);
 			}
 			// const currentPlatformData = this.$projectDataService.getNSValue(projectData.projectDir, platformData.frameworkPackageName);
 			// version = (currentPlatformData && currentPlatformData.version) ||
@@ -186,9 +188,8 @@ export class PlatformController implements IPlatformController {
 
 		const shouldAddNativePlatform =
 			!nativePrepare || !nativePrepare.skipNativePrepare;
-		const prepareInfo = this.$projectChangesService.getPrepareInfo(
-			platformData
-		);
+		const prepareInfo =
+			this.$projectChangesService.getPrepareInfo(platformData);
 		const requiresNativePlatformAdd =
 			prepareInfo &&
 			prepareInfo.nativePlatformStatus ===

lib/controllers/prepare-controller.ts

@@ -289,7 +289,11 @@ export class PrepareController extends EventEmitter {
 					data.platform.toLowerCase() === platformData.platformNameLowerCase
 				) {
 					if (this.isFileWatcherPaused()) return;
-					this.emitPrepareEvent({ ...data, hasNativeChanges: false });
+					this.emitPrepareEvent({
+						...data,
+						files: data.files ?? [],
+						hasNativeChanges: false,
+					});
 				}
 			};
 
@@ -371,7 +375,7 @@ export class PrepareController extends EventEmitter {
 					this.$logger.info(`Chokidar raised event ${event} for ${filePath}.`);
 					await this.writeRuntimePackageJson(projectData, platformData);
 					this.emitPrepareEvent({
-						files: [],
+						files: [filePath],
 						staleFiles: [],
 						hasOnlyHotUpdateFiles: false,
 						hmrData: null,