Skip to content

Fix cloud builds #3438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 9, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/common
2 changes: 1 addition & 1 deletion lib/services/android-project-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject

this.$androidToolsInfo.validateAndroidHomeEnvVariable({ showWarningsAsErrors: true });

const javaCompilerVersion = (await this.$sysInfo.getSysInfo()).javacVersion;
const javaCompilerVersion = await this.$sysInfo.getJavaCompilerVersion();

this.$androidToolsInfo.validateJavacVersion(javaCompilerVersion, { showWarningsAsErrors: true });

Expand Down
2 changes: 1 addition & 1 deletion lib/services/ios-project-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
const installedPlugins = await (<IPluginsService>this.$injector.resolve("pluginsService")).getAllInstalledPlugins(projectData);
for (const pluginData of installedPlugins) {
const pluginsFolderExists = this.$fs.exists(path.join(pluginData.pluginPlatformsFolderPath(this.$devicePlatformsConstants.iOS.toLowerCase()), "Podfile"));
const cocoaPodVersion = (await this.$sysInfo.getSysInfo()).cocoaPodsVer;
const cocoaPodVersion = await this.$sysInfo.getCocoaPodsVersion();
if (pluginsFolderExists && !cocoaPodVersion) {
this.$errors.failWithoutHelp(`${pluginData.name} has Podfile and you don't have Cocoapods installed or it is not configured correctly. Please verify Cocoapods can work on your machine.`);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/services/xcproj-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class XcprojService implements IXcprojService {

public async getXcprojInfo(): Promise<IXcprojInfo> {
if (!this.xcprojInfoCache) {
let cocoapodVer = (await this.$sysInfo.getSysInfo()).cocoaPodsVer;
let cocoapodVer = await this.$sysInfo.getCocoaPodsVersion();
const xcodeVersion = await this.$xcodeSelectService.getXcodeVersion();

if (cocoapodVer && !semver.valid(cocoapodVer)) {
Expand Down
12 changes: 12 additions & 0 deletions lib/sys-info.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,17 @@ export class SysInfo implements ISysInfo {

return this.sysInfo;
}

public getXcodeVersion(): Promise<string> {
return sysInfo.getXcodeVersion();
}

public getCocoaPodsVersion(): Promise<string> {
return sysInfo.getCocoaPodsVersion();
}

public getJavaCompilerVersion(): Promise<string> {
return sysInfo.getJavaCompilerVersion();
}
}
$injector.register("sysInfo", SysInfo);