tidev · cb1kenobi · Aug 6, 2015 · Aug 6, 2015
diff --git a/iphone/cli/commands/_build.js b/iphone/cli/commands/_build.js
@@ -2853,6 +2853,16 @@ iOSBuilder.prototype.createXcodeProject = function createXcodeProject(next) {
 		this.logger.trace(__('No extensions to add'));
 	}
 
+	// inject the team
+	var team = cli.tiapp.ios && cli.tiapp.ios.team;
+	if (team) {
+		pbxProject.attributes || (pbxProject.attributes = {});
+		pbxProject.attributes.TargetAttributes || (pbxProject.attributes.TargetAttributes = {});
+		pbxProject.targets.forEach(function (id) {
+			pbxProject.attributes.TargetAttributes[id].DevelopmentTeam = team;
+		});
+	}
+
 	// if any extensions contain a watch app, we must force the min iOS deployment target to 8.2
 	if (this.hasWatchAppV1 || this.hasWatchAppV2orNewer) {
 		// TODO: Make sure the version of Xcode can support this version of watch app
@@ -2907,6 +2917,8 @@ iOSBuilder.prototype.writeEntitlementsPlist = function writeEntitlementsPlist()
 	var entitlementsFile = path.join(this.projectDir, 'Entitlements.plist'),
 		dest = path.join(this.buildDir, 'Entitlements.plist');
 
+	delete this.buildDirFiles[dest];
+
 	if (fs.existsSync(entitlementsFile)) {
 		this.logger.info(__('Found custom entitlements: %s', entitlementsFile.cyan));
 		this.copyFileSync(entitlementsFile, dest);
@@ -2953,7 +2965,6 @@ iOSBuilder.prototype.writeEntitlementsPlist = function writeEntitlementsPlist()
 	} else {
 		this.logger.trace(__('No change, skipping %s', dest.cyan));
 	}
-	delete this.buildDirFiles[dest];
 };
 
 iOSBuilder.prototype.writeInfoPlist = function writeInfoPlist() {

diff --git a/iphone/cli/hooks/install.js b/iphone/cli/hooks/install.js
@@ -187,7 +187,7 @@ exports.init = function (logger, config, cli) {
 						} else if (err.indexOf('0xe8008016') !== -1) {
 							details = __('Chances are there is an issue with your entitlements. Verify the bundle IDs in the generated Info.plist file.');
 						} else if (err.indexOf('0xe8008016') !== -1) {
-							details = __('Your provisioning profile probably has some entitlements that are no enabled in the Entitlements.plist');
+							details = __('Your provisioning profile probably has some entitlements that are not enabled in the Entitlements.plist file.');
 						}
 						next && next(new appc.exception(err, details));
 						next = null;

diff --git a/node_modules/ioslib/lib/sim_focus.scpt b/node_modules/ioslib/lib/sim_focus.scpt
diff --git a/node_modules/ioslib/lib/sim_hide.scpt b/node_modules/ioslib/lib/sim_hide.scpt
diff --git a/node_modules/titanium-sdk/lib/tiappxml.js b/node_modules/titanium-sdk/lib/tiappxml.js
diff --git a/node_modules/titanium-sdk/tests/resources/tiapp2.xml b/node_modules/titanium-sdk/tests/resources/tiapp2.xml
diff --git a/...chKit App/Base.lproj/Interface.storyboard → ...chKit App/Base.lproj/Interface.storyboard b/...chKit App/Base.lproj/Interface.storyboard → ...chKit App/Base.lproj/Interface.storyboard
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/...e/{{ExtName}} WatchKit App/Info.plist.ejs → ...e/{{ExtName}} WatchKit App/Info.plist.ejs b/...e/{{ExtName}} WatchKit App/Info.plist.ejs → ...e/{{ExtName}} WatchKit App/Info.plist.ejs
diff --git a/...WatchKit Extension/GlanceController.h.ejs → ...WatchKit Extension/GlanceController.h.ejs b/...WatchKit Extension/GlanceController.h.ejs → ...WatchKit Extension/GlanceController.h.ejs
diff --git a/...WatchKit Extension/GlanceController.m.ejs → ...WatchKit Extension/GlanceController.m.ejs b/...WatchKit Extension/GlanceController.m.ejs → ...WatchKit Extension/GlanceController.m.ejs
diff --git a/...ages.xcassets/README__ignoredByTemplate__ → ...ages.xcassets/README__ignoredByTemplate__ b/...ages.xcassets/README__ignoredByTemplate__ → ...ages.xcassets/README__ignoredByTemplate__
diff --git a/...tName}} WatchKit Extension/Info.plist.ejs → ...tName}} WatchKit Extension/Info.plist.ejs b/...tName}} WatchKit Extension/Info.plist.ejs → ...tName}} WatchKit Extension/Info.plist.ejs
diff --git a/...chKit Extension/InterfaceController.h.ejs → ...chKit Extension/InterfaceController.h.ejs b/...chKit Extension/InterfaceController.h.ejs → ...chKit Extension/InterfaceController.h.ejs
diff --git a/...chKit Extension/InterfaceController.m.ejs → ...chKit Extension/InterfaceController.m.ejs b/...chKit Extension/InterfaceController.m.ejs → ...chKit Extension/InterfaceController.m.ejs
diff --git a/...it Extension/NotificationController.h.ejs → ...it Extension/NotificationController.h.ejs b/...it Extension/NotificationController.h.ejs → ...it Extension/NotificationController.h.ejs
diff --git a/...it Extension/NotificationController.m.ejs → ...it Extension/NotificationController.m.ejs b/...it Extension/NotificationController.m.ejs → ...it Extension/NotificationController.m.ejs
diff --git a/...it Extension/PushNotificationPayload.apns → ...it Extension/PushNotificationPayload.apns b/...it Extension/PushNotificationPayload.apns → ...it Extension/PushNotificationPayload.apns
diff --git a/...{{ExtName}}.xcodeproj/project.pbxproj.ejs → ...{{ExtName}}.xcodeproj/project.pbxproj.ejs b/...{{ExtName}}.xcodeproj/project.pbxproj.ejs → ...{{ExtName}}.xcodeproj/project.pbxproj.ejs
diff --git a/...sets.xcassets/README__ignoredByTemplate__ → ...sets.xcassets/README__ignoredByTemplate__ b/...sets.xcassets/README__ignoredByTemplate__ → ...sets.xcassets/README__ignoredByTemplate__
diff --git a/...atchApp Extension/ExtensionDelegate.h.ejs → ...atchApp Extension/ExtensionDelegate.h.ejs b/...atchApp Extension/ExtensionDelegate.h.ejs → ...atchApp Extension/ExtensionDelegate.h.ejs
diff --git a/...atchApp Extension/ExtensionDelegate.m.ejs → ...atchApp Extension/ExtensionDelegate.m.ejs b/...atchApp Extension/ExtensionDelegate.m.ejs → ...atchApp Extension/ExtensionDelegate.m.ejs
diff --git a/...WatchApp Extension/GlanceController.h.ejs → ...WatchApp Extension/GlanceController.h.ejs b/...WatchApp Extension/GlanceController.h.ejs → ...WatchApp Extension/GlanceController.h.ejs
diff --git a/...WatchApp Extension/GlanceController.m.ejs → ...WatchApp Extension/GlanceController.m.ejs b/...WatchApp Extension/GlanceController.m.ejs → ...WatchApp Extension/GlanceController.m.ejs
diff --git a/...tName}} WatchApp Extension/Info.plist.ejs → ...tName}} WatchApp Extension/Info.plist.ejs b/...tName}} WatchApp Extension/Info.plist.ejs → ...tName}} WatchApp Extension/Info.plist.ejs
diff --git a/...chApp Extension/InterfaceController.h.ejs → ...chApp Extension/InterfaceController.h.ejs b/...chApp Extension/InterfaceController.h.ejs → ...chApp Extension/InterfaceController.h.ejs
diff --git a/...chApp Extension/InterfaceController.m.ejs → ...chApp Extension/InterfaceController.m.ejs b/...chApp Extension/InterfaceController.m.ejs → ...chApp Extension/InterfaceController.m.ejs
diff --git a/...pp Extension/NotificationController.h.ejs → ...pp Extension/NotificationController.h.ejs b/...pp Extension/NotificationController.h.ejs → ...pp Extension/NotificationController.h.ejs
diff --git a/...pp Extension/NotificationController.m.ejs → ...pp Extension/NotificationController.m.ejs b/...pp Extension/NotificationController.m.ejs → ...pp Extension/NotificationController.m.ejs
diff --git a/...pp Extension/PushNotificationPayload.apns → ...pp Extension/PushNotificationPayload.apns b/...pp Extension/PushNotificationPayload.apns → ...pp Extension/PushNotificationPayload.apns
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/... WatchApp/Base.lproj/Interface.storyboard → ... WatchApp/Base.lproj/Interface.storyboard b/... WatchApp/Base.lproj/Interface.storyboard → ... WatchApp/Base.lproj/Interface.storyboard
diff --git a/...plate/{{ExtName}} WatchApp/Info.plist.ejs → ...plate/{{ExtName}} WatchApp/Info.plist.ejs b/...plate/{{ExtName}} WatchApp/Info.plist.ejs → ...plate/{{ExtName}} WatchApp/Info.plist.ejs
diff --git a/...{{ExtName}}.xcodeproj/project.pbxproj.ejs → ...{{ExtName}}.xcodeproj/project.pbxproj.ejs b/...{{ExtName}}.xcodeproj/project.pbxproj.ejs → ...{{ExtName}}.xcodeproj/project.pbxproj.ejs