remove bumpVersionAsync

CHANGELOG.md

@@ -6,6 +6,8 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🛠 Breaking changes
 
+- Only allow autoIncrementing on managed projects. ([#630](https://github.com/expo/eas-cli/pull/630) by [@jkhales](https://github.com/jkhales))
+
 ### 🎉 New features
 
 ### 🐛 Bug fixes

packages/eas-cli/src/build/ios/__tests__/version-test.ts

@@ -1,13 +1,10 @@
 import { ExpoConfig } from '@expo/config';
-import { IOSConfig } from '@expo/config-plugins';
 import fs from 'fs-extra';
 import { vol } from 'memfs';
 import os from 'os';
 
-import { readPlistAsync } from '../plist';
 import {
   BumpStrategy,
-  bumpVersionAsync,
   bumpVersionInAppJsonAsync,
   evaluateTemplateString,
   readBuildNumberAsync,
@@ -35,73 +32,6 @@ describe(evaluateTemplateString, () => {
   });
 });
 
-// generic workflow
-describe(bumpVersionAsync, () => {
-  it('bumps expo.ios.buildNumber and CFBundleVersion when strategy = BumpStrategy.BUILD_NUMBER', async () => {
-    const fakeExp = initGenericProject();
-
-    await bumpVersionAsync({
-      bumpStrategy: BumpStrategy.BUILD_NUMBER,
-      projectDir: '/repo',
-      exp: fakeExp,
-    });
-
-    const appJSON = await fs.readJSON('/repo/app.json');
-    const infoPlist = (await readPlistAsync(
-      '/repo/ios/myproject/Info.plist'
-    )) as IOSConfig.InfoPlist;
-    expect(fakeExp.version).toBe('1.0.0');
-    expect(fakeExp.ios?.buildNumber).toBe('2');
-    expect(appJSON.expo.version).toBe('1.0.0');
-    expect(appJSON.expo.ios.buildNumber).toBe('2');
-    expect(infoPlist['CFBundleShortVersionString']).toBe('1.0.0');
-    expect(infoPlist['CFBundleVersion']).toBe('2');
-  });
-
-  it('bumps expo.version and CFBundleShortVersionString when strategy = BumpStrategy.SHORT_VERSION', async () => {
-    const fakeExp = initGenericProject();
-
-    await bumpVersionAsync({
-      bumpStrategy: BumpStrategy.SHORT_VERSION,
-      projectDir: '/repo',
-      exp: fakeExp,
-    });
-
-    const appJSON = await fs.readJSON('/repo/app.json');
-    const infoPlist = (await readPlistAsync(
-      '/repo/ios/myproject/Info.plist'
-    )) as IOSConfig.InfoPlist;
-    expect(fakeExp.version).toBe('1.0.1');
-    expect(fakeExp.ios?.buildNumber).toBe('1');
-    expect(appJSON.expo.version).toBe('1.0.1');
-    expect(appJSON.expo.ios.buildNumber).toBe('1');
-    expect(infoPlist['CFBundleShortVersionString']).toBe('1.0.1');
-    expect(infoPlist['CFBundleVersion']).toBe('1');
-  });
-
-  it('does not bump any version when strategy = BumpStrategy.NOOP', async () => {
-    const fakeExp = initGenericProject();
-
-    await bumpVersionAsync({
-      bumpStrategy: BumpStrategy.NOOP,
-      projectDir: '/repo',
-      exp: fakeExp,
-    });
-
-    const appJSON = await fs.readJSON('/repo/app.json');
-    const infoPlist = (await readPlistAsync(
-      '/repo/ios/myproject/Info.plist'
-    )) as IOSConfig.InfoPlist;
-    expect(fakeExp.version).toBe('1.0.0');
-    expect(fakeExp.ios?.buildNumber).toBe('1');
-    expect(appJSON.expo.version).toBe('1.0.0');
-    expect(appJSON.expo.ios.buildNumber).toBe('1');
-    expect(infoPlist['CFBundleShortVersionString']).toBe('1.0.0');
-    expect(infoPlist['CFBundleVersion']).toBe('1');
-  });
-});
-
-// managed workflow
 describe(bumpVersionInAppJsonAsync, () => {
   it('bumps expo.ios.buildNumber when strategy = BumpStrategy.BUILD_NUMBER', async () => {
     const fakeExp = initManagedProject();

packages/eas-cli/src/build/ios/configure.ts

@@ -11,7 +11,7 @@ import { resolveWorkflowAsync } from '../../project/workflow';
 import { ConfigureContext } from '../context';
 import { isExpoUpdatesInstalled } from '../utils/updates';
 import { configureUpdatesAsync, syncUpdatesConfigurationAsync } from './UpdatesModule';
-import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
+import { BumpStrategy, bumpVersionInAppJsonAsync } from './version';
 
 export async function configureIosAsync(ctx: ConfigureContext): Promise<void> {
   if (!ctx.hasIosNativeProject) {
@@ -44,7 +44,6 @@ export async function validateAndSyncProjectConfigurationAsync({
     if (isExpoUpdatesInstalled(projectDir)) {
       await syncUpdatesConfigurationAsync(projectDir, exp);
     }
-    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
   } else {
     await bumpVersionInAppJsonAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
   }

packages/eas-cli/src/build/ios/version.ts

@@ -10,7 +10,7 @@ import Log from '../../log';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { promptAsync } from '../../prompts';
 import { updateAppJsonConfigAsync } from '../utils/appJson';
-import { readPlistAsync, writePlistAsync } from './plist';
+import { readPlistAsync } from './plist';
 
 export enum BumpStrategy {
   SHORT_VERSION,
@@ -18,26 +18,6 @@ export enum BumpStrategy {
   NOOP,
 }
 
-export async function bumpVersionAsync({
-  bumpStrategy,
-  projectDir,
-  exp,
-}: {
-  projectDir: string;
-  exp: ExpoConfig;
-  bumpStrategy: BumpStrategy;
-}): Promise<void> {
-  if (bumpStrategy === BumpStrategy.NOOP) {
-    return;
-  }
-  ensureStaticConfigExists(projectDir);
-  const infoPlist = await readInfoPlistAsync(projectDir);
-  await bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp });
-  Log.log('Updated versions in app.json');
-  await writeVersionsToInfoPlistAsync({ projectDir, exp, infoPlist });
-  Log.log('Synchronized versions with Info.plist');
-}
-
 export async function bumpVersionInAppJsonAsync({
   bumpStrategy,
   projectDir,
@@ -151,37 +131,11 @@ export async function maybeResolveVersionsAsync(
   }
 }
 
-async function writeVersionsToInfoPlistAsync({
-  projectDir,
-  exp,
-  infoPlist,
-}: {
-  projectDir: string;
-  exp: ExpoConfig;
-  infoPlist: IOSConfig.InfoPlist;
-}): Promise<IOSConfig.InfoPlist> {
-  let updatedInfoPlist = IOSConfig.Version.setVersion(exp, infoPlist);
-  updatedInfoPlist = IOSConfig.Version.setBuildNumber(exp, updatedInfoPlist);
-  await writeInfoPlistAsync({ projectDir, infoPlist: updatedInfoPlist });
-  return updatedInfoPlist;
-}
-
 async function readInfoPlistAsync(projectDir: string): Promise<IOSConfig.InfoPlist> {
   const infoPlistPath = IOSConfig.Paths.getInfoPlistPath(projectDir);
   return (await readPlistAsync(infoPlistPath)) as IOSConfig.InfoPlist;
 }
 
-async function writeInfoPlistAsync({
-  projectDir,
-  infoPlist,
-}: {
-  projectDir: string;
-  infoPlist: IOSConfig.InfoPlist;
-}): Promise<void> {
-  const infoPlistPath = IOSConfig.Paths.getInfoPlistPath(projectDir);
-  await writePlistAsync(infoPlistPath, infoPlist);
-}
-
 function ensureStaticConfigExists(projectDir: string): void {
   const paths = getConfigFilePaths(projectDir);
   if (!paths.staticConfigPath) {

packages/eas-cli/src/commands/build/index.ts

@@ -297,6 +297,14 @@ export default class Build extends EasCommand {
       error(EAS_UNAVAILABLE_MESSAGE, { exit: 1 });
     }
 
+    const { autoIncrement } = buildCtx.buildProfile as any; // TODO-JJ remove cast to any when android autoIncrementing is added
+    if (buildCtx.workflow === Workflow.GENERIC && autoIncrement) {
+      // Once we work out the kinks, this can be relaxed to support some GENERIC workflows.
+      // One of the known issues with extending autoIncrement to GENERIC projects is
+      // multiflavor android projects.
+      throw new Error('Autoincrementing is only supported for managed apps.');
+    }
+
     return await this.startBuildAsync(buildCtx);
   }