Revert "[build-tools] Update expo-updates runtime version resolution (#…

…354)" This reverts commit 034fd75.
expo · Mar 6, 2024 · 299fdcb · 299fdcb
1 parent 608c1ae
commit 299fdcb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 96 deletions.
diff --git a/packages/build-tools/src/steps/utils/expoUpdates.ts b/packages/build-tools/src/steps/utils/expoUpdates.ts
@@ -1,8 +1,7 @@
 import { Job, Platform } from '@expo/eas-build-job';
 import { bunyan } from '@expo/logger';
 import { ExpoConfig } from '@expo/config';
-
-import { resolveRuntimeVersionAsync } from '../../utils/resolveRuntimeVersionAsync';
+import { getRuntimeVersionNullableAsync } from '@expo/config-plugins/build/utils/Updates';
 
 import {
   iosGetNativelyDefinedChannelAsync,
@@ -32,14 +31,9 @@ export async function configureEASUpdateAsync({
   appConfig: ExpoConfig;
 }): Promise<void> {
   const runtimeVersion =
-    inputs.runtimeVersion ??
+    inputs.channel ??
     job.version?.runtimeVersion ??
-    (await resolveRuntimeVersionAsync({
-      projectDir: workingDirectory,
-      exp: appConfig,
-      platform: job.platform,
-      logger,
-    }));
+    (await getRuntimeVersionNullableAsync(workingDirectory, appConfig, job.platform));
 
   const jobOrInputChannel = inputs.channel ?? job.updates?.channel;
 

diff --git a/packages/build-tools/src/utils/expoUpdates.ts b/packages/build-tools/src/utils/expoUpdates.ts
@@ -1,6 +1,7 @@
 import assert from 'assert';
 
 import { Platform, Job } from '@expo/eas-build-job';
+import { getRuntimeVersionNullableAsync } from '@expo/config-plugins/build/utils/Updates';
 import semver from 'semver';
 
 import {
@@ -22,7 +23,6 @@ import {
 import { BuildContext } from '../context';
 
 import getExpoUpdatesPackageVersionIfInstalledAsync from './getExpoUpdatesPackageVersionIfInstalledAsync';
-import { resolveRuntimeVersionAsync } from './resolveRuntimeVersionAsync';
 
 export async function setRuntimeVersionNativelyAsync(
   ctx: BuildContext<Job>,
@@ -148,12 +148,11 @@ export async function configureExpoUpdatesIfInstalledAsync(ctx: BuildContext<Job
 
   const appConfigRuntimeVersion =
     ctx.job.version?.runtimeVersion ??
-    (await resolveRuntimeVersionAsync({
-      projectDir: ctx.getReactNativeProjectDirectory(),
-      exp: ctx.appConfig,
-      platform: ctx.job.platform,
-      logger: ctx.logger,
-    }));
+    (await getRuntimeVersionNullableAsync(
+      ctx.getReactNativeProjectDirectory(),
+      ctx.appConfig,
+      ctx.job.platform
+    ));
   if (ctx.metadata?.runtimeVersion && ctx.metadata?.runtimeVersion !== appConfigRuntimeVersion) {
     ctx.markBuildPhaseHasWarnings();
     ctx.logger.warn(

diff --git a/packages/build-tools/src/utils/expoUpdatesCli.ts b/packages/build-tools/src/utils/expoUpdatesCli.ts
diff --git a/packages/build-tools/src/utils/resolveRuntimeVersionAsync.ts b/packages/build-tools/src/utils/resolveRuntimeVersionAsync.ts