Skip to content

Commit a4732ac

Browse files
committed
fix(plarform-remove): remove platform java 10 fail
1 parent dff067d commit a4732ac

File tree

2 files changed

+20
-7
lines changed

2 files changed

+20
-7
lines changed

lib/services/android-project-service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
605605
}
606606

607607
public stopServices(projectRoot: string): Promise<ISpawnResult> {
608-
return this.executeCommand(projectRoot, ["--stop", "--quiet"]);
608+
return this.executeCommand(projectRoot, ["--stop", "--quiet"], {stdio: "pipe"});
609609
}
610610

611611
public async cleanProject(projectRoot: string, projectData: IProjectData): Promise<void> {

lib/services/platform-service.ts

+19-6
Original file line numberDiff line numberDiff line change
@@ -646,14 +646,27 @@ export class PlatformService extends EventEmitter implements IPlatformService {
646646
for (const platform of platforms) {
647647
this.validatePlatformInstalled(platform, projectData);
648648
const platformData = this.$platformsData.getPlatformData(platform, projectData);
649+
let gradleErrorMessage;
649650

650-
await platformData.platformProjectService.stopServices(platformData.projectRoot);
651-
652-
const platformDir = path.join(projectData.platformsDir, platform);
653-
this.$fs.deleteDirectory(platformDir);
654-
this.$projectDataService.removeNSProperty(projectData.projectDir, platformData.frameworkPackageName);
651+
try {
652+
await platformData.platformProjectService.stopServices(platformData.projectRoot);
653+
} catch (err) {
654+
gradleErrorMessage = err.message;
655+
}
655656

656-
this.$logger.out(`Platform ${platform} successfully removed.`);
657+
try {
658+
const platformDir = path.join(projectData.platformsDir, platform.toLowerCase());
659+
this.$fs.deleteDirectory(platformDir);
660+
this.$projectDataService.removeNSProperty(projectData.projectDir, platformData.frameworkPackageName);
661+
662+
this.$logger.out(`Platform ${platform} successfully removed.`);
663+
} catch (err) {
664+
this.$logger.error(`Failed to remove ${platform} platform with errors:`);
665+
if (gradleErrorMessage) {
666+
this.$logger.error(gradleErrorMessage);
667+
}
668+
this.$errors.failWithoutHelp(err.message);
669+
}
657670
}
658671
}
659672

0 commit comments

Comments
 (0)