Merge pull request #9446 from cb1kenobi/timob-25319

[TIMOB-25319] Fixed export options when packaging app that uses Cloud Kit.
tidev · Sep 20, 2017 · 18fe7f5 · 18fe7f5
2 parents b56b146 + 6a5473b
commit 18fe7f5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/iphone/cli/commands/_build.js b/iphone/cli/commands/_build.js
@@ -3108,6 +3108,9 @@ iOSBuilder.prototype.createXcodeProject = function createXcodeProject(next) {
 	xobjs.XCConfigurationList[xobjs.PBXNativeTarget[mainTargetUuid].buildConfigurationList].buildConfigurations.forEach(function (buildConf) {
 		const bs = appc.util.mix(xobjs.XCBuildConfiguration[buildConf.value].buildSettings, buildSettings);
 		delete bs['"CODE_SIGN_IDENTITY[sdk=iphoneos*]"'];
+
+		bs.PRODUCT_BUNDLE_IDENTIFIER = '"' + this.tiapp.id + '"';
+
 		if (this.provisioningProfile) {
 			bs.DEVELOPMENT_TEAM = this.provisioningProfile.appPrefix;
 			bs.PROVISIONING_PROFILE = '"' + this.provisioningProfile.uuid + '"';

diff --git a/iphone/cli/hooks/package.js b/iphone/cli/hooks/package.js
@@ -224,6 +224,15 @@ exports.init = function (logger, config, cli) {
 		exportsOptions.provisioningProfiles = {};
 		exportsOptions.provisioningProfiles[builder.tiapp.id] = pp.uuid;
 
+		// check if the app is using CloudKit
+		const entitlementsFile = path.join(builder.buildDir, builder.tiapp.name + '.entitlements');
+		if (fs.existsSync(entitlementsFile)) {
+			const plist = new appc.plist(entitlementsFile);
+			if (Object.keys(plist).indexOf('com.apple.developer.icloud-container-identifiers') !== -1) {
+				exportsOptions.iCloudContainerEnvironment = 'Production';
+			}
+		}
+
 		fs.writeFileSync(exportsOptionsPlistFile, exportsOptions.toString('xml'));
 
 		// construct the command