Rebase onto master

Author: Dimitar Kerezov

lib/commands/platform-clean.ts

@@ -9,7 +9,7 @@ export class CleanCommand implements ICommand {
 		}
 
 	public async execute(args: string[]): Promise<void> {
-		this.$platformService.removePlatforms(args, this.$projectData);
+		await this.$platformService.removePlatforms(args, this.$projectData);
 		await this.$platformService.addPlatforms(args, this.$options.platformTemplate, this.$projectData);
 	}
 

lib/commands/remove-platform.ts

@@ -7,8 +7,8 @@ export class RemovePlatformCommand implements ICommand {
 			this.$projectData.initializeProjectData();
 		}
 
-	public async execute(args: string[]): Promise<void> {
-		this.$platformService.removePlatforms(args, this.$projectData);
+	public execute(args: string[]): Promise<void> {
+		return this.$platformService.removePlatforms(args, this.$projectData);
 	}
 
 	public async canExecute(args: string[]): Promise<boolean> {

lib/commands/update.ts

@@ -72,7 +72,7 @@ export class UpdateCommand implements ICommand {
 			}
 		}
 
-		this.$platformService.removePlatforms(platforms, this.$projectData);
+		await this.$platformService.removePlatforms(platforms, this.$projectData);
 		await this.$pluginsService.remove("tns-core-modules", this.$projectData);
 		await this.$pluginsService.remove("tns-core-modules-widgets", this.$projectData);
 

lib/definitions/platform.d.ts

@@ -26,9 +26,9 @@ interface IPlatformService extends NodeJS.EventEmitter {
 	 * Remove platforms from specified project (`<project dir>/platforms/<platform>` dir).
 	 * @param {string[]} platforms Platforms to be removed.
 	 * @param {IProjectData} projectData DTO with information about the project.
-	 * @returns {void}
+	 * @returns {Promise<void>}
 	 */
-	removePlatforms(platforms: string[], projectData: IProjectData): void;
+	removePlatforms(platforms: string[], projectData: IProjectData): Promise<void>;
 
 	updatePlatforms(platforms: string[], platformTemplate: string, projectData: IProjectData): Promise<void>;
 

lib/definitions/project.d.ts

@@ -115,10 +115,6 @@ interface IProjectTemplatesService {
 	prepareTemplate(templateName: string, projectDir: string): Promise<string>;
 }
 
-interface Ceco extends NodeJS.EventEmitter {
-
-}
-
 interface IPlatformProjectServiceBase {
 	getPluginPlatformsFolderPath(pluginData: IPluginData, platform: string): string;
 }
@@ -241,15 +237,19 @@ interface IPlatformProjectService extends NodeJS.EventEmitter {
 	/**
 	 * Stops all running processes that might hold a lock on the filesystem.
 	 * Android: Gradle daemon processes are terminated.
+	 * @param {string} projectRoot The root directory of the native project.
 	 * @returns {void}
 	 */
-	stopServices(): Promise<ISpawnResult>;
+	stopServices(projectRoot: string): Promise<ISpawnResult>;
 
 	/**
 	 * 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[]): Promise<void>
+	cleanProject(projectRoot: string, options: string[], projectData: IProjectData): Promise<void>
 }
 
 interface IAndroidProjectPropertiesManager {

lib/services/android-project-service.ts

@@ -407,8 +407,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		}
 	}
 
-	public async stopServices(): Promise<ISpawnResult> {
-		let projectRoot = this.platformData.projectRoot;
+	public stopServices(projectRoot: string): Promise<ISpawnResult> {
 		let gradleBin = path.join(projectRoot, "gradlew");
 		if (this.$hostInfo.isWindows) {
 			gradleBin += ".bat";

lib/services/ios-project-service.ts

@@ -647,7 +647,7 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
 	}
 
 	public async stopServices(): Promise<ISpawnResult> {
-		return Promise.resolve({stderr: "", stdout: "", exitCode: 0});
+		return { stderr: "", stdout: "", exitCode: 0 };
 	}
 
 	public async cleanProject(projectRoot: string, options: string[]): Promise<void> {

lib/services/platform-service.ts

@@ -117,7 +117,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 		let installedVersion = coreModuleData.version;
 		let coreModuleName = coreModuleData.name;
 
-		let customTemplateOptions = await this.getPathToPlatformTemplate(platformTemplate, platformData.frameworkPackageName);
+		let customTemplateOptions = await this.getPathToPlatformTemplate(platformTemplate, platformData.frameworkPackageName, projectData.projectDir);
 		let pathToTemplate = customTemplateOptions && customTemplateOptions.pathToTemplate;
 		await platformData.platformProjectService.createProject(path.resolve(frameworkDir), installedVersion, projectData, pathToTemplate);
 		platformData.platformProjectService.ensureConfigurationFileInAppResources(projectData);
@@ -129,17 +129,17 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 			frameworkPackageNameData.template = customTemplateOptions.selectedTemplate;
 		}
 
-		this.$projectDataService.setNSValue(this.$projectData.projectDir, platformData.frameworkPackageName, frameworkPackageNameData);
+		this.$projectDataService.setNSValue(projectData.projectDir, platformData.frameworkPackageName, frameworkPackageNameData);
 
 		return coreModuleName;
 
 	}
 
-	private async getPathToPlatformTemplate(selectedTemplate: string, frameworkPackageName: string): Promise<{ selectedTemplate: string, pathToTemplate: string }> {
+	private async getPathToPlatformTemplate(selectedTemplate: string, frameworkPackageName: string, projectDir: string): Promise<{ selectedTemplate: string, pathToTemplate: string }> {
 		if (!selectedTemplate) {
 			// read data from package.json's nativescript key
 			// check the nativescript.tns-<platform>.template value
-			const nativescriptPlatformData = this.$projectDataService.getNSValue(this.$projectData.projectDir, frameworkPackageName);
+			const nativescriptPlatformData = this.$projectDataService.getNSValue(projectDir, frameworkPackageName);
 			selectedTemplate = nativescriptPlatformData && nativescriptPlatformData.template;
 		}
 
@@ -217,16 +217,16 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 		if (changesInfo.hasChanges) {
 			// android build artifacts need to be cleaned up when switching from release to debug builds
 			if (platform.toLowerCase() === "android") {
-				let previousPrepareInfo = this.$projectChangesService.getPrepareInfo(platform);
+				let previousPrepareInfo = this.$projectChangesService.getPrepareInfo(platform, projectData);
 				// clean up prepared plugins when not building for release
-				if (previousPrepareInfo && previousPrepareInfo.release !== this.$options.release) {
-					let platformData = this.$platformsData.getPlatformData(platform);
-					await platformData.platformProjectService.cleanProject(platformData.projectRoot, []);
+				if (previousPrepareInfo && previousPrepareInfo.release !== appFilesUpdaterOptions.release) {
+					let platformData = this.$platformsData.getPlatformData(platform, projectData);
+					await platformData.platformProjectService.cleanProject(platformData.projectRoot, [], projectData);
 				}
 			}
 
-			await this.preparePlatformCore(platform, changesInfo);
-			this.$projectChangesService.savePrepareInfo(platform);
+			await this.preparePlatformCore(platform, appFilesUpdaterOptions, projectData, provision);
+			this.$projectChangesService.savePrepareInfo(platform, projectData);
 		} else {
 			this.$logger.out("Skipping prepare.");
 		}
@@ -586,7 +586,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 			this.validatePlatformInstalled(platform, projectData);
 			let platformData = this.$platformsData.getPlatformData(platform, projectData);
 
-			await this.$platformsData.getPlatformData(platform).platformProjectService.stopServices();
+			await platformData.platformProjectService.stopServices(platformData.projectRoot);
 
 			let platformDir = path.join(projectData.platformsDir, platform);
 			this.$fs.deleteDirectory(platformDir);

test/platform-service.ts

@@ -199,7 +199,7 @@ describe('Platform Service Tests', () => {
 			await platformService.addPlatforms(["android"], "", projectData);
 
 			testInjector.resolve("fs").exists = () => true;
-			platformService.removePlatforms(["android"], projectData);
+			await platformService.removePlatforms(["android"], projectData);
 		});
 	});