Skip to content

iOS signing fixes #2356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 15, 2016
Merged

iOS signing fixes #2356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion lib/services/ios-project-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -997,11 +997,13 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
return (() => {
// TRICKY: I am not sure why we totally disregard the buildConfig parameter here.
buildConfig = buildConfig || {};
let isXCConfigDefined = false;

if (this.$options.teamId) {
buildConfig.teamIdentifier = this.$options.teamId;
} else {
buildConfig = this.readXCConfigSigning();
isXCConfigDefined = true;
if (!buildConfig.codeSignIdentity && !buildConfig.mobileProvisionIdentifier && !buildConfig.teamIdentifier) {
buildConfig = this.readBuildConfigFromPlatforms();
}
Expand All @@ -1013,6 +1015,7 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
} else if (buildConfig.teamIdentifier) {
signingStyle = "Automatic";
} else if (helpers.isInteractive()) {
isXCConfigDefined = false;
let signingStyles = [
"Manual - Select existing provisioning profile for use",
"Automatic - Select Team ID for signing and let Xcode select managed provisioning profile"
Expand All @@ -1038,7 +1041,7 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
}
}

if (signingStyle) {
if (signingStyle && !isXCConfigDefined) {
const pbxprojPath = path.join(projectRoot, this.$projectData.projectName + ".xcodeproj", "project.pbxproj");
const xcode = Xcode.open(pbxprojPath);
switch(signingStyle) {
Expand All @@ -1052,6 +1055,11 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
xcode.save();
}

if (isXCConfigDefined) {
delete buildConfig.mobileProvisionIdentifier;
delete buildConfig.teamIdentifier;
}

return buildConfig;
}).future<IiOSBuildConfig>()();
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"glob": "^7.0.3",
"iconv-lite": "0.4.11",
"inquirer": "0.9.0",
"ios-mobileprovision-finder": "1.0.8",
"ios-mobileprovision-finder": "1.0.9",
"ios-sim-portable": "~1.6.0",
"lockfile": "1.0.1",
"lodash": "4.13.1",
Expand Down