Merge remote-tracking branch 'origin/master'

# Conflicts:
#	lib/controllers/build-controller.ts
#	lib/services/device/device-install-app-service.ts
#	package-lock.json
#	yarn.lock

Author: farfromrefug

lib/constants.ts

@@ -335,6 +335,8 @@ export type SupportedPlatform = PlatformTypes.ios | PlatformTypes.android;
 
 export const PODFILE_NAME = "Podfile";
 
+export const EXTENSION_PROVISIONING_FILENAME = "provisioning.json";
+
 export class IosProjectConstants {
 	public static XcodeProjExtName = ".xcodeproj";
 	public static XcodeSchemeExtName = ".xcscheme";

lib/controllers/build-controller.ts

@@ -116,7 +116,7 @@ export class BuildController extends EventEmitter implements IBuildController {
 		);
 
 		if (buildData.copyTo) {
-			this.$buildArtifactsService.copyLatestAppPackage(
+			this.$buildArtifactsService.copyAppPackages(
 				buildData.copyTo,
 				platformData,
 				buildData

lib/declarations.d.ts

@@ -530,6 +530,10 @@ interface IProvision {
 	provision: string;
 }
 
+interface IProvisioningJSON {
+	[identifier: string]: string;
+}
+
 interface ITeamIdentifier {
 	teamId: string;
 }

lib/definitions/project.d.ts

@@ -652,6 +652,11 @@ interface ICocoaPodsService {
 		platformData: IPlatformData
 	): Promise<void>;
 
+	applyPodfileFromExtensions(
+		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.

lib/services/cocoapods-service.ts

@@ -21,6 +21,7 @@ import {
 } from "../common/declarations";
 import { injector } from "../common/yok";
 import { XcodeSelectService } from "../common/services/xcode-select-service";
+import * as constants from "../constants";
 
 export class CocoaPodsService implements ICocoaPodsService {
 	private static PODFILE_POST_INSTALL_SECTION_NAME = "post_install";
@@ -121,9 +122,10 @@ ${versionResolutionHint}`);
 		);
 		const podFolder = path.join(platformData.projectRoot, podFilesRootDirName);
 		if (this.$fs.exists(podFolder)) {
-			const pluginsXcconfigFilePaths = this.$xcconfigService.getPluginsXcconfigFilePaths(
-				platformData.projectRoot
-			);
+			const pluginsXcconfigFilePaths =
+				this.$xcconfigService.getPluginsXcconfigFilePaths(
+					platformData.projectRoot
+				);
 			for (const configuration in pluginsXcconfigFilePaths) {
 				const pluginsXcconfigFilePath = pluginsXcconfigFilePaths[configuration];
 				const podXcconfigFilePath = path.join(
@@ -199,6 +201,71 @@ end`.trim();
 		this.$fs.deleteFile(exclusionsPodfile);
 	}
 
+	public async applyPodfileFromExtensions(
+		projectData: IProjectData,
+		platformData: IPlatformData
+	) {
+		const extensionFolderPath = path.join(
+			projectData.getAppResourcesDirectoryPath(),
+			constants.iOSAppResourcesFolderName,
+			constants.NATIVE_EXTENSION_FOLDER
+		);
+		const projectPodfilePath = this.getProjectPodfilePath(
+			platformData.projectRoot
+		);
+
+		if (
+			!this.$fs.exists(extensionFolderPath) ||
+			!this.$fs.exists(projectPodfilePath)
+		) {
+			return;
+		}
+
+		let projectPodFileContent = this.$fs.readText(projectPodfilePath);
+
+		const extensionsPodfile = this.$fs
+			.readDirectory(extensionFolderPath)
+			.filter((name) => {
+				const extensionPath = path.join(extensionFolderPath, name);
+				const stats = this.$fs.getFsStats(extensionPath);
+				return stats.isDirectory() && !name.startsWith(".");
+			})
+			.map((name) => ({
+				targetName: name,
+				podfilePath: path.join(
+					extensionFolderPath,
+					name,
+					constants.PODFILE_NAME
+				),
+			}));
+
+		extensionsPodfile.forEach(({ targetName, podfilePath }) => {
+			// Remove the data between #Begin Podfile and #EndPodfile
+			const regExpToRemove = new RegExp(
+				`${this.getExtensionPodfileHeader(
+					podfilePath,
+					targetName
+				)}[\\s\\S]*?${this.getExtensionPodfileEnd()}`,
+				"mg"
+			);
+			projectPodFileContent = projectPodFileContent.replace(regExpToRemove, "");
+
+			if (this.$fs.exists(podfilePath)) {
+				const podfileContentWithoutTarget = this.$fs.readText(podfilePath);
+				const podFileContent =
+					this.getExtensionPodfileHeader(podfilePath, targetName) +
+					EOL +
+					podfileContentWithoutTarget +
+					EOL +
+					this.getExtensionPodfileEnd();
+
+				projectPodFileContent += EOL + podFileContent;
+			}
+		});
+
+		this.$fs.writeFile(projectPodfilePath, projectPodFileContent);
+	}
+
 	public async applyPodfileToProject(
 		moduleName: string,
 		podfilePath: string,
@@ -216,16 +283,13 @@ end`.trim();
 			return;
 		}
 
-		const {
-			podfileContent,
-			replacedFunctions,
-			podfilePlatformData,
-		} = this.buildPodfileContent(
-			podfilePath,
-			moduleName,
-			projectData,
-			platformData
-		);
+		const { podfileContent, replacedFunctions, podfilePlatformData } =
+			this.buildPodfileContent(
+				podfilePath,
+				moduleName,
+				projectData,
+				platformData
+			);
 		const pathToProjectPodfile = this.getProjectPodfilePath(nativeProjectPath);
 		const projectPodfileContent = this.$fs.exists(pathToProjectPodfile)
 			? this.$fs.readText(pathToProjectPodfile).trim()
@@ -297,11 +361,12 @@ end`.trim();
 				moduleName,
 				projectPodFileContent
 			);
-			projectPodFileContent = this.$cocoaPodsPlatformManager.removePlatformSection(
-				moduleName,
-				projectPodFileContent,
-				podfilePath
-			);
+			projectPodFileContent =
+				this.$cocoaPodsPlatformManager.removePlatformSection(
+					moduleName,
+					projectPodFileContent,
+					podfilePath
+				);
 
 			const defaultPodfileBeginning = this.getPodfileHeader(
 				projectData.projectName
@@ -496,6 +561,20 @@ end`.trim();
 		return `# End Podfile${EOL}`;
 	}
 
+	private getExtensionPodfileHeader(
+		extensionPodFilePath: string,
+		targetName: string
+	): string {
+		const targetHeader = `target "${targetName.trim()}" do`;
+		return `${this.getPluginPodfileHeader(
+			extensionPodFilePath
+		)}${EOL}${targetHeader}`;
+	}
+
+	private getExtensionPodfileEnd(): string {
+		return `end${EOL}${this.getPluginPodfileEnd()}`;
+	}
+
 	private getPostInstallHookHeader() {
 		return `${CocoaPodsService.PODFILE_POST_INSTALL_SECTION_NAME} do |${CocoaPodsService.INSTALLER_BLOCK_PARAMETER_NAME}|${EOL}`;
 	}

lib/services/device/device-install-app-service.ts

@@ -50,7 +50,7 @@ export class DeviceInstallAppService {
 		});
 		const buildOutputOptions = platformData.getValidBuildOutputData(buildData);
 		const outputPath = buildData.outputPath || platformData.getBuildOutputPath(buildData);
-		const packages = await this.$buildArtefactsService.getAllAppPackages(
+		const packages = await this.$buildArtifactsService.getAllAppPackages(
 			outputPath,
 			buildOutputOptions
 		);
@@ -76,11 +76,8 @@ export class DeviceInstallAppService {
 		}
 
 		if (!packageFile) {
-			// this.$logger.error(
-				// `Could not find a package corresponding to the device with identifier '${device.deviceInfo.identifier}'.`);
-			packageFile = await this.$buildArtifactsService.getLatestAppPackagePath(
-				platformData,
-				buildData
+			this.$logger.error(
+				`Could not find a package corresponding to the device with identifier '${device.deviceInfo.identifier}'.`
 			);
 			return;
 		}

lib/services/ios-native-target-service.ts

@@ -13,7 +13,8 @@ import { injector } from "../common/yok";
 export class IOSNativeTargetService implements IIOSNativeTargetService {
 	constructor(
 		protected $fs: IFileSystem,
-		protected $pbxprojDomXcode: IPbxprojDomXcode
+		protected $pbxprojDomXcode: IPbxprojDomXcode,
+		protected $logger: ILogger
 	) {}
 
 	public addTargetToProject(
@@ -141,19 +142,51 @@ export class IOSNativeTargetService implements IIOSNativeTargetService {
 					targetUuid
 				);
 			}
+			const properties: IXcodeTargetBuildConfigurationProperty[] = [];
 
+			// Set for both release and debug
 			if (configurationJson.targetBuildConfigurationProperties) {
-				const properties: IXcodeTargetBuildConfigurationProperty[] = [];
 				_.forEach(
 					configurationJson.targetBuildConfigurationProperties,
 					(value, name: string) => properties.push({ value, name })
 				);
-				this.setXcodeTargetBuildConfigurationProperties(
-					properties,
-					targetName,
-					project
+			}
+
+			if (configurationJson.targetNamedBuildConfigurationProperties) {
+				_.forEach(
+					configurationJson.targetNamedBuildConfigurationProperties,
+					(value, name: string) => {
+						var buildName: BuildNames = null;
+						switch (name) {
+							case "debug": {
+								buildName = BuildNames.debug;
+								break;
+							}
+							case "release": {
+								buildName = BuildNames.release;
+								break;
+							}
+							default: {
+								this.$logger.warn(
+									"Ignoring targetNamedBuildConfigurationProperties: %s. Only 'release', 'debug' are allowed.",
+									name
+								);
+							}
+						}
+						if (buildName) {
+							_.forEach(value, (value, name: string) =>
+								properties.push({ value, name, buildNames: [buildName] })
+							);
+						}
+					}
 				);
 			}
+
+			this.setXcodeTargetBuildConfigurationProperties(
+				properties,
+				targetName,
+				project
+			);
 		}
 	}
 }