Pass buildConfig when getting path to last build output

Pass the whole buildConfig object when getting the path to the last build output. This required changes in debug services and TestExecutionService.
Also change the args of cleanProject method - the `options` passed to `gradle` are now determined in the method itself instead of passing them from the caller.
This way we'll not require "android-23" (the default one set in build.gradle) when we miss to pass the required options.

Author: rosen-vladimirov

lib/commands/appstore-upload.ts

@@ -73,7 +73,7 @@ export class PublishIOS implements ICommand {
 				// This is not very correct as if we build multiple targets we will try to sign all of them using the signing identity here.
 				await this.$platformService.preparePlatform(platform, appFilesUpdaterOptions, this.$options.platformTemplate, this.$projectData, { provision: this.$options.provision, sdk: this.$options.sdk });
 				await this.$platformService.buildPlatform(platform, iOSBuildConfig, this.$projectData);
-				ipaFilePath = this.$platformService.lastOutputPath(platform, { isForDevice: iOSBuildConfig.buildForDevice, isReleaseBuild: iOSBuildConfig.release }, this.$projectData);
+				ipaFilePath = this.$platformService.lastOutputPath(platform, iOSBuildConfig, this.$projectData);
 			} else {
 				this.$logger.info("No .ipa, mobile provision or certificate set. Perfect! Now we'll build .xcarchive and let Xcode pick the distribution certificate and provisioning profile for you when exporting .ipa for AppStore submission.");
 				await this.$platformService.preparePlatform(platform, appFilesUpdaterOptions, this.$options.platformTemplate, this.$projectData, { provision: this.$options.provision, sdk: this.$options.sdk });

lib/commands/build.ts

@@ -26,7 +26,7 @@ export class BuildCommandBase {
 		};
 		await this.$platformService.buildPlatform(platform, buildConfig, this.$projectData);
 		if (this.$options.copyTo) {
-			this.$platformService.copyLastOutput(platform, this.$options.copyTo, { isForDevice: this.$options.forDevice, isReleaseBuild: buildConfig.release }, this.$projectData);
+			this.$platformService.copyLastOutput(platform, this.$options.copyTo, buildConfig, this.$projectData);
 		}
 	}
 }

lib/commands/debug.ts

@@ -16,11 +16,6 @@
 		}
 
 	public async execute(args: string[]): Promise<void> {
-		if (this.$options.start) {
-			return this.debugService.debug(this.$projectData);
-		}
-
-		const appFilesUpdaterOptions: IAppFilesUpdaterOptions = { bundle: this.$options.bundle, release: this.$options.release };
 		const deployOptions: IDeployPlatformOptions = {
 			clean: this.$options.clean,
 			device: this.$options.device,
@@ -31,6 +26,15 @@
 			provision: this.$options.provision,
 			teamId: this.$options.teamId
 		};
+
+		const buildConfig: IBuildConfig = _.merge({ buildForDevice: this.$options.forDevice }, deployOptions);
+
+		if (this.$options.start) {
+			return this.debugService.debug(this.$projectData, buildConfig);
+		}
+
+		const appFilesUpdaterOptions: IAppFilesUpdaterOptions = { bundle: this.$options.bundle, release: this.$options.release };
+
 		await this.$platformService.deployPlatform(this.$devicesService.platform, appFilesUpdaterOptions, deployOptions, this.$projectData, { provision: this.$options.provision, sdk: this.$options.sdk });
 		this.$config.debugLivesync = true;
 		let applicationReloadAction = async (deviceAppData: Mobile.IDeviceAppData): Promise<void> => {
@@ -45,7 +49,7 @@
 
 			await deviceAppData.device.applicationManager.stopApplication(applicationId);
 
-			await this.debugService.debug(this.$projectData);
+			await this.debugService.debug(this.$projectData, buildConfig);
 		};
 		return this.$usbLiveSyncService.liveSync(this.$devicesService.platform, this.$projectData, applicationReloadAction);
 	}

lib/common

@@ -1,6 +1,6 @@
 interface IDebugService {
-	debug(projectData: IProjectData): Promise<void>;
-	debugStart(projectData: IProjectData): Promise<void>;
+	debug(projectData: IProjectData, buildConfig: IBuildConfig): Promise<void>;
+	debugStart(projectData: IProjectData, buildConfig: IBuildConfig): Promise<void>;
 	debugStop(): Promise<void>
 	platform: string;
 }

lib/definitions/debug.d.ts

@@ -1,6 +1,6 @@
 interface IPlatformService extends NodeJS.EventEmitter {
 	cleanPlatforms(platforms: string[], platformTemplate: string, projectData: IProjectData, platformSpecificData: IPlatformSpecificData, framework?: string): Promise<void>;
-	
+
 	addPlatforms(platforms: string[], platformTemplate: string, projectData: IProjectData, platformSpecificData: IPlatformSpecificData, frameworkPath?: string): Promise<void>;
 
 	/**
@@ -143,30 +143,37 @@ interface IPlatformService extends NodeJS.EventEmitter {
 	/**
 	 * Returns information about the latest built application for device in the current project.
 	 * @param {IPlatformData} platformData Data describing the current platform.
-	 * @param {any} buildOptions Defines if the build is for release configuration.
+	 * @param {IBuildConfig} buildConfig Defines if the build is for release configuration.
 	 * @returns {IApplicationPackage} Information about latest built application.
 	 */
-	getLatestApplicationPackageForDevice(platformData: IPlatformData, buildOptions: { isReleaseBuild: boolean }): IApplicationPackage;
+	getLatestApplicationPackageForDevice(platformData: IPlatformData, buildConfig: IBuildConfig): IApplicationPackage;
 
 	/**
 	 * Returns information about the latest built application for simulator in the current project.
 	 * @param {IPlatformData} platformData Data describing the current platform.
-	 * @param {any} buildOptions Defines if the build is for release configuration.
+	 * @param {IBuildConfig} buildConfig Defines if the build is for release configuration.
 	 * @returns {IApplicationPackage} Information about latest built application.
 	 */
-	getLatestApplicationPackageForEmulator(platformData: IPlatformData, buildOptions: { isReleaseBuild: boolean }): IApplicationPackage;
+	getLatestApplicationPackageForEmulator(platformData: IPlatformData, buildConfig: IBuildConfig): IApplicationPackage;
 
 	/**
 	 * Copies latest build output to a specified location.
 	 * @param {string} platform Mobile platform - Android, iOS.
 	 * @param {string} targetPath Destination where the build artifact should be copied.
-	 * @param {{isForDevice: boolean, isReleaseBuild: boolean}} settings Defines if the searched artifact should be for simulator and is it built for release.
+	 * @param {IBuildConfig} buildConfig Defines if the searched artifact should be for simulator and is it built for release.
 	 * @param {IProjectData} projectData DTO with information about the project.
 	 * @returns {void}
 	 */
-	copyLastOutput(platform: string, targetPath: string, settings: { isForDevice: boolean, isReleaseBuild: boolean }, projectData: IProjectData): void;
+	copyLastOutput(platform: string, targetPath: string, buildConfig: IBuildConfig, projectData: IProjectData): void;
 
-	lastOutputPath(platform: string, settings: { isForDevice: boolean, isReleaseBuild: boolean }, projectData: IProjectData): string;
+	/**
+	 * Gets the latest build output.
+	 * @param {string} platform Mobile platform - Android, iOS.
+	 * @param {IBuildConfig} buildConfig Defines if the searched artifact should be for simulator and is it built for release.
+	 * @param {IProjectData} projectData DTO with information about the project.
+	 * @returns {string} The path to latest built artifact.
+	 */
+	lastOutputPath(platform: string, buildConfig: IBuildConfig, projectData: IProjectData): string;
 
 	/**
 	 * Reads contents of a file on device.

lib/definitions/platform.d.ts

@@ -254,11 +254,10 @@ interface IPlatformProjectService extends NodeJS.EventEmitter {
 	/**
 	 * Removes build artifacts specific to the platform
 	 * @param {string} projectRoot The root directory of the native project.
-	 * @param {string[]} options Options that can be passed to clean command.
 	 * @param {IProjectData} projectData DTO with information about the project.
 	 * @returns {void}
 	 */
-	cleanProject(projectRoot: string, options: string[], projectData: IProjectData): Promise<void>
+	cleanProject(projectRoot: string, projectData: IProjectData): Promise<void>
 }
 
 interface IAndroidProjectPropertiesManager {

lib/definitions/project.d.ts

@@ -42,7 +42,8 @@ export class ProjectData implements IProjectData {
 		private $errors: IErrors,
 		private $projectHelper: IProjectHelper,
 		private $staticConfig: IStaticConfig,
-		private $options: IOptions) { }
+		private $options: IOptions,
+		private $logger: ILogger) { }
 
 	public initializeProjectData(projectDir?: string): void {
 		projectDir = projectDir || this.$projectHelper.projectDir;
@@ -51,15 +52,14 @@ export class ProjectData implements IProjectData {
 			const projectFilePath = path.join(projectDir, this.$staticConfig.PROJECT_FILE_NAME);
 			let data: any = null;
 
-			if (projectFilePath) {
+			if (this.$fs.exists(projectFilePath)) {
 				let fileContent: any = null;
 				try {
 					fileContent = this.$fs.readJson(projectFilePath);
 					data = fileContent[this.$staticConfig.CLIENT_NAME_KEY_IN_PROJECT_FILE];
 				} catch (err) {
-					this.$errors.failWithoutHelp(
-						`The project file ${this.projectFilePath} is corrupted.` + EOL +
-						"Consider restoring an earlier version from your source control or backup." + EOL +
+					this.$errors.failWithoutHelp(`The project file ${this.projectFilePath} is corrupted. ${EOL}` +
+						`Consider restoring an earlier version from your source control or backup.${EOL}` +
 						`Additional technical info: ${err.toString()}`);
 				}
 
@@ -80,8 +80,11 @@ export class ProjectData implements IProjectData {
 			}
 		}
 
+		const currentDir = path.resolve(".");
+		this.$logger.trace(`Unable to find project. projectDir: ${projectDir}, options.path: ${this.$options.path}, ${currentDir}`);
+
 		// This is the case when no project file found
-		this.$errors.fail("No project found at or above '%s' and neither was a --path specified.", projectDir || this.$options.path || path.resolve("."));
+		this.$errors.fail("No project found at or above '%s' and neither was a --path specified.", projectDir || this.$options.path || currentDir);
 	}
 
 	private getProjectType(): string {

lib/project-data.ts

@@ -45,10 +45,10 @@ export class LiveSyncProvider implements ILiveSyncProvider {
 		await this.$platformService.buildPlatform(device.deviceInfo.platform, buildConfig, projectData);
 		let platformData = this.$platformsData.getPlatformData(device.deviceInfo.platform, projectData);
 		if (device.isEmulator) {
-			return this.$platformService.getLatestApplicationPackageForEmulator(platformData, { isReleaseBuild: buildConfig.release }).packageName;
+			return this.$platformService.getLatestApplicationPackageForEmulator(platformData, buildConfig).packageName;
 		}
 
-		return this.$platformService.getLatestApplicationPackageForDevice(platformData, { isReleaseBuild: buildConfig.release }).packageName;
+		return this.$platformService.getLatestApplicationPackageForDevice(platformData, buildConfig).packageName;
 	}
 
 	public async preparePlatformForSync(platform: string, provision: any, projectData: IProjectData): Promise<void> {

lib/providers/livesync-provider.ts

@@ -28,18 +28,18 @@ class AndroidDebugService implements IDebugService {
 		this._device = newDevice;
 	}
 
-	public async debug(projectData: IProjectData): Promise<void> {
+	public async debug(projectData: IProjectData, buildConfig: IBuildConfig): Promise<void> {
 		return this.$options.emulator
-			? this.debugOnEmulator(projectData)
-			: this.debugOnDevice(projectData);
+			? this.debugOnEmulator(projectData, buildConfig)
+			: this.debugOnDevice(projectData, buildConfig);
 	}
 
-	private async debugOnEmulator(projectData: IProjectData): Promise<void> {
+	private async debugOnEmulator(projectData: IProjectData, buildConfig: IBuildConfig): Promise<void> {
 		// Assure we've detected the emulator as device
 		// For example in case deployOnEmulator had stated new emulator instance
 		// we need some time to detect it. Let's force detection.
 		await this.$androidDeviceDiscovery.startLookingForDevices();
-		await this.debugOnDevice(projectData);
+		await this.debugOnDevice(projectData, buildConfig);
 	}
 
 	private isPortAvailable(candidatePort: number): Promise<boolean> {
@@ -108,7 +108,7 @@ class AndroidDebugService implements IDebugService {
 		return this.device.adb.executeCommand(["forward", `tcp:${local}`, `localabstract:${remote}`]);
 	}
 
-	private async debugOnDevice(projectData: IProjectData): Promise<void> {
+	private async debugOnDevice(projectData: IProjectData, buildConfig: IBuildConfig): Promise<void> {
 		let packageFile = "";
 
 		if (!this.$options.start && !this.$options.emulator) {
@@ -117,7 +117,7 @@ class AndroidDebugService implements IDebugService {
 			this.$options.forDevice = !!cachedDeviceOption;
 
 			let platformData = this.$platformsData.getPlatformData(this.platform, projectData);
-			packageFile = this.$platformService.getLatestApplicationPackageForDevice(platformData, { isReleaseBuild: this.$options.release }).packageName;
+			packageFile = this.$platformService.getLatestApplicationPackageForDevice(platformData, buildConfig).packageName;
 			this.$logger.out("Using ", packageFile);
 		}
 
@@ -170,7 +170,7 @@ class AndroidDebugService implements IDebugService {
 		await this.debugStartCore(packageName);
 	}
 
-	public async debugStart(projectData: IProjectData): Promise<void> {
+	public async debugStart(projectData: IProjectData, buildConfig: IBuildConfig): Promise<void> {
 		await this.$devicesService.initialize({ platform: this.platform, deviceId: this.$options.device });
 		let action = (device: Mobile.IAndroidDevice): Promise<void> => {
 			this.device = device;

lib/services/android-debug-service.ts

@@ -5,6 +5,7 @@ import * as semver from "semver";
 import * as projectServiceBaseLib from "./platform-project-service-base";
 import { DeviceAndroidDebugBridge } from "../common/mobile/android/device-android-debug-bridge";
 import { EOL } from "os";
+import { Configurations } from "../common/constants";
 
 export class AndroidProjectService extends projectServiceBaseLib.PlatformProjectServiceBase implements IPlatformProjectService {
 	private static VALUES_DIRNAME = "values";
@@ -58,16 +59,11 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 				projectRoot: projectRoot,
 				deviceBuildOutputPath: path.join(projectRoot, "build", "outputs", "apk"),
 				getValidPackageNames: (buildOptions: { isReleaseBuild?: boolean, isForDevice?: boolean }): string[] => {
-					if (buildOptions.isReleaseBuild) {
-						return [
-							`${packageName}-release.apk`,
-							`${projectData.projectName}-release.apk`
-						];
-					}
+					const buildMode = buildOptions.isReleaseBuild ? Configurations.Release.toLowerCase() : Configurations.Debug.toLowerCase();
 
 					return [
-						`${packageName}-debug.apk`,
-						`${projectData.projectName}-debug.apk`,
+						`${packageName}-${buildMode}.apk`,
+						`${projectData.projectName}-${buildMode}.apk`
 					];
 				},
 				frameworkFilesExtensions: [".jar", ".dat", ".so"],
@@ -383,7 +379,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 			// check whether the dependency that's being removed has native code
 			let pluginConfigDir = path.join(this.getPlatformData(projectData).projectRoot, "configurations", pluginData.name);
 			if (this.$fs.exists(pluginConfigDir)) {
-				await this.cleanProject(this.getPlatformData(projectData).projectRoot, [], projectData);
+				await this.cleanProject(this.getPlatformData(projectData).projectRoot, projectData);
 			}
 		} catch (e) {
 			if (e.code === "ENOENT") {
@@ -414,12 +410,9 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 				}
 			}
 
-			// We don't need release options here
-			let buildOptions = this.getBuildOptions({ release: false }, projectData);
-
 			let projectRoot = this.getPlatformData(projectData).projectRoot;
 
-			await this.cleanProject(projectRoot, buildOptions, projectData);
+			await this.cleanProject(projectRoot, projectData);
 		}
 	}
 
@@ -432,19 +425,16 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		return this.$childProcess.spawnFromEvent(gradleBin, ["--stop", "--quiet"], "close", { stdio: "inherit", cwd: projectRoot });
 	}
 
-	public async cleanProject(projectRoot: string, options: string[], projectData: IProjectData): Promise<void> {
-		// In case options are not passed, we'll use the default ones for cleaning the project.
-		// In case we do not do this, we'll required android-23 (default in build.gradle) for cleaning the project.
-		options = options.length === 0 ? this.getBuildOptions({ release: false }, projectData) : options;
-
-		options.unshift("clean");
+	public async cleanProject(projectRoot: string, projectData: IProjectData): Promise<void> {
+		const buildOptions = this.getBuildOptions({ release: false }, projectData);
+		buildOptions.unshift("clean");
 
 		let gradleBin = path.join(projectRoot, "gradlew");
 		if (this.$hostInfo.isWindows) {
 			gradleBin += ".bat";
 		}
 
-		await this.spawn(gradleBin, options, { stdio: "inherit", cwd: this.getPlatformData(projectData).projectRoot });
+		await this.spawn(gradleBin, buildOptions, { stdio: "inherit", cwd: this.getPlatformData(projectData).projectRoot });
 	}
 
 	public async cleanDeviceTempFolder(deviceIdentifier: string, projectData: IProjectData): Promise<void> {