Skip to content

Commit bcfb903

Browse files
author
DimitarTachev
committed
fix: stop showing the command help on native build error
1 parent 5fa0308 commit bcfb903

File tree

2 files changed

+25
-11
lines changed

2 files changed

+25
-11
lines changed

lib/services/android-project-service.ts

+10-4
Original file line numberDiff line numberDiff line change
@@ -701,11 +701,17 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
701701
const childProcessOpts = opts.childProcessOpts || {};
702702
childProcessOpts.cwd = childProcessOpts.cwd || projectRoot;
703703
childProcessOpts.stdio = childProcessOpts.stdio || "inherit";
704+
let commandResult;
705+
try {
706+
commandResult = await this.spawn(gradlew,
707+
gradleArgs,
708+
childProcessOpts,
709+
spawnFromEventOptions);
710+
} catch (err) {
711+
this.$errors.failWithoutHelp(err.message);
712+
}
704713

705-
return await this.spawn(gradlew,
706-
gradleArgs,
707-
childProcessOpts,
708-
spawnFromEventOptions);
714+
return commandResult;
709715
}
710716
}
711717

lib/services/ios-project-service.ts

+15-7
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
5757
private $plistParser: IPlistParser,
5858
private $sysInfo: ISysInfo,
5959
private $xCConfigService: XCConfigService) {
60-
super($fs, $projectDataService);
60+
super($fs, $projectDataService);
6161
}
6262

6363
private _platformsDirCache: string = null;
@@ -442,11 +442,19 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
442442
localArgs.push("-quiet");
443443
this.$logger.info("Xcode build...");
444444
}
445-
return this.$childProcess.spawnFromEvent("xcodebuild",
446-
localArgs,
447-
"exit",
448-
{ stdio: stdio || "inherit", cwd },
449-
{ emitOptions: { eventName: constants.BUILD_OUTPUT_EVENT_NAME }, throwError: true });
445+
446+
let commandResult;
447+
try {
448+
commandResult = await this.$childProcess.spawnFromEvent("xcodebuild",
449+
localArgs,
450+
"exit",
451+
{ stdio: stdio || "inherit", cwd },
452+
{ emitOptions: { eventName: constants.BUILD_OUTPUT_EVENT_NAME }, throwError: true });
453+
} catch (err) {
454+
this.$errors.failWithoutHelp(err.message);
455+
}
456+
457+
return commandResult;
450458
}
451459

452460
private async setupSigningFromTeam(projectRoot: string, projectData: IProjectData, teamId: string) {
@@ -1112,7 +1120,7 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
11121120
private async prepareNativeSourceCode(pluginName: string, pluginPlatformsFolderPath: string, projectData: IProjectData): Promise<void> {
11131121
const project = this.createPbxProj(projectData);
11141122
const group = this.getRootGroup(pluginName, pluginPlatformsFolderPath);
1115-
project.addPbxGroup(group.files, group.name, group.path, null, {isMain:true});
1123+
project.addPbxGroup(group.files, group.name, group.path, null, { isMain: true });
11161124
project.addToHeaderSearchPaths(group.path);
11171125
this.savePbxProj(project, projectData);
11181126
}

0 commit comments

Comments
 (0)