diff --git a/lib/services/ios-project-service.ts b/lib/services/ios-project-service.ts index e0b186bb36..c08ebc5841 100644 --- a/lib/services/ios-project-service.ts +++ b/lib/services/ios-project-service.ts @@ -393,6 +393,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ public processConfigurationFilesFromAppResources(): IFuture { return (() => { this.mergeInfoPlists().wait(); + this.mergeProjectXcconfigFiles().wait(); _(this.getAllInstalledPlugins().wait()) .map(pluginData => this.$pluginVariablesService.interpolatePluginVariables(pluginData, this.platformData.configurationFilePath).wait()) .value(); @@ -565,8 +566,6 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ this.executePodInstall().wait(); } - - this.regeneratePluginsXcconfigFile().wait(); }).future()(); } @@ -778,7 +777,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ }).future()(); } - private regeneratePluginsXcconfigFile(): IFuture { + private mergeProjectXcconfigFiles(): IFuture { return (() => { this.$fs.deleteFile(this.pluginsDebugXcconfigFilePath).wait(); this.$fs.deleteFile(this.pluginsReleaseXcconfigFilePath).wait(); @@ -793,6 +792,12 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ } } + let appResourcesXcconfigPath = path.join(this.$projectData.projectDir, constants.APP_FOLDER_NAME, constants.APP_RESOURCES_FOLDER_NAME, this.platformData.normalizedPlatformName, "build.xcconfig"); + if (this.$fs.exists(appResourcesXcconfigPath).wait()) { + this.mergeXcconfigFiles(appResourcesXcconfigPath, this.pluginsDebugXcconfigFilePath).wait(); + this.mergeXcconfigFiles(appResourcesXcconfigPath, this.pluginsReleaseXcconfigFilePath).wait(); + } + let podFolder = path.join(this.platformData.projectRoot, "Pods/Target Support Files/Pods/"); if (this.$fs.exists(podFolder).wait()) { this.mergeXcconfigFiles(path.join(this.platformData.projectRoot, "Pods/Target Support Files/Pods/Pods.debug.xcconfig"), this.pluginsDebugXcconfigFilePath).wait();