Merge pull request #1547 from NativeScript/cankov/app-resources-xcconfig

Allow build.xcconfig in app/App_Resources/iOS/build.xcconfig

Author: PanayotCankov

lib/services/ios-project-service.ts

@@ -393,6 +393,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 	public processConfigurationFilesFromAppResources(): IFuture<void> {
 		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<void>()();
 	}
 
@@ -778,7 +777,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		}).future<void>()();
 	}
 
-	private regeneratePluginsXcconfigFile(): IFuture<void> {
+	private mergeProjectXcconfigFiles(): IFuture<void> {
 		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();