install pods with correct architecture

Author: TMisiukiewicz

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

@@ -12,12 +12,20 @@ import {BuildFlags, buildOptions} from './buildOptions';
 import {getConfiguration} from './getConfiguration';
 import {getXcodeProjectAndDir} from './getXcodeProjectAndDir';
 import resolvePods from '../../tools/pods';
+import getArchitecture from '../../tools/getArchitecture';
 
 async function buildIOS(_: Array<string>, ctx: Config, args: BuildFlags) {
   const {xcodeProject, sourceDir} = getXcodeProjectAndDir(ctx.project.ios);
 
+  const isAppRunningNewArchitecture = ctx.project.ios?.sourceDir
+    ? await getArchitecture(ctx.project.ios?.sourceDir)
+    : undefined;
+
   // check if pods need to be installed
-  await resolvePods(ctx.root, ctx.dependencies, {forceInstall: args.forcePods});
+  await resolvePods(ctx.root, ctx.dependencies, {
+    forceInstall: args.forcePods,
+    newArchEnabled: isAppRunningNewArchitecture,
+  });
 
   process.chdir(sourceDir);
 

packages/cli-platform-ios/src/tools/installPods.ts

@@ -13,20 +13,28 @@ import runBundleInstall from './runBundleInstall';
 
 interface PodInstallOptions {
   skipBundleInstall?: boolean;
+  newArchEnabled?: boolean;
 }
 
-async function runPodInstall(
-  loader: Ora,
-  shouldHandleRepoUpdate: boolean = true,
-) {
+interface RunPodInstallOptions {
+  shouldHandleRepoUpdate?: boolean;
+  newArchEnabled?: boolean;
+}
+
+async function runPodInstall(loader: Ora, options?: RunPodInstallOptions) {
+  const shouldHandleRepoUpdate = options?.shouldHandleRepoUpdate || true;
   try {
     loader.start(
       `Installing CocoaPods dependencies ${chalk.dim(
         '(this may take a few minutes)',
       )}`,
     );
 
-    await execa('bundle', ['exec', 'pod', 'install']);
+    await execa('bundle', ['exec', 'pod', 'install'], {
+      env: {
+        RCT_NEW_ARCH_ENABLED: options?.newArchEnabled ? '1' : '0',
+      },
+    });
   } catch (error) {
     // "pod" command outputs errors to stdout (at least some of them)
     const stderr = (error as any).stderr || (error as any).stdout;
@@ -40,7 +48,10 @@ async function runPodInstall(
      */
     if (stderr.includes('pod repo update') && shouldHandleRepoUpdate) {
       await runPodUpdate(loader);
-      await runPodInstall(loader, false);
+      await runPodInstall(loader, {
+        shouldHandleRepoUpdate: false,
+        newArchEnabled: options?.newArchEnabled,
+      });
     } else {
       loader.fail();
       logger.error(stderr);
@@ -143,7 +154,7 @@ async function installPods(
       await installCocoaPods(loader);
     }
 
-    await runPodInstall(loader);
+    await runPodInstall(loader, {newArchEnabled: options?.newArchEnabled});
   } finally {
     process.chdir('..');
   }

packages/cli-platform-ios/src/tools/pods.ts

@@ -16,6 +16,7 @@ import {
 
 interface ResolvePodsOptions {
   forceInstall?: boolean;
+  newArchEnabled?: boolean;
 }
 
 interface NativeDependencies {
@@ -114,11 +115,25 @@ export default async function resolvePods(
     !compareMd5Hashes(currentDependenciesHash, cachedDependenciesHash) ||
     !arePodsInstalled
   ) {
-    await install(
-      packageJson,
-      cachedDependenciesHash,
-      currentDependenciesHash,
-      iosFolderPath,
-    );
+    const loader = getLoader('Installing CocoaPods...');
+    try {
+      await installPods(loader, {
+        skipBundleInstall: !!cachedDependenciesHash,
+        newArchEnabled: options?.newArchEnabled,
+      });
+      cacheManager.set(
+        packageJson.name,
+        'dependencies',
+        currentDependenciesHash,
+      );
+      loader.succeed();
+    } catch {
+      loader.fail();
+      throw new CLIError(
+        `Something when wrong while installing CocoaPods. Please run ${chalk.bold(
+          'pod install',
+        )} manually`,
+      );
+    }
   }
 }