Skip to content

Commit f03403d

Browse files
committed
iOS signing was failing android builds, xcconfig provisioning profiles are no longer passed as command line args to xcodebuild
1 parent 5616423 commit f03403d

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

lib/services/ios-project-service.ts

+9-1
Original file line numberDiff line numberDiff line change
@@ -997,11 +997,13 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
997997
return (() => {
998998
// TRICKY: I am not sure why we totally disregard the buildConfig parameter here.
999999
buildConfig = buildConfig || {};
1000+
let isXCConfigDefined = false;
10001001

10011002
if (this.$options.teamId) {
10021003
buildConfig.teamIdentifier = this.$options.teamId;
10031004
} else {
10041005
buildConfig = this.readXCConfigSigning();
1006+
isXCConfigDefined = true;
10051007
if (!buildConfig.codeSignIdentity && !buildConfig.mobileProvisionIdentifier && !buildConfig.teamIdentifier) {
10061008
buildConfig = this.readBuildConfigFromPlatforms();
10071009
}
@@ -1013,6 +1015,7 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
10131015
} else if (buildConfig.teamIdentifier) {
10141016
signingStyle = "Automatic";
10151017
} else if (helpers.isInteractive()) {
1018+
isXCConfigDefined = false;
10161019
let signingStyles = [
10171020
"Manual - Select existing provisioning profile for use",
10181021
"Automatic - Select Team ID for signing and let Xcode select managed provisioning profile"
@@ -1038,7 +1041,7 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
10381041
}
10391042
}
10401043

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

1058+
if (isXCConfigDefined) {
1059+
delete buildConfig.mobileProvisionIdentifier;
1060+
delete buildConfig.teamIdentifier;
1061+
}
1062+
10551063
return buildConfig;
10561064
}).future<IiOSBuildConfig>()();
10571065
}

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"glob": "^7.0.3",
4545
"iconv-lite": "0.4.11",
4646
"inquirer": "0.9.0",
47-
"ios-mobileprovision-finder": "1.0.8",
47+
"ios-mobileprovision-finder": "1.0.9",
4848
"ios-sim-portable": "~1.6.0",
4949
"lockfile": "1.0.1",
5050
"lodash": "4.13.1",

0 commit comments

Comments
 (0)