Merge pull request #3438 from NativeScript/fatme/fix-cloud-builds

Fix cloud builds

Author: Mitko-Kerezov

lib/common

@@ -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 });
 

lib/services/android-project-service.ts

@@ -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.`);
 			}

lib/services/ios-project-service.ts

@@ -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)) {

lib/services/xcproj-service.ts

@@ -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);