feat(eas-cli): Add support for VisionOS in provisioning profiles and tests

* [eas-cli] Don't bump default version for Android

When the versionCode is initialized with 1, don't bump it even if autoIncrement=true

See: https://linear.app/expo/issue/ENG-14633/start-autoincrement-counter-at-0-so-first-build-has-buildnumber-==-1

* [eas-cli] Add tests for Android version

Testing the version resolving behavior for Android

See: https://linear.app/expo/issue/ENG-14633/start-autoincrement-counter-at-0-so-first-build-has-buildnumber-==-1

* [eas-cli] Don't bump default version for Ios

When the buildNumber is 1, don't bump it even if autoIncrement=true

See: https://linear.app/expo/issue/ENG-14633/start-autoincrement-counter-at-0-so-first-build-has-buildnumber-==-1

* [eas-cli] Add tests for Ios version

Testing the version resolving behavior for Ios

See: https://linear.app/expo/issue/ENG-14633/start-autoincrement-counter-at-0-so-first-build-has-buildnumber-==-1

* [eas-cli] Lint

Lint

See: https://linear.app/expo/issue/ENG-14633/start-autoincrement-counter-at-0-so-first-build-has-buildnumber-==-1

* [eas-cli] Add tests

Added tests for remote version autoIncrement=true

See: https://linear.app/expo/issue/ENG-14633/start-autoincrement-counter-at-0-so-first-build-has-buildnumber-==-1

* [eas-cli] Add changelog

Updated CHANGELOG.md

See: https://linear.app/expo/issue/ENG-14633/start-autoincrement-counter-at-0-so-first-build-has-buildnumber-==-1

CHANGELOG.md

@@ -8,17 +8,31 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🎉 New features
 
+- Sanitize and generate names for EAS Submit to prevent failures due to invalid characters or taken names. ([#2842](https://github.com/expo/eas-cli/pull/2842) by [@evanbacon](https://github.com/evanbacon))
+
+### 🐛 Bug fixes
+
+### 🧹 Chores
+
+- Fix tests for VisionOS type.
+- Make new autoIncremented builds start at nr 1 by default ([#2828](https://github.com/expo/eas-cli/pull/2828) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
+
+## [14.5.0](https://github.com/expo/eas-cli/releases/tag/v14.5.0) - 2025-01-22
+
+### 🎉 New features
+
 - Allow filtering by `--fingerprint_hash` in `eas build:list` command. ([#2818](https://github.com/expo/eas-cli/pull/2818) by [@szdziedzic](https://github.com/szdziedzic))
 
 ### 🐛 Bug fixes
+
 - Ensure that the AASA file is served with content type application/json ([#2829](https://github.com/expo/eas-cli/pull/2829) by [@kadikraman](https://github.com/kadikraman))
 - Ensure that the AppleID provided in prompt or saved to cache does not contain invalid unprintable characters ([#2830](https://github.com/expo/eas-cli/pull/2830) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
 
 ### 🧹 Chores
+
 - Fix logs typos in the `eas deploy` command. ([#2822](https://github.com/expo/eas-cli/pull/2822) by [@kadikraman](https://github.com/kadikraman))
 - Make `deploy` the top level command for hosting. ([#2824](https://github.com/expo/eas-cli/pull/2824) by [@kadikraman](https://github.com/kadikraman))
 - Allow longer submit profile extension chain (up to 5, same as build profile) ([#2831](https://github.com/expo/eas-cli/pull/2831) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
-
 - Make variable naming more explicit, remove deprecated runtimeFingerprintSource uses. ([#2816](https://github.com/expo/eas-cli/pull/2816) by [@wschurman](https://github.com/wschurman))
 
 ## [14.4.1](https://github.com/expo/eas-cli/releases/tag/v14.4.1) - 2025-01-15

packages/eas-cli/package.json

@@ -28,7 +28,7 @@
     "@expo/results": "1.0.0",
     "@expo/rudder-sdk-node": "1.1.1",
     "@expo/spawn-async": "1.7.2",
-    "@expo/steps": "1.0.165",
+    "@expo/steps": "1.0.166",
     "@expo/timeago.js": "1.0.0",
     "@oclif/core": "^1.26.2",
     "@oclif/plugin-autocomplete": "^2.3.10",

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

@@ -1,23 +1,43 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
+import { AndroidBuildProfile } from '@expo/eas-json/build/build/types';
 import assert from 'assert';
 import fs from 'fs-extra';
 import { vol } from 'memfs';
 import os from 'os';
 import path from 'path';
+import { instance, mock } from 'ts-mockito';
 
+import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
+import { AppVersionMutation } from '../../../graphql/mutations/AppVersionMutation';
+import { AppVersionQuery } from '../../../graphql/queries/AppVersionQuery';
 import { getAppBuildGradleAsync, resolveConfigValue } from '../../../project/android/gradleUtils';
 import { resolveVcsClient } from '../../../vcs';
+import { Client } from '../../../vcs/vcs';
 import {
   BumpStrategy,
   bumpVersionAsync,
   bumpVersionInAppJsonAsync,
   maybeResolveVersionsAsync,
+  resolveRemoteVersionCodeAsync,
 } from '../version';
 
 const fsReal = jest.requireActual('fs').promises as typeof fs;
 jest.mock('fs');
+jest.mock('../../../commandUtils/context/contextUtils/createGraphqlClient');
+jest.mock('../../../vcs/vcs');
+jest.mock('../../../graphql/queries/AppVersionQuery');
+jest.mock('../../../graphql/mutations/AppVersionMutation');
+jest.mock('../../../ora', () => ({
+  ora: jest.fn().mockImplementation(() => ({
+    start: jest.fn().mockImplementation(() => ({
+      succeed: jest.fn(),
+      stop: jest.fn(),
+      fail: jest.fn(),
+    })),
+  })),
+}));
 
 const vcsClient = resolveVcsClient();
 
@@ -216,12 +236,160 @@ describe(maybeResolveVersionsAsync, () => {
   });
 });
 
+describe(resolveRemoteVersionCodeAsync, () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('uses current remote versionCode when remote version set, autoIncrement=false', async () => {
+    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
+    const vcsClientMock = instance(mock<Client>());
+    vcsClientMock.getRootPathAsync = async () => '/app';
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue({
+      buildVersion: '11',
+      storeVersion: '1.2.3',
+    });
+    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
+    const exp = initBareWorkflowProject();
+
+    const result = await resolveRemoteVersionCodeAsync(graphQLClientMock, {
+      projectDir: '/app',
+      projectId: 'fakeProjectId',
+      exp,
+      applicationId: 'fakeApplicationId',
+      buildProfile: {} as AndroidBuildProfile,
+      vcsClient: vcsClientMock,
+    });
+
+    expect(result).toBe('11');
+    expect(createAppVersionAsyncSpy).not.toHaveBeenCalled();
+  });
+
+  it('initializes versionCode from local files when remote version not set, autoIncrement=false', async () => {
+    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
+    const vcsClientMock = instance(mock<Client>());
+    vcsClientMock.getRootPathAsync = async () => '/app';
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue(null);
+    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
+    const exp = initBareWorkflowProject({ versionCode: 22, versionName: '2.3.4' });
+
+    const result = await resolveRemoteVersionCodeAsync(graphQLClientMock, {
+      projectDir: '/app',
+      projectId: 'fakeProjectId',
+      exp,
+      applicationId: 'fakeApplicationId',
+      buildProfile: {} as AndroidBuildProfile,
+      vcsClient: vcsClientMock,
+    });
+
+    expect(result).toBe('22');
+    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('2.3.4');
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('22');
+  });
+
+  it('initializes versionCode starting with 1 when remote version not set and not set in local files, autoIncrement=false', async () => {
+    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
+    const vcsClientMock = instance(mock<Client>());
+    vcsClientMock.getRootPathAsync = async () => '/app';
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue(null);
+    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
+    const exp = initBareWorkflowProject({ versionCode: null, versionName: null });
+
+    const result = await resolveRemoteVersionCodeAsync(graphQLClientMock, {
+      projectDir: '/app',
+      projectId: 'fakeProjectId',
+      exp,
+      applicationId: 'fakeApplicationId',
+      buildProfile: {} as AndroidBuildProfile,
+      vcsClient: vcsClientMock,
+    });
+
+    expect(result).toBe('1');
+    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('1.0.0');
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('1');
+  });
+
+  it('increments current remote versionCode when remote version set, autoIncrement=true', async () => {
+    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
+    const vcsClientMock = instance(mock<Client>());
+    vcsClientMock.getRootPathAsync = async () => '/app';
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue({
+      buildVersion: '11',
+      storeVersion: '1.2.3',
+    });
+    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
+    const exp = initBareWorkflowProject();
+
+    const result = await resolveRemoteVersionCodeAsync(graphQLClientMock, {
+      projectDir: '/app',
+      projectId: 'fakeProjectId',
+      exp,
+      applicationId: 'fakeApplicationId',
+      buildProfile: { autoIncrement: true } as AndroidBuildProfile,
+      vcsClient: vcsClientMock,
+    });
+
+    expect(result).toBe('12');
+    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('3.0.0');
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('12');
+  });
+
+  it('increments versionCode from local files when remote version not set, autoIncrement=true', async () => {
+    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
+    const vcsClientMock = instance(mock<Client>());
+    vcsClientMock.getRootPathAsync = async () => '/app';
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue(null);
+    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
+    const exp = initBareWorkflowProject({ versionCode: 22, versionName: '2.3.4' });
+
+    const result = await resolveRemoteVersionCodeAsync(graphQLClientMock, {
+      projectDir: '/app',
+      projectId: 'fakeProjectId',
+      exp,
+      applicationId: 'fakeApplicationId',
+      buildProfile: { autoIncrement: true } as AndroidBuildProfile,
+      vcsClient: vcsClientMock,
+    });
+
+    expect(result).toBe('23');
+    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('2.3.4');
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('23');
+  });
+
+  it('initializes versionCode starting with 1 when remote version not set and not set in local files, autoIncrement=true', async () => {
+    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
+    const vcsClientMock = instance(mock<Client>());
+    vcsClientMock.getRootPathAsync = async () => '/app';
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue(null);
+    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
+    const exp = initBareWorkflowProject({ versionCode: null, versionName: null });
+
+    const result = await resolveRemoteVersionCodeAsync(graphQLClientMock, {
+      projectDir: '/app',
+      projectId: 'fakeProjectId',
+      exp,
+      applicationId: 'fakeApplicationId',
+      buildProfile: { autoIncrement: true } as AndroidBuildProfile,
+      vcsClient: vcsClientMock,
+    });
+
+    expect(result).toBe('1');
+    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('1.0.0');
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('1');
+  });
+});
+
 function initBareWorkflowProject({
   versionCode = 123,
   versionName = '3.0.0',
 }: {
-  versionCode?: number;
-  versionName?: string;
+  versionCode?: number | null;
+  versionName?: string | null;
 } = {}): ExpoConfig {
   const fakeExp: ExpoConfig = {
     name: 'myproject',
@@ -239,8 +407,8 @@ function initBareWorkflowProject({
       './android/app/build.gradle': `android {
   defaultConfig {
     applicationId "com.expo.testapp"
-    versionCode ${versionCode}
-    versionName "${versionName}"
+    ${versionCode ? `versionCode "${versionCode}"` : ''}
+    ${versionName ? `versionName "${versionName}"` : ''}
   }
 }`,
       './android/app/src/main/AndroidManifest.xml': 'fake',

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

@@ -99,7 +99,7 @@ export async function maybeResolveVersionsAsync(
   exp: ExpoConfig,
   buildProfile: BuildProfile<Platform.ANDROID>,
   vcsClient: Client
-): Promise<{ appVersion?: string; appBuildVersion?: string }> {
+): Promise<{ appVersion?: string; appBuildVersion?: string; isVersionInitialized?: boolean }> {
   const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
   if (workflow === Workflow.GENERIC) {
     const buildGradle = await getAppBuildGradleAsync(projectDir);
@@ -113,6 +113,11 @@ export async function maybeResolveVersionsAsync(
           resolveConfigValue(buildGradle, 'versionName', parsedGradleCommand?.flavor) ?? '1.0.0',
         appBuildVersion:
           resolveConfigValue(buildGradle, 'versionCode', parsedGradleCommand?.flavor) ?? '1',
+        isVersionInitialized: !resolveConfigValue(
+          buildGradle,
+          'versionCode',
+          parsedGradleCommand?.flavor
+        ),
       };
     } catch {
       return {};
@@ -204,6 +209,7 @@ export async function resolveRemoteVersionCodeAsync(
 
   const localVersions = await maybeResolveVersionsAsync(projectDir, exp, buildProfile, vcsClient);
   let currentBuildVersion: string;
+  let shouldInitializeVersionCode = false;
   if (remoteVersions?.buildVersion) {
     currentBuildVersion = remoteVersions.buildVersion;
   } else {
@@ -214,6 +220,7 @@ export async function resolveRemoteVersionCodeAsync(
         )
       );
       currentBuildVersion = localVersions.appBuildVersion;
+      shouldInitializeVersionCode = localVersions.isVersionInitialized ?? false;
     } else {
       Log.error(
         `Remote versions are not configured and EAS CLI was not able to read the current version from your project. Use "eas build:version:set" to initialize remote versions.`
@@ -223,7 +230,10 @@ export async function resolveRemoteVersionCodeAsync(
   }
   if (!buildProfile.autoIncrement && remoteVersions?.buildVersion) {
     return currentBuildVersion;
-  } else if (!buildProfile.autoIncrement && !remoteVersions?.buildVersion) {
+  } else if (
+    (!buildProfile.autoIncrement && !remoteVersions?.buildVersion) ||
+    shouldInitializeVersionCode
+  ) {
     const spinner = ora(
       `Initializing versionCode with ${chalk.bold(currentBuildVersion)}.`
     ).start();

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

@@ -1,12 +1,19 @@
 import { ExpoConfig } from '@expo/config';
 import { IOSConfig } from '@expo/config-plugins';
+import { IosBuildProfile } from '@expo/eas-json/build/build/types';
 import fs from 'fs-extra';
 import { vol } from 'memfs';
 import os from 'os';
+import { instance, mock } from 'ts-mockito';
 import type { XCBuildConfiguration } from 'xcode';
 
+import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
+import { Target } from '../../../credentials/ios/types';
+import { AppVersionMutation } from '../../../graphql/mutations/AppVersionMutation';
+import { AppVersionQuery } from '../../../graphql/queries/AppVersionQuery';
 import { readPlistAsync } from '../../../utils/plist';
 import { resolveVcsClient } from '../../../vcs';
+import { Client } from '../../../vcs/vcs';
 import {
   BumpStrategy,
   bumpVersionAsync,
@@ -15,9 +22,23 @@ import {
   getInfoPlistPath,
   readBuildNumberAsync,
   readShortVersionAsync,
+  resolveRemoteBuildNumberAsync,
 } from '../version';
 
 jest.mock('fs');
+jest.mock('../../../commandUtils/context/contextUtils/createGraphqlClient');
+jest.mock('../../../vcs/vcs');
+jest.mock('../../../graphql/queries/AppVersionQuery');
+jest.mock('../../../graphql/mutations/AppVersionMutation');
+jest.mock('../../../ora', () => ({
+  ora: jest.fn().mockImplementation(() => ({
+    start: jest.fn().mockImplementation(() => ({
+      succeed: jest.fn(),
+      stop: jest.fn(),
+      fail: jest.fn(),
+    })),
+  })),
+}));
 
 const vcsClient = resolveVcsClient();
 
@@ -359,6 +380,154 @@ describe(getInfoPlistPath, () => {
   });
 });
 
+describe(resolveRemoteBuildNumberAsync, () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('uses current remote buildNumber when remote version set, autoIncrement=false', async () => {
+    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
+    const vcsClientMock = instance(mock<Client>());
+    vcsClientMock.getRootPathAsync = async () => '/app';
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue({
+      buildVersion: '11',
+      storeVersion: '1.2.3',
+    });
+    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
+    const exp = initBareWorkflowProject();
+
+    const result = await resolveRemoteBuildNumberAsync(graphQLClientMock, {
+      projectDir: '/app',
+      projectId: 'fakeProjectId',
+      exp,
+      applicationTarget: {} as Target,
+      buildProfile: {} as IosBuildProfile,
+      vcsClient: vcsClientMock,
+    });
+
+    expect(result).toBe('11');
+    expect(createAppVersionAsyncSpy).not.toHaveBeenCalled();
+  });
+
+  it('initializes buildNumber from local files when remote version not set, autoIncrement=false', async () => {
+    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
+    const vcsClientMock = instance(mock<Client>());
+    vcsClientMock.getRootPathAsync = async () => '/app';
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue(null);
+    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
+    const exp = initBareWorkflowProject({ buildNumber: '22', appVersion: '2.3.4' });
+
+    const result = await resolveRemoteBuildNumberAsync(graphQLClientMock, {
+      projectDir: '/app',
+      projectId: 'fakeProjectId',
+      exp,
+      applicationTarget: {} as Target,
+      buildProfile: {} as IosBuildProfile,
+      vcsClient: vcsClientMock,
+    });
+
+    expect(result).toBe('22');
+    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('2.3.4');
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('22');
+  });
+
+  it('initializes buildNumber starting with 1 when remote version not set and local version is 1, autoIncrement=false', async () => {
+    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
+    const vcsClientMock = instance(mock<Client>());
+    vcsClientMock.getRootPathAsync = async () => '/app';
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue(null);
+    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
+    const exp = initBareWorkflowProject({ buildNumber: '1', appVersion: '1.0.0' });
+
+    const result = await resolveRemoteBuildNumberAsync(graphQLClientMock, {
+      projectDir: '/app',
+      projectId: 'fakeProjectId',
+      exp,
+      applicationTarget: {} as Target,
+      buildProfile: {} as IosBuildProfile,
+      vcsClient: vcsClientMock,
+    });
+
+    expect(result).toBe('1');
+    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('1.0.0');
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('1');
+  });
+
+  it('increments current remote buildNumber when remote version set, autoIncrement=true', async () => {
+    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
+    const vcsClientMock = instance(mock<Client>());
+    vcsClientMock.getRootPathAsync = async () => '/app';
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue({
+      buildVersion: '11',
+      storeVersion: '1.2.3',
+    });
+    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
+    const exp = initBareWorkflowProject();
+
+    const result = await resolveRemoteBuildNumberAsync(graphQLClientMock, {
+      projectDir: '/app',
+      projectId: 'fakeProjectId',
+      exp,
+      applicationTarget: {} as Target,
+      buildProfile: { autoIncrement: true } as IosBuildProfile,
+      vcsClient: vcsClientMock,
+    });
+
+    expect(result).toBe('12');
+    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('1.0.0');
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('12');
+  });
+
+  it('increments buildNumber from local files when remote version not set, autoIncrement=true', async () => {
+    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
+    const vcsClientMock = instance(mock<Client>());
+    vcsClientMock.getRootPathAsync = async () => '/app';
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue(null);
+    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
+    const exp = initBareWorkflowProject({ buildNumber: '22', appVersion: '2.3.4' });
+
+    const result = await resolveRemoteBuildNumberAsync(graphQLClientMock, {
+      projectDir: '/app',
+      projectId: 'fakeProjectId',
+      exp,
+      applicationTarget: {} as Target,
+      buildProfile: { autoIncrement: true } as IosBuildProfile,
+      vcsClient: vcsClientMock,
+    });
+
+    expect(result).toBe('23');
+    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('2.3.4');
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('23');
+  });
+
+  it('initializes buildNumber starting with 1 when remote version not set and local version is 1, autoIncrement=true', async () => {
+    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
+    const vcsClientMock = instance(mock<Client>());
+    vcsClientMock.getRootPathAsync = async () => '/app';
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue(null);
+    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
+    const exp = initBareWorkflowProject({ buildNumber: '1', appVersion: '1.0.0' });
+
+    const result = await resolveRemoteBuildNumberAsync(graphQLClientMock, {
+      projectDir: '/app',
+      projectId: 'fakeProjectId',
+      exp,
+      applicationTarget: {} as Target,
+      buildProfile: { autoIncrement: true } as IosBuildProfile,
+      vcsClient: vcsClientMock,
+    });
+
+    expect(result).toBe('1');
+    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('1.0.0');
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('1');
+  });
+});
+
 function initBareWorkflowProject({
   appVersion = '1.0.0',
   buildNumber = '1',

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

@@ -330,6 +330,7 @@ export async function resolveRemoteBuildNumberAsync(
     vcsClient
   );
   let currentBuildVersion: string;
+  let shouldInitializeBuildNumber = false;
   if (remoteVersions?.buildVersion) {
     currentBuildVersion = remoteVersions.buildVersion;
   } else {
@@ -340,6 +341,7 @@ export async function resolveRemoteBuildNumberAsync(
         )
       );
       currentBuildVersion = localBuildNumber;
+      shouldInitializeBuildNumber = localBuildNumber === '1';
     } else {
       Log.error(
         `Remote versions are not configured and EAS CLI was not able to read the current version from your project. Use "eas build:version:set" to initialize remote versions.`
@@ -349,7 +351,10 @@ export async function resolveRemoteBuildNumberAsync(
   }
   if (!buildProfile.autoIncrement && remoteVersions?.buildVersion) {
     return currentBuildVersion;
-  } else if (!buildProfile.autoIncrement && !remoteVersions?.buildVersion) {
+  } else if (
+    (!buildProfile.autoIncrement && !remoteVersions?.buildVersion) ||
+    shouldInitializeBuildNumber
+  ) {
     const spinner = ora(
       `Initializing buildNumber with ${chalk.bold(currentBuildVersion)}.`
     ).start();

packages/eas-cli/src/credentials/ios/appstore/__tests__/ensureAppExists-test.ts

@@ -0,0 +1,168 @@
+import { Session } from '@expo/apple-utils';
+import nock from 'nock';
+
+import { createAppAsync } from '../ensureAppExists';
+
+const FIXTURE_SUCCESS = {
+  data: {
+    type: 'apps',
+    id: '6741087677',
+    attributes: {
+      name: 'expo (xxx)',
+      bundleId: 'com.bacon.jan27.x',
+    },
+  },
+};
+
+const FIXTURE_INVALID_NAME = {
+  errors: [
+    {
+      id: 'b3e7ca18-e4ce-4e55-83ce-8fff35dbaeca',
+      status: '409',
+      code: 'ENTITY_ERROR.ATTRIBUTE.INVALID.INVALID_CHARACTERS',
+      title: 'An attribute value has invalid characters.',
+      detail:
+        'App Name contains certain Unicode symbols, emoticons, diacritics, special characters, or private use characters that are not permitted.',
+      source: {
+        pointer: '/included/1/name',
+      },
+    },
+  ],
+};
+
+const FIXTURE_ALREADY_USED_ON_ACCOUNT = {
+  errors: [
+    {
+      id: 'b91aefc5-0e94-48d9-8613-5b1a464a20f0',
+      status: '409',
+      code: 'ENTITY_ERROR.ATTRIBUTE.INVALID.DUPLICATE.SAME_ACCOUNT',
+      title:
+        'The provided entity includes an attribute with a value that has already been used on this account.',
+      detail:
+        'The app name you entered is already being used for another app in your account. If you would like to use the name for this app you will need to submit an update to your other app to change the name, or remove it from App Store Connect.',
+      source: {
+        pointer: '/included/1/name',
+      },
+    },
+  ],
+};
+
+const FIXTURE_ALREADY_USED_ON_ANOTHER_ACCOUNT = {
+  errors: [
+    {
+      id: '72b960f2-9e51-4f19-8d83-7cc08d42fec4',
+      status: '409',
+      code: 'ENTITY_ERROR.ATTRIBUTE.INVALID.DUPLICATE.DIFFERENT_ACCOUNT',
+      title:
+        'The provided entity includes an attribute with a value that has already been used on a different account.',
+      detail:
+        'The App Name you entered is already being used. If you have trademark rights to this name and would like it released for your use, submit a claim.',
+      source: {
+        pointer: '/included/1/name',
+      },
+    },
+  ],
+};
+
+const MOCK_CONTEXT = {
+  providerId: 1337,
+  teamId: 'test-team-id',
+  token: 'test-token',
+};
+
+beforeAll(async () => {
+  // Mock setup cookies API calls.
+  nock('https://appstoreconnect.apple.com')
+    .get(`/olympus/v1/session`)
+    .reply(200, {
+      provider: {
+        providerId: 1337,
+        publicProviderId: 'xxx-xxx-xxx-xxx-xxx',
+        name: 'Evan Bacon',
+        contentTypes: ['SOFTWARE'],
+        subType: 'INDIVIDUAL',
+      },
+    });
+
+  await Session.fetchCurrentSessionInfoAsync();
+});
+
+function getNameFromBody(body: any): any {
+  return body.included.find((item: any) => item.id === '${new-appInfoLocalization-id}')?.attributes
+    ?.name;
+}
+
+it('asserts invalid name cases', async () => {
+  const scope = nock('https://appstoreconnect.apple.com')
+    .post(`/iris/v1/apps`, body => {
+      expect(getNameFromBody(body)).toBe('Expo 🚀');
+
+      return true;
+    })
+    .reply(409, FIXTURE_INVALID_NAME);
+
+  // Already used on same account
+  nock('https://appstoreconnect.apple.com')
+    .post(`/iris/v1/apps`, body => {
+      expect(getNameFromBody(body)).toBe('Expo -');
+      return true;
+    })
+    .reply(409, FIXTURE_ALREADY_USED_ON_ACCOUNT);
+
+  // Already used on different account
+  nock('https://appstoreconnect.apple.com')
+    .post(`/iris/v1/apps`, body => {
+      expect(getNameFromBody(body)).toMatch(/Expo - \([\w\d]+\)/);
+      return true;
+    })
+    .reply(409, FIXTURE_ALREADY_USED_ON_ANOTHER_ACCOUNT);
+
+  // Success
+  nock('https://appstoreconnect.apple.com')
+    .post(`/iris/v1/apps`, body => {
+      expect(getNameFromBody(body)).toMatch(/Expo - \([\w\d]+\)/);
+      return true;
+    })
+    .reply(200, FIXTURE_SUCCESS);
+
+  await createAppAsync(MOCK_CONTEXT, {
+    bundleId: 'com.bacon.jan27.x',
+    name: 'Expo 🚀',
+    companyName: 'expo',
+  });
+
+  expect(scope.isDone()).toBeTruthy();
+});
+
+it('works on first try', async () => {
+  nock('https://appstoreconnect.apple.com').post(`/iris/v1/apps`).reply(200, FIXTURE_SUCCESS);
+
+  await createAppAsync(MOCK_CONTEXT, {
+    bundleId: 'com.bacon.jan27.x',
+    name: 'Expo',
+    companyName: 'expo',
+  });
+});
+
+it('doubles up entropy', async () => {
+  nock('https://appstoreconnect.apple.com')
+    .post(`/iris/v1/apps`)
+    .reply(409, FIXTURE_ALREADY_USED_ON_ANOTHER_ACCOUNT);
+
+  nock('https://appstoreconnect.apple.com')
+    .post(`/iris/v1/apps`)
+    .reply(409, FIXTURE_ALREADY_USED_ON_ANOTHER_ACCOUNT);
+
+  nock('https://appstoreconnect.apple.com')
+    .post(`/iris/v1/apps`, body => {
+      expect(getNameFromBody(body)).toMatch(/Expo \([\w\d]+\) \([\w\d]+\)/);
+      return true;
+    })
+    .reply(200, FIXTURE_SUCCESS);
+
+  await createAppAsync(MOCK_CONTEXT, {
+    bundleId: 'com.bacon.jan27.x',
+    name: 'Expo',
+    companyName: 'expo',
+  });
+});

packages/eas-cli/src/credentials/ios/appstore/ensureAppExists.ts

@@ -1,6 +1,7 @@
-import { App, BundleId } from '@expo/apple-utils';
+import { App, BundleId, RequestContext } from '@expo/apple-utils';
 import { JSONObject } from '@expo/json-file';
 import chalk from 'chalk';
+import { randomBytes } from 'node:crypto';
 
 import { getRequestContext, isUserAuthCtx } from './authenticate';
 import { AuthCtx, UserAuthCtx } from './authenticateTypes';
@@ -188,7 +189,7 @@ export async function ensureAppExistsAsync(
       /**
        * **Does not support App Store Connect API (CI).**
        */
-      app = await App.createAsync(context, {
+      app = await createAppAsync(context, {
         bundleId: bundleIdentifier,
         name,
         primaryLocale: language,
@@ -215,3 +216,120 @@ export async function ensureAppExistsAsync(
   );
   return app;
 }
+
+function sanitizeName(name: string): string {
+  return (
+    name
+      // Replace emojis with a `-`
+      .replace(/[\p{Emoji}]/gu, '-')
+      .normalize('NFD')
+      .replace(/[\u0300-\u036f]/g, '')
+      .trim()
+  );
+}
+
+export async function createAppAsync(
+  context: RequestContext,
+  props: {
+    bundleId: string;
+    name: string;
+    primaryLocale?: string;
+    companyName?: string;
+    sku?: string;
+  },
+  retryCount = 0
+): Promise<App> {
+  try {
+    /**
+     * **Does not support App Store Connect API (CI).**
+     */
+    return await App.createAsync(context, props);
+  } catch (error) {
+    if (retryCount >= 5) {
+      throw error;
+    }
+    if (error instanceof Error) {
+      const handleDuplicateNameErrorAsync = async (): Promise<App> => {
+        const generatedName = props.name + ` (${randomBytes(3).toString('hex')})`;
+        Log.warn(
+          `App name "${props.name}" is already taken. Using generated name "${generatedName}" which can be changed later from https://appstoreconnect.apple.com.`
+        );
+        // Sanitize the name and try again.
+        return await createAppAsync(
+          context,
+          {
+            ...props,
+            name: generatedName,
+          },
+          retryCount + 1
+        );
+      };
+
+      if (isAppleError(error)) {
+        // New error class that is thrown when the name is already taken but belongs to you.
+        if (
+          error.data.errors.some(
+            e =>
+              e.code === 'ENTITY_ERROR.ATTRIBUTE.INVALID.DUPLICATE.SAME_ACCOUNT' ||
+              e.code === 'ENTITY_ERROR.ATTRIBUTE.INVALID.DUPLICATE.DIFFERENT_ACCOUNT'
+          )
+        ) {
+          return await handleDuplicateNameErrorAsync();
+        }
+      }
+
+      if ('code' in error && typeof error.code === 'string') {
+        if (
+          // Name is invalid
+          error.code === 'APP_CREATE_NAME_INVALID'
+          // UnexpectedAppleResponse: An attribute value has invalid characters. - App Name contains certain Unicode symbols, emoticons, diacritics, special characters, or private use characters that are not permitted.
+          // Name is taken
+        ) {
+          const sanitizedName = sanitizeName(props.name);
+          if (sanitizedName === props.name) {
+            throw error;
+          }
+          Log.warn(
+            `App name "${props.name}" contains invalid characters. Using sanitized name "${sanitizedName}" which can be changed later from https://appstoreconnect.apple.com.`
+          );
+          // Sanitize the name and try again.
+          return await createAppAsync(
+            context,
+            {
+              ...props,
+              name: sanitizedName,
+            },
+            retryCount + 1
+          );
+        }
+
+        if (
+          // UnexpectedAppleResponse: The provided entity includes an attribute with a value that has already been used on a different account. - The App Name you entered is already being used. If you have trademark rights to
+          // this name and would like it released for your use, submit a claim.
+          error.code === 'APP_CREATE_NAME_UNAVAILABLE'
+        ) {
+          return await handleDuplicateNameErrorAsync();
+        }
+      }
+    }
+
+    throw error;
+  }
+}
+
+function isAppleError(error: any): error is {
+  data: {
+    errors: {
+      id: string;
+      status: string;
+      /** 'ENTITY_ERROR.ATTRIBUTE.INVALID.INVALID_CHARACTERS' */
+      code: string;
+      /** 'An attribute value has invalid characters.' */
+      title: string;
+      /** 'App Name contains certain Unicode symbols, emoticons, diacritics, special characters, or private use characters that are not permitted.' */
+      detail: string;
+    }[];
+  };
+} {
+  return 'data' in error && 'errors' in error.data && Array.isArray(error.data.errors);
+}

packages/eas-cli/src/credentials/ios/appstore/provisioningProfile.ts

@@ -30,6 +30,7 @@ function resolveProfileType(
     case ApplePlatform.TV_OS:
       return resolveProfileTypeAppleTv(profileClass, isEnterprise);
     case ApplePlatform.MAC_OS:
+    case ApplePlatform.VISION_OS:
       throw new Error(`${applePlatform} profiles are not supported`);
   }
 }

packages/eas-cli/src/project/ios/__tests__/target-test.ts

@@ -29,7 +29,7 @@ describe(getApplePlatformFromSdkRoot, () => {
   // Update `getApplePlatformFromSdkRoot` to be compatible with new Apple Platforms
   test('all enumerations work with the function', () => {
     expect(Object.values(ApplePlatform).sort()).toEqual(
-      [ApplePlatform.IOS, ApplePlatform.TV_OS, ApplePlatform.MAC_OS].sort()
+      [ApplePlatform.IOS, ApplePlatform.TV_OS, ApplePlatform.MAC_OS, ApplePlatform.VISION_OS].sort()
     );
   });
   test('existing SDKs work with the function', () => {

packages/eas-cli/src/submit/ios/AppProduce.ts

@@ -1,6 +1,5 @@
-import { App, RequestContext, Session, User } from '@expo/apple-utils';
+import { RequestContext, Session, User } from '@expo/apple-utils';
 import { Platform } from '@expo/eas-build-job';
-import chalk from 'chalk';
 
 import { sanitizeLanguage } from './utils/language';
 import { getRequestContext } from '../../credentials/ios/appstore/authenticate';
@@ -85,38 +84,13 @@ async function createAppStoreConnectAppAsync(
     );
   }
 
-  let app: App | null = null;
-
-  try {
-    app = await ensureAppExistsAsync(userAuthCtx, {
-      name: appName,
-      language,
-      companyName,
-      bundleIdentifier: bundleId,
-      sku,
-    });
-  } catch (error: any) {
-    if (
-      // Name is invalid
-      error.message.match(
-        /App Name contains certain Unicode(.*)characters that are not permitted/
-      ) ||
-      // UnexpectedAppleResponse: An attribute value has invalid characters. - App Name contains certain Unicode symbols, emoticons, diacritics, special characters, or private use characters that are not permitted.
-      // Name is taken
-      error.message.match(/The App Name you entered is already being used/)
-      // UnexpectedAppleResponse: The provided entity includes an attribute with a value that has already been used on a different account. - The App Name you entered is already being used. If you have trademark rights to
-      // this name and would like it released for your use, submit a claim.
-    ) {
-      Log.addNewLineIfNone();
-      Log.warn(
-        `Change the name in your app config, or use a custom name with the ${chalk.bold(
-          '--app-name'
-        )} flag`
-      );
-      Log.newLine();
-    }
-    throw error;
-  }
+  const app = await ensureAppExistsAsync(userAuthCtx, {
+    name: appName,
+    language,
+    companyName,
+    bundleIdentifier: bundleId,
+    sku,
+  });
 
   return {
     ascAppIdentifier: app.id,

yarn.lock

@@ -1645,10 +1645,10 @@
   dependencies:
     cross-spawn "^7.0.3"
 
-"@expo/[email protected]5":
-  version "1.0.165"
-  resolved "https://registry.yarnpkg.com/@expo/steps/-/steps-1.0.165.tgz#16cc510174aebaafbc864377e32d4091efad77c1"
-  integrity sha512-Eo7BYU0iCCdJnxvvj/fVjsYUxV8nmej0VxZaaUpgqlutbRBJNsiBx0BQNxk9Hx/2Ix4n/amcW7IiddBVYzoCUQ==
+"@expo/[email protected]6":
+  version "1.0.166"
+  resolved "https://registry.yarnpkg.com/@expo/steps/-/steps-1.0.166.tgz#b606ed72def361860ef5bfd3bd2df601112612af"
+  integrity sha512-dzEFjbQr4ji65XeSrUgesE+lnnhJYMNdXMZV5PRb19mMGTYYbyeT20+RvSo1a+TOPdO6sPdSBZqfiQ7P4mGBmQ==
   dependencies:
     "@expo/eas-build-job" "1.0.165"
     "@expo/logger" "1.0.117"