fix: execute pod install and merge of pod's xcconfig file in the correct order

Author: Fatme

lib/bootstrap.ts

@@ -15,7 +15,7 @@ $injector.require("androidPluginBuildService", "./services/android-plugin-build-
 $injector.require("iOSEntitlementsService", "./services/ios-entitlements-service");
 $injector.require("iOSProjectService", "./services/ios-project-service");
 $injector.require("iOSProvisionService", "./services/ios-provision-service");
-$injector.require("xCConfigService", "./services/xcconfig-service");
+$injector.require("xcconfigService", "./services/xcconfig-service");
 
 $injector.require("cocoapodsService", "./services/cocoapods-service");
 

lib/declarations.d.ts

@@ -844,6 +844,13 @@ interface IVerifyXcprojOptions {
  * Designed for getting information about xcproj.
  */
 interface IXcprojService {
+	/**
+	 * Returns the path to the xcodeproj file
+	 * @param projectData Information about the project.
+	 * @param platformData Information about the platform.
+	 * @return {string} The full path to the xcodeproj
+	 */
+	getXcodeprojPath(projectData: IProjectData, platformData: IPlatformData): string;
 	/**
 	 * Checks whether the system needs xcproj to execute ios builds successfully.
 	 * In case the system does need xcproj but does not have it, prints an error message.
@@ -856,6 +863,11 @@ interface IXcprojService {
 	 * @return {Promise<XcprojInfo>} collected info about xcproj.
 	 */
 	getXcprojInfo(): Promise<IXcprojInfo>;
+	/**
+	 * Checks if xcproj is available and throws an error in case when it is not available.
+	 * @return {Promise<boolean>}
+	 */
+	checkIfXcodeprojIsRequired(): Promise<boolean>;
 }
 
 /**
@@ -880,6 +892,32 @@ interface IXcprojInfo {
 	xcprojAvailable: boolean;
 }
 
+interface IXcconfigService {
+	/**
+	 * Returns the path to the xcconfig file
+	 * @param projectRoot The path to root folder of native project (platforms/ios)
+	 * @param opts
+	 * @returns {string}
+	 */
+	getPluginsXcconfigFilePath(projectRoot: string, opts: IRelease): string;
+
+	/**
+	 * Returns the value of a property from a xcconfig file.
+	 * @param xcconfigFilePath The path to the xcconfig file
+	 * @param propertyName The name of the property which value will be returned
+	 * @returns {string}
+	 */
+	readPropertyValue(xcconfigFilePath: string, propertyName: string): string;
+
+	/**
+	 * Merges the content of source file into destination file
+	 * @param sourceFile The content of thes source file
+	 * @param destinationFile The content of the destination file
+	 * @returns {Promise<void>}
+	 */
+	mergeFiles(sourceFile: string, destinationFile: string): Promise<void>;
+}
+
 /**
  * Describes helper used during execution of deploy commands.
  */

lib/definitions/project.d.ts

@@ -402,7 +402,7 @@ interface IPlatformProjectService extends NodeJS.EventEmitter, IPlatformProjectS
 
 	beforePrepareAllPlugins(projectData: IProjectData, dependencies?: IDependencyData[]): Promise<void>;
 
-	handleNativeDependenciesChange(projectData: IProjectData): Promise<void>;
+	handleNativeDependenciesChange(projectData: IProjectData, opts: IRelease): Promise<void>;
 
 	/**
 	 * Gets the path wheren App_Resources should be copied.
@@ -484,6 +484,14 @@ interface ICocoaPodsService {
 	 */
 	getPodfileFooter(): string;
 
+	/**
+	 * Merges the Podfile's content from App_Resources in the project's Podfile.
+	 * @param projectData Information about the project.
+	 * @param platformData Information about the platform.
+	 * @returns {Promise<void>}
+	 */
+	applyPodfileFromAppResources(projectData: IProjectData, platformData: IPlatformData): Promise<void>;
+
 	/**
 	 * Prepares the Podfile content of a plugin and merges it in the project's Podfile.
 	 * @param {string} moduleName The module which the Podfile is from.
@@ -525,6 +533,14 @@ interface ICocoaPodsService {
 	 * @returns {Promise<ISpawnResult>} Information about the spawned process.
 	 */
 	executePodInstall(projectRoot: string, xcodeProjPath: string): Promise<ISpawnResult>;
+
+	/**
+	 * Merges pod's xcconfig file into project's xcconfig file
+	 * @param projectData 
+	 * @param platformData 
+	 * @param opts 
+	 */
+	mergePodXcconfigFile(projectData: IProjectData, platformData: IPlatformData, opts: IRelease): Promise<void>;
 }
 
 interface IRubyFunction {

lib/services/android-project-service.ts

@@ -605,7 +605,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		}
 	}
 
-	public async handleNativeDependenciesChange(projectData: IProjectData): Promise<void> {
+	public async handleNativeDependenciesChange(projectData: IProjectData, opts: IRelease): Promise<void> {
 		return;
 	}
 

lib/services/cocoapods-service.ts

@@ -1,6 +1,6 @@
 import { EOL } from "os";
 import * as path from "path";
-import { PluginNativeDirNames, PODFILE_NAME } from "../constants";
+import { PluginNativeDirNames, PODFILE_NAME, NS_BASE_PODFILE } from "../constants";
 
 export class CocoaPodsService implements ICocoaPodsService {
 	private static PODFILE_POST_INSTALL_SECTION_NAME = "post_install";
@@ -11,7 +11,8 @@ export class CocoaPodsService implements ICocoaPodsService {
 		private $errors: IErrors,
 		private $xcprojService: IXcprojService,
 		private $logger: ILogger,
-		private $config: IConfiguration) { }
+		private $config: IConfiguration,
+		private $xcconfigService: IXcconfigService) { }
 
 	public getPodfileHeader(targetName: string): string {
 		return `use_frameworks!${EOL}${EOL}target "${targetName}" do${EOL}`;
@@ -52,6 +53,26 @@ export class CocoaPodsService implements ICocoaPodsService {
 		return podInstallResult;
 	}
 
+	public async mergePodXcconfigFile(projectData: IProjectData, platformData: IPlatformData, opts: IRelease) {
+		const podFilesRootDirName = path.join("Pods", "Target Support Files", `Pods-${projectData.projectName}`);
+		const podFolder = path.join(platformData.projectRoot, podFilesRootDirName);
+		if (this.$fs.exists(podFolder)) {
+			const podXcconfigFilePath = opts && opts.release ? path.join(podFolder, `Pods-${projectData.projectName}.release.xcconfig`)
+				: path.join(podFolder, `Pods-${projectData.projectName}.debug.xcconfig`);
+			const pluginsXcconfigFilePath = this.$xcconfigService.getPluginsXcconfigFilePath(platformData.projectRoot, opts);
+			await this.$xcconfigService.mergeFiles(podXcconfigFilePath, pluginsXcconfigFilePath);
+		}
+	}
+
+	public async applyPodfileFromAppResources(projectData: IProjectData, platformData: IPlatformData): Promise<void> {
+		const { projectRoot, normalizedPlatformName } = platformData;
+		const mainPodfilePath = path.join(projectData.appResourcesDirectoryPath, normalizedPlatformName, PODFILE_NAME);
+		const projectPodfilePath = this.getProjectPodfilePath(projectRoot);
+		if (this.$fs.exists(projectPodfilePath) || this.$fs.exists(mainPodfilePath)) {
+			await this.applyPodfileToProject(NS_BASE_PODFILE, mainPodfilePath, projectData, projectRoot);
+		}
+	}
+
 	public async applyPodfileToProject(moduleName: string, podfilePath: string, projectData: IProjectData, nativeProjectPath: string): Promise<void> {
 		if (!this.$fs.exists(podfilePath)) {
 			this.removePodfileFromProject(moduleName, podfilePath, projectData, nativeProjectPath);