eas-cli 0.55.1 → 0.56.0

package/build/build/ios/version.d.ts

@@ -1,15 +1,16 @@
 import { ExpoConfig } from '@expo/config';
 import type { XCBuildConfiguration } from 'xcode';
+import { Target } from '../../credentials/ios/types';
 export declare enum BumpStrategy {
     APP_VERSION = 0,
     BUILD_NUMBER = 1,
     NOOP = 2
 }
-export declare function bumpVersionAsync({ bumpStrategy, projectDir, exp, buildSettings, }: {
+export declare function bumpVersionAsync({ bumpStrategy, projectDir, exp, targets, }: {
     projectDir: string;
     exp: ExpoConfig;
     bumpStrategy: BumpStrategy;
-    buildSettings: XCBuildConfiguration['buildSettings'];
+    targets: Target[];
 }): Promise<void>;
 export declare function bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp, }: {
     bumpStrategy: BumpStrategy;
@@ -18,9 +19,15 @@ export declare function bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, ex
 }): Promise<void>;
 export declare function readShortVersionAsync(projectDir: string, exp: ExpoConfig, buildSettings: XCBuildConfiguration['buildSettings']): Promise<string | undefined>;
 export declare function readBuildNumberAsync(projectDir: string, exp: ExpoConfig, buildSettings: XCBuildConfiguration['buildSettings']): Promise<string | undefined>;
-export declare function maybeResolveVersionsAsync(projectDir: string, exp: ExpoConfig, buildSettings: XCBuildConfiguration['buildSettings']): Promise<{
+export declare function maybeResolveVersionsAsync(projectDir: string, exp: ExpoConfig, targets: Target[]): Promise<{
     appVersion?: string;
     appBuildVersion?: string;
 }>;
 export declare function getInfoPlistPath(projectDir: string, buildSettings: XCBuildConfiguration['buildSettings']): string;
+export declare function updateNativeVersionsAsync({ projectDir, version, buildNumber, targets, }: {
+    projectDir: string;
+    version?: string;
+    buildNumber?: string;
+    targets: Target[];
+}): Promise<void>;
 export declare function evaluateTemplateString(s: string, buildSettings: XCBuildConfiguration['buildSettings']): string;

package/build/build/ios/version.js

@@ -1,15 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.evaluateTemplateString = exports.getInfoPlistPath = exports.maybeResolveVersionsAsync = exports.readBuildNumberAsync = exports.readShortVersionAsync = exports.bumpVersionInAppJsonAsync = exports.bumpVersionAsync = exports.BumpStrategy = void 0;
+exports.evaluateTemplateString = exports.updateNativeVersionsAsync = exports.getInfoPlistPath = exports.maybeResolveVersionsAsync = exports.readBuildNumberAsync = exports.readShortVersionAsync = exports.bumpVersionInAppJsonAsync = exports.bumpVersionAsync = exports.BumpStrategy = void 0;
 const tslib_1 = require("tslib");
-const config_1 = require("@expo/config");
 const config_plugins_1 = require("@expo/config-plugins");
 const eas_build_job_1 = require("@expo/eas-build-job");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const log_1 = tslib_1.__importDefault(require("../../log"));
+const target_1 = require("../../project/ios/target");
+const versions_1 = require("../../project/ios/versions");
 const workflow_1 = require("../../project/workflow");
 const prompts_1 = require("../../prompts");
+const uniqBy_1 = tslib_1.__importDefault(require("../../utils/expodash/uniqBy"));
 const plist_1 = require("../../utils/plist");
 const appJson_1 = require("../utils/appJson");
 const version_1 = require("../utils/version");
@@ -19,15 +21,20 @@ var BumpStrategy;
     BumpStrategy[BumpStrategy["BUILD_NUMBER"] = 1] = "BUILD_NUMBER";
     BumpStrategy[BumpStrategy["NOOP"] = 2] = "NOOP";
 })(BumpStrategy = exports.BumpStrategy || (exports.BumpStrategy = {}));
-async function bumpVersionAsync({ bumpStrategy, projectDir, exp, buildSettings, }) {
+async function bumpVersionAsync({ bumpStrategy, projectDir, exp, targets, }) {
+    var _a;
     if (bumpStrategy === BumpStrategy.NOOP) {
         return;
     }
-    ensureStaticConfigExists(projectDir);
-    const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);
+    (0, version_1.ensureStaticConfigExists)(projectDir);
     await bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp });
     log_1.default.log('Updated versions in app.json');
-    await writeVersionsToInfoPlistAsync({ projectDir, exp, infoPlist, buildSettings });
+    await updateNativeVersionsAsync({
+        projectDir,
+        version: exp.version,
+        buildNumber: (_a = exp.ios) === null || _a === void 0 ? void 0 : _a.buildNumber,
+        targets,
+    });
     log_1.default.log('Synchronized versions with Info.plist');
 }
 exports.bumpVersionAsync = bumpVersionAsync;
@@ -35,7 +42,7 @@ async function bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp, }) {
     if (bumpStrategy === BumpStrategy.NOOP) {
         return;
     }
-    ensureStaticConfigExists(projectDir);
+    (0, version_1.ensureStaticConfigExists)(projectDir);
     log_1.default.addNewLineIfNone();
     if (bumpStrategy === BumpStrategy.APP_VERSION) {
         const appVersion = config_plugins_1.IOSConfig.Version.getVersion(exp);
@@ -43,10 +50,8 @@ async function bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp, }) {
     }
     else {
         const buildNumber = config_plugins_1.IOSConfig.Version.getBuildNumber(exp);
-        if (buildNumber.match(/^\d+(\.\d+)*$/)) {
-            const comps = buildNumber.split('.');
-            comps[comps.length - 1] = String(Number(comps[comps.length - 1]) + 1);
-            const bumpedBuildNumber = comps.join('.');
+        if ((0, versions_1.isValidBuildNumber)(buildNumber)) {
+            const bumpedBuildNumber = (0, versions_1.getNextBuildNumber)(buildNumber);
             log_1.default.log(`Bumping ${chalk_1.default.bold('expo.ios.buildNumber')} from ${chalk_1.default.bold(buildNumber)} to ${chalk_1.default.bold(bumpedBuildNumber)}`);
             await (0, appJson_1.updateAppJsonConfigAsync)({ projectDir, exp }, config => {
                 config.ios = { ...config.ios, buildNumber: String(bumpedBuildNumber) };
@@ -89,11 +94,13 @@ async function readBuildNumberAsync(projectDir, exp, buildSettings) {
     }
 }
 exports.readBuildNumberAsync = readBuildNumberAsync;
-async function maybeResolveVersionsAsync(projectDir, exp, buildSettings) {
+async function maybeResolveVersionsAsync(projectDir, exp, targets) {
+    var _a, _b;
+    const applicationTarget = (0, target_1.findApplicationTarget)(targets);
     try {
         return {
-            appBuildVersion: await readBuildNumberAsync(projectDir, exp, buildSettings),
-            appVersion: await readShortVersionAsync(projectDir, exp, buildSettings),
+            appBuildVersion: await readBuildNumberAsync(projectDir, exp, (_a = applicationTarget.buildSettings) !== null && _a !== void 0 ? _a : {}),
+            appVersion: await readShortVersionAsync(projectDir, exp, (_b = applicationTarget.buildSettings) !== null && _b !== void 0 ? _b : {}),
         };
     }
     catch (err) {
@@ -105,12 +112,6 @@ async function maybeResolveVersionsAsync(projectDir, exp, buildSettings) {
     }
 }
 exports.maybeResolveVersionsAsync = maybeResolveVersionsAsync;
-async function writeVersionsToInfoPlistAsync({ projectDir, exp, infoPlist, buildSettings, }) {
-    let updatedInfoPlist = config_plugins_1.IOSConfig.Version.setVersion(exp, infoPlist);
-    updatedInfoPlist = config_plugins_1.IOSConfig.Version.setBuildNumber(exp, updatedInfoPlist);
-    await writeInfoPlistAsync({ projectDir, infoPlist: updatedInfoPlist, buildSettings });
-    return updatedInfoPlist;
-}
 function getInfoPlistPath(projectDir, buildSettings) {
     if (buildSettings.INFOPLIST_FILE) {
         const infoPlistFile = buildSettings.INFOPLIST_FILE.startsWith('"')
@@ -133,16 +134,44 @@ async function readInfoPlistAsync(projectDir, buildSettings) {
     const infoPlistPath = getInfoPlistPath(projectDir, buildSettings);
     return ((_a = (await (0, plist_1.readPlistAsync)(infoPlistPath))) !== null && _a !== void 0 ? _a : {});
 }
-async function writeInfoPlistAsync({ projectDir, infoPlist, buildSettings, }) {
-    const infoPlistPath = getInfoPlistPath(projectDir, buildSettings);
-    await (0, plist_1.writePlistAsync)(infoPlistPath, infoPlist);
-}
-function ensureStaticConfigExists(projectDir) {
-    const paths = (0, config_1.getConfigFilePaths)(projectDir);
-    if (!paths.staticConfigPath) {
-        throw new Error('autoIncrement option is not supported when using app.config.js');
+async function updateNativeVersionsAsync({ projectDir, version, buildNumber, targets, }) {
+    var _a;
+    const project = config_plugins_1.IOSConfig.XcodeUtils.getPbxproj(projectDir);
+    const iosDir = path_1.default.join(projectDir, 'ios');
+    const infoPlistFiles = [];
+    for (const target of targets) {
+        const { targetName, buildConfiguration } = target;
+        const xcBuildConfiguration = config_plugins_1.IOSConfig.Target.getXCBuildConfigurationFromPbxproj(project, {
+            targetName,
+            buildConfiguration,
+        });
+        const infoPlist = (_a = xcBuildConfiguration === null || xcBuildConfiguration === void 0 ? void 0 : xcBuildConfiguration.buildSettings) === null || _a === void 0 ? void 0 : _a.INFOPLIST_FILE;
+        if (infoPlist) {
+            const evaluatedInfoPlistPath = trimQuotes(evaluateTemplateString(infoPlist, {
+                SRCROOT: iosDir,
+            }));
+            const absolutePath = path_1.default.isAbsolute(evaluatedInfoPlistPath)
+                ? evaluatedInfoPlistPath
+                : path_1.default.join(iosDir, evaluatedInfoPlistPath);
+            infoPlistFiles.push(path_1.default.normalize(absolutePath));
+        }
+    }
+    const uniqueInfoPlistPaths = (0, uniqBy_1.default)(infoPlistFiles, i => i);
+    for (const infoPlistPath of uniqueInfoPlistPaths) {
+        const infoPlist = (await (0, plist_1.readPlistAsync)(infoPlistPath));
+        if (buildNumber) {
+            infoPlist.CFBundleVersion = buildNumber;
+        }
+        if (version) {
+            infoPlist.CFBundleShortVersionString = version;
+        }
+        await (0, plist_1.writePlistAsync)(infoPlistPath, infoPlist);
     }
 }
+exports.updateNativeVersionsAsync = updateNativeVersionsAsync;
+function trimQuotes(s) {
+    return (s === null || s === void 0 ? void 0 : s.startsWith('"')) && s.endsWith('"') ? s.slice(1, -1) : s;
+}
 function evaluateTemplateString(s, buildSettings) {
     // necessary because XCBuildConfiguration['buildSettings'] is not a plain object
     const vars = { ...buildSettings };

package/build/build/metadata.js

@@ -48,7 +48,7 @@ exports.collectMetadataAsync = collectMetadataAsync;
 async function maybeResolveVersionsAsync(ctx) {
     if (ctx.platform === eas_build_job_1.Platform.IOS) {
         const iosContext = ctx;
-        return await (0, version_2.maybeResolveVersionsAsync)(ctx.projectDir, ctx.exp, iosContext.ios.applicationTargetBuildSettings);
+        return await (0, version_2.maybeResolveVersionsAsync)(ctx.projectDir, ctx.exp, iosContext.ios.targets);
     }
     else if (ctx.platform === eas_build_job_1.Platform.ANDROID) {
         const androidCtx = ctx;

package/build/build/runBuildAndSubmit.js

@@ -40,7 +40,7 @@ const platformToGraphQLResourceClassMapping = {
     },
 };
 async function runBuildAndSubmitAsync(projectDir, flags) {
-    var _a, _b;
+    var _a, _b, _c;
     await (0, vcs_1.getVcsClient)().ensureRepoExistsAsync();
     await (0, repository_1.ensureRepoIsCleanAsync)(flags.nonInteractive);
     await (0, configure_1.ensureProjectConfiguredAsync)({
@@ -48,12 +48,13 @@ async function runBuildAndSubmitAsync(projectDir, flags) {
         nonInteractive: flags.nonInteractive,
     });
     const easJsonReader = new eas_json_1.EasJsonReader(projectDir);
+    const easJsonCliConfig = (_a = (await easJsonReader.getCliConfigAsync())) !== null && _a !== void 0 ? _a : {};
     const platforms = (0, platform_1.toPlatforms)(flags.requestedPlatform);
     const buildProfiles = await (0, profiles_1.getProfilesAsync)({
         type: 'build',
         easJsonReader,
         platforms,
-        profileName: (_a = flags.profile) !== null && _a !== void 0 ? _a : undefined,
+        profileName: (_b = flags.profile) !== null && _b !== void 0 ? _b : undefined,
     });
     await (0, devClient_1.ensureExpoDevClientInstalledForDevClientBuildsAsync)({
         projectDir,
@@ -68,7 +69,8 @@ async function runBuildAndSubmitAsync(projectDir, flags) {
             flags,
             moreBuilds: platforms.length > 1,
             buildProfile,
-            resourceClass: platformToGraphQLResourceClassMapping[buildProfile.platform][(_b = flags.userInputResourceClass) !== null && _b !== void 0 ? _b : types_1.UserInputResourceClass.DEFAULT],
+            resourceClass: platformToGraphQLResourceClassMapping[buildProfile.platform][(_c = flags.userInputResourceClass) !== null && _c !== void 0 ? _c : types_1.UserInputResourceClass.DEFAULT],
+            easJsonCliConfig,
         });
         if (maybeBuild) {
             startedBuilds.push({ build: maybeBuild, buildProfile });
@@ -128,7 +130,7 @@ async function runBuildAndSubmitAsync(projectDir, flags) {
     }
 }
 exports.runBuildAndSubmitAsync = runBuildAndSubmitAsync;
-async function prepareAndStartBuildAsync({ projectDir, flags, moreBuilds, buildProfile, resourceClass, }) {
+async function prepareAndStartBuildAsync({ projectDir, flags, moreBuilds, buildProfile, resourceClass, easJsonCliConfig, }) {
     const buildCtx = await (0, createContext_1.createBuildContextAsync)({
         buildProfileName: buildProfile.profileName,
         resourceClass,
@@ -138,6 +140,7 @@ async function prepareAndStartBuildAsync({ projectDir, flags, moreBuilds, buildP
         platform: buildProfile.platform,
         projectDir,
         localBuildOptions: flags.localBuildOptions,
+        easJsonCliConfig,
     });
     if (moreBuilds) {
         log_1.default.newLine();

package/build/commands/build/version/set.d.ts

@@ -0,0 +1,10 @@
+import EasCommand from '../../../commandUtils/EasCommand';
+export default class BuildVersionSetView extends EasCommand {
+    static description: string;
+    static hidden: boolean;
+    static flags: {
+        platform: import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        profile: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+    };
+    runAsync(): Promise<void>;
+}

package/build/commands/build/version/set.js

@@ -0,0 +1,82 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const Updates_1 = require("@expo/config-plugins/build/utils/Updates");
+const eas_build_job_1 = require("@expo/eas-build-job");
+const eas_json_1 = require("@expo/eas-json");
+const core_1 = require("@oclif/core");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const EasCommand_1 = tslib_1.__importDefault(require("../../../commandUtils/EasCommand"));
+const AppVersionMutation_1 = require("../../../graphql/mutations/AppVersionMutation");
+const AppVersionQuery_1 = require("../../../graphql/queries/AppVersionQuery");
+const AppPlatform_1 = require("../../../graphql/types/AppPlatform");
+const log_1 = tslib_1.__importDefault(require("../../../log"));
+const platform_1 = require("../../../platform");
+const versions_1 = require("../../../project/android/versions");
+const applicationIdentifier_1 = require("../../../project/applicationIdentifier");
+const expoConfig_1 = require("../../../project/expoConfig");
+const versions_2 = require("../../../project/ios/versions");
+const projectUtils_1 = require("../../../project/projectUtils");
+const remoteVersionSource_1 = require("../../../project/remoteVersionSource");
+const prompts_1 = require("../../../prompts");
+class BuildVersionSetView extends EasCommand_1.default {
+    async runAsync() {
+        var _a, _b, _c;
+        const { flags } = await this.parse(BuildVersionSetView);
+        const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
+        const platform = await (0, platform_1.selectPlatformAsync)(flags.platform);
+        const easJsonReader = new eas_json_1.EasJsonReader(projectDir);
+        await (0, remoteVersionSource_1.ensureRemoteVersionPolicyAsync)(projectDir, easJsonReader);
+        const profile = await easJsonReader.getBuildProfileAsync(platform, (_a = flags.profile) !== null && _a !== void 0 ? _a : undefined);
+        const exp = (0, expoConfig_1.getExpoConfig)(projectDir, { env: profile.env });
+        const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
+        const projectFullName = await (0, projectUtils_1.getProjectFullNameAsync)(exp);
+        await (0, remoteVersionSource_1.validateAppConfigForRemoteVersionPolicyAsync)(exp);
+        const applicationIdentifier = await (0, applicationIdentifier_1.getApplicationIdentifierAsync)(projectDir, exp, profile, platform);
+        const remoteVersions = await AppVersionQuery_1.AppVersionQuery.latestVersionAsync(projectId, (0, AppPlatform_1.toAppPlatform)(platform), applicationIdentifier);
+        const currentStateMessage = (remoteVersions === null || remoteVersions === void 0 ? void 0 : remoteVersions.buildVersion)
+            ? `Project ${chalk_1.default.bold(projectFullName)} with ${getApplicationIdentifierName(platform)} "${applicationIdentifier}" is configured with ${(0, remoteVersionSource_1.getBuildVersionName)(platform)} ${remoteVersions.buildVersion}.`
+            : `Project ${chalk_1.default.bold(projectFullName)} with ${getApplicationIdentifierName(platform)} "${applicationIdentifier}" does not have any ${(0, remoteVersionSource_1.getBuildVersionName)(platform)} configured.`;
+        const versionPromptMessage = (remoteVersions === null || remoteVersions === void 0 ? void 0 : remoteVersions.buildVersion)
+            ? `What version would you like to set?`
+            : `What version would you like to initialize it with?`;
+        log_1.default.log(currentStateMessage);
+        const { version } = await (0, prompts_1.promptAsync)({
+            type: platform === eas_build_job_1.Platform.ANDROID ? 'number' : 'text',
+            name: 'version',
+            message: versionPromptMessage,
+            validate: platform === eas_build_job_1.Platform.ANDROID
+                ? value => (0, versions_1.isValidVersionCode)(value) || `Invalid value: ${versions_1.VERSION_CODE_REQUIREMENTS}.`
+                : value => (0, versions_2.isValidBuildNumber)(value) || `Invalid value: ${versions_2.BUILD_NUMBER_REQUIREMENTS}.`,
+        });
+        await AppVersionMutation_1.AppVersionMutation.createAppVersionAsync({
+            appId: projectId,
+            platform: (0, AppPlatform_1.toAppPlatform)(platform),
+            applicationIdentifier,
+            storeVersion: (_b = exp.version) !== null && _b !== void 0 ? _b : '1.0.0',
+            buildVersion: String(version),
+            runtimeVersion: (_c = (0, Updates_1.getRuntimeVersionNullable)(exp, platform)) !== null && _c !== void 0 ? _c : undefined,
+        });
+    }
+}
+exports.default = BuildVersionSetView;
+BuildVersionSetView.description = 'Update version of an app.';
+BuildVersionSetView.hidden = true;
+BuildVersionSetView.flags = {
+    platform: core_1.Flags.enum({
+        char: 'p',
+        options: ['android', 'ios'],
+    }),
+    profile: core_1.Flags.string({
+        description: 'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
+        helpValue: 'PROFILE_NAME',
+    }),
+};
+function getApplicationIdentifierName(platform) {
+    if (platform === eas_build_job_1.Platform.ANDROID) {
+        return 'application ID';
+    }
+    else {
+        return 'bundle identifier';
+    }
+}

package/build/commands/build/version/sync.d.ts

@@ -0,0 +1,12 @@
+import EasCommand from '../../../commandUtils/EasCommand';
+export default class BuildVersionSyncView extends EasCommand {
+    static description: string;
+    static hidden: boolean;
+    static flags: {
+        platform: import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        profile: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+    };
+    runAsync(): Promise<void>;
+    private syncIosAsync;
+    private syncAndroidAsync;
+}

package/build/commands/build/version/sync.js

@@ -0,0 +1,124 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const eas_build_job_1 = require("@expo/eas-build-job");
+const eas_json_1 = require("@expo/eas-json");
+const core_1 = require("@oclif/core");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const version_1 = require("../../../build/android/version");
+const version_2 = require("../../../build/ios/version");
+const EasCommand_1 = tslib_1.__importDefault(require("../../../commandUtils/EasCommand"));
+const AppVersionQuery_1 = require("../../../graphql/queries/AppVersionQuery");
+const AppPlatform_1 = require("../../../graphql/types/AppPlatform");
+const log_1 = tslib_1.__importDefault(require("../../../log"));
+const platform_1 = require("../../../platform");
+const gradleUtils_1 = require("../../../project/android/gradleUtils");
+const versions_1 = require("../../../project/android/versions");
+const applicationIdentifier_1 = require("../../../project/applicationIdentifier");
+const expoConfig_1 = require("../../../project/expoConfig");
+const scheme_1 = require("../../../project/ios/scheme");
+const target_1 = require("../../../project/ios/target");
+const versions_2 = require("../../../project/ios/versions");
+const projectUtils_1 = require("../../../project/projectUtils");
+const remoteVersionSource_1 = require("../../../project/remoteVersionSource");
+const workflow_1 = require("../../../project/workflow");
+const profiles_1 = require("../../../utils/profiles");
+class BuildVersionSyncView extends EasCommand_1.default {
+    async runAsync() {
+        var _a;
+        const { flags } = await this.parse(BuildVersionSyncView);
+        const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
+        const requestedPlatform = await (0, platform_1.selectRequestedPlatformAsync)(flags.platform);
+        const easJsonReader = new eas_json_1.EasJsonReader(projectDir);
+        await (0, remoteVersionSource_1.ensureRemoteVersionPolicyAsync)(projectDir, easJsonReader);
+        const platforms = (0, platform_1.toPlatforms)(requestedPlatform);
+        const buildProfiles = await (0, profiles_1.getProfilesAsync)({
+            type: 'build',
+            easJsonReader,
+            platforms,
+            profileName: (_a = flags.profile) !== null && _a !== void 0 ? _a : undefined,
+        });
+        for (const profileInfo of buildProfiles) {
+            const exp = (0, expoConfig_1.getExpoConfig)(projectDir, { env: profileInfo.profile.env });
+            const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
+            await (0, remoteVersionSource_1.validateAppConfigForRemoteVersionPolicyAsync)(exp);
+            const platformDisplayName = platform_1.appPlatformDisplayNames[(0, AppPlatform_1.toAppPlatform)(profileInfo.platform)];
+            const applicationIdentifier = await (0, applicationIdentifier_1.getApplicationIdentifierAsync)(projectDir, exp, profileInfo.profile, profileInfo.platform);
+            const remoteVersions = await AppVersionQuery_1.AppVersionQuery.latestVersionAsync(projectId, (0, AppPlatform_1.toAppPlatform)(profileInfo.platform), applicationIdentifier);
+            const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, profileInfo.platform);
+            if (!(remoteVersions === null || remoteVersions === void 0 ? void 0 : remoteVersions.buildVersion)) {
+                log_1.default.warn(`Skipping versions sync for ${platformDisplayName}. There are no versions configured on Expo servers, use "eas build:version:set" or run a build to initialize it.`);
+                continue;
+            }
+            if (workflow === eas_build_job_1.Workflow.MANAGED) {
+                log_1.default.warn(`The remote value for the ${platformDisplayName} ${(0, remoteVersionSource_1.getBuildVersionName)(profileInfo.platform)} is ${chalk_1.default.bold(remoteVersions === null || remoteVersions === void 0 ? void 0 : remoteVersions.buildVersion)}, but it was not synced to the local project. This command has no effect on projects using managed workflow.`);
+                continue;
+            }
+            if (profileInfo.platform === eas_build_job_1.Platform.ANDROID) {
+                this.syncAndroidAsync({
+                    projectDir,
+                    exp,
+                    profile: profileInfo.profile,
+                    workflow,
+                    buildVersion: remoteVersions.buildVersion,
+                });
+            }
+            else {
+                this.syncIosAsync({
+                    projectDir,
+                    exp,
+                    profile: profileInfo.profile,
+                    workflow,
+                    buildVersion: remoteVersions.buildVersion,
+                });
+            }
+            log_1.default.withTick(`Successfully updated the ${platformDisplayName} ${(0, remoteVersionSource_1.getBuildVersionName)(profileInfo.platform)} in native code to ${chalk_1.default.bold(remoteVersions === null || remoteVersions === void 0 ? void 0 : remoteVersions.buildVersion)}.`);
+        }
+    }
+    async syncIosAsync({ workflow, projectDir, exp, profile, buildVersion, }) {
+        const xcodeBuildContext = await (0, scheme_1.resolveXcodeBuildContextAsync)({ exp, projectDir, nonInteractive: false }, profile);
+        const targets = await (0, target_1.resolveTargetsAsync)({
+            projectDir,
+            exp,
+            xcodeBuildContext,
+            env: profile.env,
+        });
+        if (!(0, versions_2.isValidBuildNumber)(buildVersion)) {
+            throw new Error(`Invalid buildNumber (${buildVersion}), ${versions_2.BUILD_NUMBER_REQUIREMENTS}.`);
+        }
+        if (workflow === eas_build_job_1.Workflow.GENERIC) {
+            await (0, version_2.updateNativeVersionsAsync)({
+                projectDir,
+                buildNumber: buildVersion,
+                targets,
+            });
+        }
+    }
+    async syncAndroidAsync({ projectDir, workflow, buildVersion, }) {
+        var _a, _b;
+        if (!(0, versions_1.isValidVersionCode)(buildVersion)) {
+            throw new Error(`Invalid versionCode (${buildVersion}), ${versions_1.VERSION_CODE_REQUIREMENTS}.`);
+        }
+        if (workflow === eas_build_job_1.Workflow.GENERIC) {
+            const buildGradle = await (0, gradleUtils_1.getAppBuildGradleAsync)(projectDir);
+            const isMultiFlavor = ((_a = buildGradle.android) === null || _a === void 0 ? void 0 : _a.productFlavors) || ((_b = buildGradle.android) === null || _b === void 0 ? void 0 : _b.flavorDimensions);
+            if (isMultiFlavor) {
+                throw new Error("Versions in native code can't be automatically synced in multi-flavor Android projects. If you are using EAS Build with app version source set to remote, the correct values will be injected at the build time.");
+            }
+            await (0, version_1.updateNativeVersionsAsync)({ projectDir, versionCode: Number(buildVersion) });
+        }
+    }
+}
+exports.default = BuildVersionSyncView;
+BuildVersionSyncView.description = 'Update a version in native code with a value stored on EAS servers';
+BuildVersionSyncView.hidden = true;
+BuildVersionSyncView.flags = {
+    platform: core_1.Flags.enum({
+        char: 'p',
+        options: ['android', 'ios', 'all'],
+    }),
+    profile: core_1.Flags.string({
+        description: 'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
+        helpValue: 'PROFILE_NAME',
+    }),
+};

package/build/commands/update/index.js

@@ -265,7 +265,9 @@ class UpdatePublish extends EasCommand_1.default {
             try {
                 const platforms = platformFlag === 'all' ? exports.defaultPublishPlatforms : [platformFlag];
                 const assets = await (0, publish_1.collectAssetsAsync)({ inputDir: inputDir, platforms });
-                const { uniqueUploadedAssetCount } = await (0, publish_1.uploadAssetsAsync)(assets, spinnerText => (assetSpinner.text = `Uploading assets... ${spinnerText}`));
+                const { uniqueUploadedAssetCount } = await (0, publish_1.uploadAssetsAsync)(assets, (totalAssets, missingAssets) => {
+                    assetSpinner.text = `Uploading assets. Finished (${totalAssets - missingAssets}/${totalAssets})`;
+                });
                 uploadedAssetCount = uniqueUploadedAssetCount;
                 unsortedUpdateInfoGroups = await (0, publish_1.buildUnsortedUpdateInfoGroupAsync)(assets, exp);
                 const uploadAssetSuccessMessage = uploadedAssetCount

package/build/credentials/ios/types.d.ts

@@ -1,4 +1,5 @@
 import { JSONObject } from '@expo/json-file';
+import type { XCBuildConfiguration } from 'xcode';
 import { CommonIosAppCredentialsFragment, IosAppBuildCredentialsFragment } from '../../graphql/generated';
 import { Account } from '../../user/Account';
 export interface App {
@@ -11,6 +12,7 @@ export interface Target {
     bundleIdentifier: string;
     parentBundleIdentifier?: string;
     entitlements: JSONObject;
+    buildSettings?: XCBuildConfiguration['buildSettings'];
 }
 export interface TargetCredentials {
     distributionCertificate: {

package/build/graphql/generated.d.ts

@@ -709,6 +709,7 @@ export declare type App = Project & {
     isLikedByMe: Scalars['Boolean'];
     /** @deprecated No longer supported */
     lastPublishedTime: Scalars['DateTime'];
+    latestAppVersionByPlatformAndApplicationIdentifier?: Maybe<AppVersion>;
     latestReleaseForReleaseChannel?: Maybe<AppRelease>;
     /** ID of latest classic update release */
     latestReleaseId: Scalars['ID'];
@@ -812,6 +813,11 @@ export declare type AppIosAppCredentialsArgs = {
     filter?: InputMaybe<IosAppCredentialsFilter>;
 };
 /** Represents an Exponent App (or Experience in legacy terms) */
+export declare type AppLatestAppVersionByPlatformAndApplicationIdentifierArgs = {
+    applicationIdentifier: Scalars['String'];
+    platform: AppPlatform;
+};
+/** Represents an Exponent App (or Experience in legacy terms) */
 export declare type AppLatestReleaseForReleaseChannelArgs = {
     platform: AppPlatform;
     releaseChannel: Scalars['String'];
@@ -1004,6 +1010,47 @@ export declare enum AppStoreConnectUserRole {
     Technical = "TECHNICAL",
     Unknown = "UNKNOWN"
 }
+/** Represents Play Store/App Store version of an application */
+export declare type AppVersion = {
+    __typename?: 'AppVersion';
+    /**
+     * Store identifier for an application
+     *  - Android - applicationId
+     *  - iOS - bundle identifier
+     */
+    applicationIdentifier: Scalars['String'];
+    /**
+     * Value that identifies build in a store (it's visible to developers, but not to end users)
+     * - Android - versionCode in build.gradle ("android.versionCode" field in app.json)
+     * - iOS - CFBundleVersion in Info.plist ("ios.buildNumber" field in app.json)
+     */
+    buildVersion: Scalars['String'];
+    id: Scalars['ID'];
+    platform: AppPlatform;
+    runtimeVersion?: Maybe<Scalars['String']>;
+    /**
+     * User-facing version in a store
+     * - Android - versionName in build.gradle ("version" field in app.json)
+     * - iOS - CFBundleShortVersionString in Info.plist ("version" field in app.json)
+     */
+    storeVersion: Scalars['String'];
+};
+export declare type AppVersionInput = {
+    appId: Scalars['ID'];
+    applicationIdentifier: Scalars['String'];
+    buildVersion: Scalars['String'];
+    platform: AppPlatform;
+    runtimeVersion?: InputMaybe<Scalars['String']>;
+    storeVersion: Scalars['String'];
+};
+export declare type AppVersionMutation = {
+    __typename?: 'AppVersionMutation';
+    /** Create an app version */
+    createAppVersion: AppVersion;
+};
+export declare type AppVersionMutationCreateAppVersionArgs = {
+    appVersionInput: AppVersionInput;
+};
 export declare type AppleAppIdentifier = {
     __typename?: 'AppleAppIdentifier';
     account: Account;
@@ -1181,7 +1228,7 @@ export declare type ApplePushKey = {
     updatedAt: Scalars['DateTime'];
 };
 export declare type ApplePushKeyInput = {
-    appleTeamId?: InputMaybe<Scalars['ID']>;
+    appleTeamId: Scalars['ID'];
     keyIdentifier: Scalars['String'];
     keyP8: Scalars['String'];
 };
@@ -1321,6 +1368,7 @@ export declare type Build = ActivityTimelineProjectActivity & BuildOrBuildJob &
     iosEnterpriseProvisioning?: Maybe<BuildIosEnterpriseProvisioning>;
     isGitWorkingTreeDirty?: Maybe<Scalars['Boolean']>;
     logFiles: Array<Scalars['String']>;
+    maxBuildTimeSeconds: Scalars['Int'];
     metrics?: Maybe<BuildMetrics>;
     parentBuild?: Maybe<Build>;
     platform: AppPlatform;
@@ -1521,7 +1569,8 @@ export declare type BuildParamsInput = {
 };
 export declare enum BuildPriority {
     High = "HIGH",
-    Normal = "NORMAL"
+    Normal = "NORMAL",
+    NormalPlus = "NORMAL_PLUS"
 }
 /** Publicly visible data for a Build. */
 export declare type BuildPublicData = {
@@ -2420,6 +2469,8 @@ export declare type RootMutation = {
     app?: Maybe<AppMutation>;
     /** Mutations that modify an App Store Connect Api Key */
     appStoreConnectApiKey: AppStoreConnectApiKeyMutation;
+    /** Mutations that modify an AppVersion */
+    appVersion: AppVersionMutation;
     /** Mutations that modify an Identifier for an iOS App */
     appleAppIdentifier: AppleAppIdentifierMutation;
     /** Mutations that modify an Apple Device */
@@ -5759,6 +5810,19 @@ export declare type CreateAppMutation = {
         };
     } | null;
 };
+export declare type CreateAppVersionMutationVariables = Exact<{
+    appVersionInput: AppVersionInput;
+}>;
+export declare type CreateAppVersionMutation = {
+    __typename?: 'RootMutation';
+    appVersion: {
+        __typename?: 'AppVersionMutation';
+        createAppVersion: {
+            __typename?: 'AppVersion';
+            id: string;
+        };
+    };
+};
 export declare type CreateAndroidBuildMutationVariables = Exact<{
     appId: Scalars['ID'];
     job: AndroidJobInput;
@@ -6181,6 +6245,27 @@ export declare type DeleteWebhookMutation = {
         };
     };
 };
+export declare type LatestAppVersionQueryVariables = Exact<{
+    appId: Scalars['String'];
+    platform: AppPlatform;
+    applicationIdentifier: Scalars['String'];
+}>;
+export declare type LatestAppVersionQuery = {
+    __typename?: 'RootQuery';
+    app: {
+        __typename?: 'AppQuery';
+        byId: {
+            __typename?: 'App';
+            id: string;
+            latestAppVersionByPlatformAndApplicationIdentifier?: {
+                __typename?: 'AppVersion';
+                id: string;
+                storeVersion: string;
+                buildVersion: string;
+            } | null;
+        };
+    };
+};
 export declare type ViewBranchQueryVariables = Exact<{
     appId: Scalars['String'];
     name: Scalars['String'];