Fix PR comments

Author: Fatme Havaluova

lib/definitions/project.d.ts

@@ -42,7 +42,11 @@ interface IPlatformProjectService {
 	isPlatformPrepared(projectRoot: string): IFuture<boolean>;
 	addLibrary(libraryPath: string): IFuture<void>;
 	canUpdatePlatform(currentVersion: string, newVersion: string): IFuture<boolean>;
-	updatePlatform(currentVersion: string, newVersion: string, canUpdate: boolean): IFuture<boolean>;
+	/**
+	* Provides a platform specific update logic for the specified runtime versions.
+	* @return true in cases when the update procedure should continue.
+	*/
+	updatePlatform(currentVersion: string, newVersion: string, canUpdate: boolean, addPlatform?: Function, removePlatform?: (platforms: string[]) => IFuture<void>): IFuture<boolean>;
 	preparePluginNativeCode(pluginData: IPluginData, options?: any): IFuture<void>;
 	removePluginNativeCode(pluginData: IPluginData): IFuture<void>;
 	afterPrepareAllPlugins(): IFuture<void>;

lib/services/android-project-service.ts

@@ -20,7 +20,6 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
 	constructor(private $androidEmulatorServices: Mobile.IEmulatorPlatformServices,
 		private $androidToolsInfo: IAndroidToolsInfo,
 		private $childProcess: IChildProcess,
-		private $commandsService: ICommandsService,
 		private $errors: IErrors,
 		$fs: IFileSystem,
 		private $hostInfo: IHostInfo,
@@ -156,11 +155,12 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
 		return Future.fromResult(true);
 	}
 
-	public updatePlatform(currentVersion: string, newVersion: string, canUpdate: boolean): IFuture<boolean> {
+	public updatePlatform(currentVersion: string, newVersion: string, canUpdate: boolean, addPlatform?: Function, removePlatforms?: (platforms: string[]) => IFuture<void>): IFuture<boolean> {
 		return (() => {
 			if(semver.eq(newVersion, AndroidProjectService.MIN_RUNTIME_VERSION_WITH_GRADLE)) {
-				this.$commandsService.tryExecuteCommand(process.argv[2], ["remove"].concat(process.argv.slice(4))).wait();
-				this.$commandsService.tryExecuteCommand(process.argv[2], process.argv.slice(3)).wait();
+				let platformLowercase = this.platformData.normalizedPlatformName.toLowerCase();
+				removePlatforms([platformLowercase.split("@")[0]]).wait();
+				addPlatform(platformLowercase).wait();
 				return false;
 			}
 

lib/services/ios-project-service.ts

@@ -247,17 +247,17 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 				let isUpdateConfirmed = this.$prompter.confirm(`We need to override xcodeproj file. The old one will be saved at ${this.$options.profileDir}. Are you sure?`, () => true).wait();
 				if(isUpdateConfirmed) {
 					// Copy old file to options["profile-dir"]
-					let sourceFile = path.join(this.platformData.projectRoot, util.format("%s.xcodeproj", this.$projectData.projectName));
+					let sourceFile = path.join(this.platformData.projectRoot, `${this.$projectData.projectName}.xcodeproj`);
 					let destinationFile = path.join(this.$options.profileDir, "xcodeproj");
 					this.$fs.deleteDirectory(destinationFile).wait();
 					shell.cp("-R", path.join(sourceFile, "*"), destinationFile);
-					this.$logger.info("Backup file %s at location %s", sourceFile, destinationFile);
-					this.$fs.deleteDirectory(path.join(this.platformData.projectRoot, util.format("%s.xcodeproj", this.$projectData.projectName))).wait();
+					this.$logger.info(`Backup file ${sourceFile} at location ${destinationFile}`);
+					this.$fs.deleteDirectory(sourceFile).wait();
 
 					// Copy xcodeProject file
 					let cachedPackagePath = path.join(this.$npmInstallationManager.getCachedPackagePath(this.platformData.frameworkPackageName, newVersion), constants.PROJECT_FRAMEWORK_FOLDER_NAME, util.format("%s.xcodeproj", IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER));
-					shell.cp("-R", path.join(cachedPackagePath, "*"), path.join(this.platformData.projectRoot, util.format("%s.xcodeproj", this.$projectData.projectName)));
-					this.$logger.info("Copied from %s at %s.", cachedPackagePath, this.platformData.projectRoot);
+					shell.cp("-R", path.join(cachedPackagePath, "*"), sourceFile);
+					this.$logger.info(`Copied from ${cachedPackagePath} at ${this.platformData.projectRoot}.`);
 
 					let pbxprojFilePath = path.join(this.platformData.projectRoot, this.$projectData.projectName + IOSProjectService.XCODE_PROJECT_EXT_NAME, "project.pbxproj");
 					this.replaceFileContent(pbxprojFilePath).wait();

lib/services/platform-service.ts

@@ -450,7 +450,7 @@ export class PlatformService implements IPlatformService {
 
 	private updatePlatformCore(platformData: IPlatformData, currentVersion: string, newVersion: string, canUpdate: boolean): IFuture<void> {
 		return (() => {
-			let update = platformData.platformProjectService.updatePlatform(currentVersion, newVersion, canUpdate).wait();
+			let update = platformData.platformProjectService.updatePlatform(currentVersion, newVersion, canUpdate, this.addPlatform.bind(this), this.removePlatforms.bind(this)).wait();
 			if(update) {
 				// Remove old framework files
 				let oldFrameworkData =  this.getFrameworkFiles(platformData, currentVersion).wait();