Skip to content

Commit b693036

Browse files
committed
fix: remove installPods property from platform's project interface
1 parent 98558ff commit b693036

File tree

4 files changed

+8
-16
lines changed

4 files changed

+8
-16
lines changed

lib/definitions/project.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ interface IPlatformProjectService extends NodeJS.EventEmitter, IPlatformProjectS
410410
getAppResourcesDestinationDirectoryPath(projectData: IProjectData): string;
411411

412412
cleanDeviceTempFolder(deviceIdentifier: string, projectData: IProjectData): Promise<void>;
413-
processConfigurationFilesFromAppResources(projectData: IProjectData, opts: { release: boolean, installPods: boolean }): Promise<void>;
413+
processConfigurationFilesFromAppResources(projectData: IProjectData, opts: { release: boolean }): Promise<void>;
414414

415415
/**
416416
* Ensures there is configuration file (AndroidManifest.xml, Info.plist) in app/App_Resources.

lib/services/ios-project-service.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,7 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
791791
this.$fs.deleteDirectory(this.getAppResourcesDestinationDirectoryPath(projectData));
792792
}
793793

794-
public async processConfigurationFilesFromAppResources(projectData: IProjectData, opts: { release: boolean, installPods: boolean }): Promise<void> {
794+
public async processConfigurationFilesFromAppResources(projectData: IProjectData, opts: { release: boolean }): Promise<void> {
795795
await this.mergeInfoPlists({ release: opts.release }, projectData);
796796
await this.$iOSEntitlementsService.merge(projectData);
797797
await this.mergeProjectXcconfigFiles(opts.release, projectData);
@@ -800,10 +800,6 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
800800
}
801801

802802
this.$pluginVariablesService.interpolateAppIdentifier(this.getPlatformData(projectData).configurationFilePath, projectData.projectIdentifiers.ios);
803-
804-
if (opts.installPods) {
805-
await this.installPodsIfAny(projectData);
806-
}
807803
}
808804

809805
private getInfoPlistPath(projectData: IProjectData): string {

lib/services/prepare-platform-native-service.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,10 @@ export class PreparePlatformNativeService extends PreparePlatformService impleme
4242
await config.platformData.platformProjectService.prepareProject(config.projectData, config.platformSpecificData);
4343
}
4444

45-
const shouldPrepareModules = !config.changesInfo || config.changesInfo.modulesChanged;
45+
const hasModulesChange = !config.changesInfo || config.changesInfo.modulesChanged;
46+
const hasConfigChange = !config.changesInfo || config.changesInfo.configChanged;
4647

47-
if (shouldPrepareModules) {
48+
if (hasModulesChange) {
4849
await this.$pluginsService.validate(config.platformData, config.projectData);
4950

5051
const appDestinationDirectoryPath = path.join(config.platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME);
@@ -64,9 +65,9 @@ export class PreparePlatformNativeService extends PreparePlatformService impleme
6465
await this.$nodeModulesBuilder.prepareNodeModules({ nodeModulesData, release: config.appFilesUpdaterOptions.release });
6566
}
6667

67-
if (!config.changesInfo || config.changesInfo.configChanged || config.changesInfo.modulesChanged) {
68-
// Passing !shouldPrepareModules` we assume that if the node modules are prepared base Podfile content is added and `pod install` is executed.
69-
await config.platformData.platformProjectService.processConfigurationFilesFromAppResources(config.projectData, {release:config.appFilesUpdaterOptions.release, installPods: !shouldPrepareModules});
68+
if (hasModulesChange || hasConfigChange) {
69+
await config.platformData.platformProjectService.processConfigurationFilesFromAppResources(config.projectData, { release: config.appFilesUpdaterOptions.release });
70+
await config.platformData.platformProjectService.afterPrepareAllPlugins(config.projectData);
7071
}
7172

7273
config.platformData.platformProjectService.interpolateConfigurationFile(config.projectData, config.platformSpecificData);

lib/tools/node-modules/node-modules-dest-copy.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,6 @@ export class NpmPluginPrepare {
112112
}
113113

114114
protected async afterPrepare(dependencies: IDependencyData[], platform: string, projectData: IProjectData): Promise<void> {
115-
await this.$platformsData.getPlatformData(platform, projectData).platformProjectService.afterPrepareAllPlugins(projectData);
116-
this.writePreparedDependencyInfo(dependencies, platform, projectData);
117-
}
118-
119-
private writePreparedDependencyInfo(dependencies: IDependencyData[], platform: string, projectData: IProjectData): void {
120115
const prepareData: IDictionary<boolean> = {};
121116
_.each(dependencies, d => {
122117
prepareData[d.name] = true;

0 commit comments

Comments
 (0)