Skip to content

Commit 28cf1a4

Browse files
committed
update build-ios
1 parent d313859 commit 28cf1a4

File tree

3 files changed

+26
-13
lines changed

3 files changed

+26
-13
lines changed

packages/cli-platform-ios/src/commands/buildIOS/index.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,18 @@ import {BuildFlags, buildOptions} from './buildOptions';
1212
import {getConfiguration} from './getConfiguration';
1313
import {getXcodeProjectAndDir} from './getXcodeProjectAndDir';
1414
import resolvePods from '../../tools/pods';
15+
import forcePodsNoEffectLogger from '../../tools/forcePodsNoEffectLogger';
1516

1617
async function buildIOS(_: Array<string>, ctx: Config, args: BuildFlags) {
1718
const {xcodeProject, sourceDir} = getXcodeProjectAndDir(ctx.project.ios);
1819

19-
// check if pods need to be installed
20-
await resolvePods(ctx.root, ctx.dependencies, {forceInstall: args.forcePods});
20+
if (ctx.project.ios?.automaticPodsInstallation) {
21+
await resolvePods(ctx.root, ctx.dependencies, {
22+
forceInstall: args.forcePods,
23+
});
24+
} else if (args.forcePods) {
25+
forcePodsNoEffectLogger();
26+
}
2127

2228
process.chdir(sourceDir);
2329

packages/cli-platform-ios/src/commands/runIOS/index.ts

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import {promptForDeviceSelection} from '../../tools/prompts';
3131
import getSimulators from '../../tools/getSimulators';
3232
import {getXcodeProjectAndDir} from '../buildIOS/getXcodeProjectAndDir';
3333
import resolvePods from '../../tools/pods';
34+
import forcePodsNoEffectLogger from '../../tools/forcePodsNoEffectLogger';
3435

3536
export interface FlagsT extends BuildFlags {
3637
simulator?: string;
@@ -54,17 +55,7 @@ async function runIOS(_: Array<string>, ctx: Config, args: FlagsT) {
5455
forceInstall: args.forcePods,
5556
});
5657
} else if (args.forcePods) {
57-
logger.warn(
58-
`${chalk.bold(
59-
'--force-pods',
60-
)} has no effect because automatic CocoaPods installation is disabled. In order to use this flag, set ${chalk.bold(
61-
'project.ios.automaticPodsInstallation',
62-
)} to true in ${chalk.bold(
63-
'react-native.config.js',
64-
)}. For more information, see ${chalk.underline(
65-
'https://github.com/react-native-community/cli/blob/main/docs/projects.md#projectiosautomaticpodsinstallation',
66-
)}`,
67-
);
58+
forcePodsNoEffectLogger();
6859
}
6960

7061
const packagerStatus = await isPackagerRunning(port);
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import {logger} from '@react-native-community/cli-tools';
2+
import chalk from 'chalk';
3+
4+
export default function forcePodsNoEffectLogger() {
5+
logger.warn(
6+
`${chalk.bold(
7+
'--force-pods',
8+
)} has no effect because automatic CocoaPods installation is disabled. In order to use this flag, set ${chalk.bold(
9+
'project.ios.automaticPodsInstallation',
10+
)} to true in ${chalk.bold(
11+
'react-native.config.js',
12+
)}. For more information, see ${chalk.underline(
13+
'https://github.com/react-native-community/cli/blob/main/docs/projects.md#projectiosautomaticpodsinstallation',
14+
)}`,
15+
);
16+
}

0 commit comments

Comments
 (0)