Merge pull request #3611 from NativeScript/kddimitrov/fix-remove-platform-java10

fix(plarform-remove): remove platform java 10 fail

Author: KristianDD

lib/services/android-project-service.ts

@@ -605,7 +605,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 	}
 
 	public stopServices(projectRoot: string): Promise<ISpawnResult> {
-		return this.executeCommand(projectRoot, ["--stop", "--quiet"]);
+		return this.executeCommand(projectRoot, ["--stop", "--quiet"], {stdio: "pipe"});
 	}
 
 	public async cleanProject(projectRoot: string, projectData: IProjectData): Promise<void> {

lib/services/platform-service.ts

@@ -646,14 +646,27 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 		for (const platform of platforms) {
 			this.validatePlatformInstalled(platform, projectData);
 			const platformData = this.$platformsData.getPlatformData(platform, projectData);
+			let gradleErrorMessage;
 
-			await platformData.platformProjectService.stopServices(platformData.projectRoot);
-
-			const platformDir = path.join(projectData.platformsDir, platform);
-			this.$fs.deleteDirectory(platformDir);
-			this.$projectDataService.removeNSProperty(projectData.projectDir, platformData.frameworkPackageName);
+			try {
+				await platformData.platformProjectService.stopServices(platformData.projectRoot);
+			} catch (err) {
+				gradleErrorMessage = err.message;
+			}
 
-			this.$logger.out(`Platform ${platform} successfully removed.`);
+			try {
+				const platformDir = path.join(projectData.platformsDir, platform.toLowerCase());
+				this.$fs.deleteDirectory(platformDir);
+				this.$projectDataService.removeNSProperty(projectData.projectDir, platformData.frameworkPackageName);
+
+				this.$logger.out(`Platform ${platform} successfully removed.`);
+			} catch (err) {
+				this.$logger.error(`Failed to remove ${platform} platform with errors:`);
+				if (gradleErrorMessage) {
+					this.$logger.error(gradleErrorMessage);
+				}
+				this.$errors.failWithoutHelp(err.message);
+			}
 		}
 	}