Merge Info.plist from App_Resources and plugins into platforms/ios

Author: PanayotCankov

lib/services/ios-project-service.ts

@@ -11,6 +11,7 @@ import * as constants from "../constants";
 import * as helpers from "../common/helpers";
 import * as projectServiceBaseLib from "./platform-project-service-base";
 import Future = require("fibers/future");
+import { PlistSession } from "plist-merge-patch";
 
 export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase implements IPlatformProjectService {
 	private static XCODE_PROJECT_EXT_NAME = ".xcodeproj";
@@ -350,12 +351,75 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 
 	public prepareAppResources(appResourcesDirectoryPath: string): IFuture<void> {
 		return (() => {
+			let platformFolder = path.join(appResourcesDirectoryPath, this.platformData.normalizedPlatformName);
+			var filterFile = (filename: string) => this.$fs.deleteFile(path.join(platformFolder, filename)).wait();
+			
+			// These got copied but are not actually resources. They should be rather filterd before the copy in the first place but anyway, let's just delete them here.
+			filterFile("Info.plist");
+			// filterFile("Podfile");
+			// filterFile("Entitlements.plist");
+
 			this.$fs.deleteDirectory(this.getAppResourcesDestinationDirectoryPath().wait()).wait();
 		}).future<void>()();
 	}
 
 	public processConfigurationFilesFromAppResources(): IFuture<void> {
-		return Future.fromResult();
+		return (() => {
+			this.mergeInfoPlists().wait();
+		}).future<void>()();
+	}
+	
+	private mergeInfoPlists(): IFuture<void> {
+		return (() => {
+			let projectDir = this.$projectData.projectDir;
+			let infoPlistPath = path.join(projectDir, constants.APP_FOLDER_NAME, constants.APP_RESOURCES_FOLDER_NAME, this.platformData.normalizedPlatformName, "Info.plist");
+			
+			if (!this.$fs.exists(infoPlistPath).wait()) {
+				this.$logger.trace("Info.plist: No app/App_Resources/iOS/Info.plist found, falling back to pre-1.6.0 Info.plist behavior.");
+				return;
+			}
+			
+			let session = new PlistSession({ log: (txt: string) => this.$logger.trace("Info.plist: " + txt) });
+			let makePatch = (plistPath: string) => {
+				if (!this.$fs.exists(plistPath).wait()) {
+					return;
+				}
+				
+				session.patch({
+					name: path.relative(projectDir, plistPath),
+					read: () => this.$fs.readFile(plistPath).wait().toString()
+				});
+			}
+			
+			let allPlugins: IPluginData[] = (<IPluginsService>this.$injector.resolve("pluginsService")).getAllInstalledPlugins().wait();
+			for (let plugin of allPlugins) {
+				let pluginInfoPlistPath = path.join(plugin.pluginPlatformsFolderPath(IOSProjectService.IOS_PLATFORM_NAME), "Info.plist");
+				makePatch(pluginInfoPlistPath);
+			}
+			
+			makePatch(infoPlistPath);
+			
+			if (this.$projectData.projectId) {
+				session.patch({
+					name: "CFBundleIdentifier from package.json nativescript.id",
+					read: () =>
+						`<?xml version="1.0" encoding="UTF-8"?>
+						<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+						<plist version="1.0">
+						<dict>
+							<key>CFBundleIdentifier</key>
+							<string>${ this.$projectData.projectId }</string>
+						</dict>
+						</plist>`
+				});
+			}
+			
+			var plistContent = session.build();
+			
+			this.$logger.trace("Info.plist: Write to: " + this.platformData.configurationFilePath);
+			this.$fs.writeFile(this.platformData.configurationFilePath, plistContent).wait();
+
+		}).future<void>()();
 	}
 
 	private get projectPodFilePath(): string {

package.json

@@ -58,6 +58,7 @@
     "open": "0.0.5",
     "osenv": "0.1.3",
     "plist": "1.1.0",
+    "plist-merge-patch": "0.0.9",
     "plistlib": "0.2.1",
     "progress-stream": "1.1.1",
     "prompt": "https://github.com/Icenium/prompt/tarball/master",