Skip to content

Pass mobileProvisionData to prepare #2895

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
Jun 16, 2017
Merged

Pass mobileProvisionData to prepare #2895

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
5 changes: 5 additions & 0 deletions lib/definitions/platform.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,11 @@ interface IPlatformSpecificData {
* Target SDK for Android.
*/
sdk: string;

/**
* Data from mobileProvision.
*/
mobileProvisionData?: any;
}

/**
Expand Down
7 changes: 4 additions & 3 deletions lib/services/ios-project-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { IOSProvisionService } from "./ios-provision-service";
import { IOSEntitlementsService } from "./ios-entitlements-service";
import { XCConfigService } from "./xcconfig-service";
import * as simplePlist from "simple-plist";
import * as mobileprovision from "ios-mobileprovision-finder";

export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase implements IPlatformProjectService {
private static XCODE_PROJECT_EXT_NAME = ".xcodeproj";
Expand Down Expand Up @@ -392,7 +393,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
await this.createIpa(projectRoot, projectData, buildConfig);
}

private async setupSigningFromProvision(projectRoot: string, projectData: IProjectData, provision?: string): Promise<void> {
private async setupSigningFromProvision(projectRoot: string, projectData: IProjectData, provision?: string, mobileProvisionData?: mobileprovision.provision.MobileProvision): Promise<void> {
if (provision) {
const xcode = this.$pbxprojDomXcode.Xcode.open(this.getPbxProjPath(projectData));
const signing = xcode.getSigning(projectData.projectName);
Expand All @@ -412,7 +413,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ

if (shouldUpdateXcode) {
const pickStart = Date.now();
const mobileprovision = await this.$iOSProvisionService.pick(provision, projectData.projectId);
const mobileprovision = mobileProvisionData || await this.$iOSProvisionService.pick(provision, projectData.projectId);
const pickEnd = Date.now();
this.$logger.trace("Searched and " + (mobileprovision ? "found" : "failed to find ") + " matching provisioning profile. (" + (pickEnd - pickStart) + "ms.)");
if (!mobileprovision) {
Expand Down Expand Up @@ -638,7 +639,7 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f

if (provision) {
let projectRoot = path.join(projectData.platformsDir, "ios");
await this.setupSigningFromProvision(projectRoot, projectData, provision);
await this.setupSigningFromProvision(projectRoot, projectData, provision, platformSpecificData.mobileProvisionData);
}

let project = this.createPbxProj(projectData);
Expand Down