eas-cli 0.57.0 → 0.60.0

package/build/build/context.d.ts

@@ -13,12 +13,14 @@ export declare type CommonContext<T extends Platform> = Omit<BuildContext<T>, 'a
 export interface AndroidBuildContext {
     applicationId: string;
     gradleContext?: GradleBuildContext;
+    versionCodeOverride?: string;
 }
 export interface IosBuildContext {
     bundleIdentifier: string;
     applicationTarget: Target;
     targets: Target[];
     xcodeBuildContext: XcodeBuildContext;
+    buildNumberOverride?: string;
 }
 export interface BuildContext<T extends Platform> {
     accountName: string;
@@ -31,6 +33,8 @@ export interface BuildContext<T extends Platform> {
     exp: ExpoConfig;
     localBuildOptions: LocalBuildOptions;
     nonInteractive: boolean;
+    noWait: boolean;
+    runFromCI: boolean;
     platform: T;
     projectDir: string;
     projectId: string;

package/build/build/createContext.d.ts

@@ -3,13 +3,14 @@ import { BuildProfile, EasJson } from '@expo/eas-json';
 import { BuildResourceClass } from '../graphql/generated';
 import { BuildContext } from './context';
 import { LocalBuildOptions } from './local';
-export declare function createBuildContextAsync<T extends Platform>({ buildProfileName, buildProfile, easJsonCliConfig, clearCache, localBuildOptions, nonInteractive, platform, projectDir, resourceClass, message, }: {
+export declare function createBuildContextAsync<T extends Platform>({ buildProfileName, buildProfile, easJsonCliConfig, clearCache, localBuildOptions, nonInteractive, noWait, platform, projectDir, resourceClass, message, }: {
     buildProfileName: string;
     buildProfile: BuildProfile<T>;
     easJsonCliConfig: EasJson['cli'];
     clearCache: boolean;
     localBuildOptions: LocalBuildOptions;
     nonInteractive: boolean;
+    noWait: boolean;
     platform: T;
     projectDir: string;
     resourceClass: BuildResourceClass;

package/build/build/createContext.js

@@ -4,6 +4,7 @@ exports.createBuildContextAsync = void 0;
 const tslib_1 = require("tslib");
 const eas_build_job_1 = require("@expo/eas-build-job");
 const json_file_1 = tslib_1.__importDefault(require("@expo/json-file"));
+const getenv_1 = tslib_1.__importDefault(require("getenv"));
 const resolve_from_1 = tslib_1.__importDefault(require("resolve-from"));
 const uuid_1 = require("uuid");
 const events_1 = require("../analytics/events");
@@ -15,7 +16,7 @@ const Account_1 = require("../user/Account");
 const actions_1 = require("../user/actions");
 const build_1 = require("./android/build");
 const build_2 = require("./ios/build");
-async function createBuildContextAsync({ buildProfileName, buildProfile, easJsonCliConfig, clearCache = false, localBuildOptions, nonInteractive = false, platform, projectDir, resourceClass, message, }) {
+async function createBuildContextAsync({ buildProfileName, buildProfile, easJsonCliConfig, clearCache = false, localBuildOptions, nonInteractive, noWait, platform, projectDir, resourceClass, message, }) {
     var _a;
     const exp = (0, expoConfig_1.getExpoConfig)(projectDir, { env: buildProfile.env });
     const user = await (0, actions_1.ensureLoggedInAsync)();
@@ -24,6 +25,7 @@ async function createBuildContextAsync({ buildProfileName, buildProfile, easJson
     const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp, { env: buildProfile.env });
     const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, platform);
     const accountId = (_a = (0, Account_1.findAccountByName)(user.accounts, accountName)) === null || _a === void 0 ? void 0 : _a.id;
+    const runFromCI = getenv_1.default.boolish('CI', false);
     const credentialsCtx = new context_1.CredentialsContext({
         exp,
         nonInteractive,
@@ -43,6 +45,8 @@ async function createBuildContextAsync({ buildProfileName, buildProfile, easJson
         project_id: projectId,
         project_type: workflow,
         ...devClientProperties,
+        no_wait: noWait,
+        run_from_ci: runFromCI,
     };
     events_1.Analytics.logEvent(events_1.BuildEvent.BUILD_COMMAND, trackingCtx);
     const commonContext = {
@@ -56,6 +60,7 @@ async function createBuildContextAsync({ buildProfileName, buildProfile, easJson
         exp,
         localBuildOptions,
         nonInteractive,
+        noWait,
         platform,
         projectDir,
         projectId,
@@ -64,6 +69,7 @@ async function createBuildContextAsync({ buildProfileName, buildProfile, easJson
         user,
         workflow,
         message,
+        runFromCI,
     };
     if (platform === eas_build_job_1.Platform.ANDROID) {
         const common = commonContext;

package/build/build/ios/build.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepareIosBuildAsync = exports.createIosContextAsync = void 0;
 const eas_build_job_1 = require("@expo/eas-build-job");
+const eas_json_1 = require("@expo/eas-json");
 const BuildMutation_1 = require("../../graphql/mutations/BuildMutation");
 const bundleIdentifier_1 = require("../../project/ios/bundleIdentifier");
 const scheme_1 = require("../../project/ios/scheme");
@@ -13,7 +14,9 @@ const credentials_1 = require("./credentials");
 const graphql_2 = require("./graphql");
 const prepareJob_1 = require("./prepareJob");
 const syncProjectConfiguration_1 = require("./syncProjectConfiguration");
+const version_1 = require("./version");
 async function createIosContextAsync(ctx) {
+    var _a;
     const { buildProfile } = ctx;
     if (ctx.workflow === eas_build_job_1.Workflow.MANAGED) {
         await (0, bundleIdentifier_1.ensureBundleIdentifierIsDefinedForManagedProjectAsync)(ctx.projectDir, ctx.exp);
@@ -32,11 +35,21 @@ async function createIosContextAsync(ctx) {
         env: buildProfile.env,
     });
     const applicationTarget = (0, target_1.findApplicationTarget)(targets);
+    const buildNumberOverride = ((_a = ctx.easJsonCliConfig) === null || _a === void 0 ? void 0 : _a.appVersionSource) === eas_json_1.AppVersionSource.REMOTE
+        ? await (0, version_1.resolveRemoteBuildNumberAsync)({
+            projectDir: ctx.projectDir,
+            projectId: ctx.projectId,
+            exp: ctx.exp,
+            applicationTarget,
+            buildProfile,
+        })
+        : undefined;
     return {
         bundleIdentifier: applicationTarget.bundleIdentifier,
         applicationTarget,
         targets,
         xcodeBuildContext,
+        buildNumberOverride,
     };
 }
 exports.createIosContextAsync = createIosContextAsync;
@@ -47,11 +60,14 @@ async function prepareIosBuildAsync(ctx) {
             return (0, credentials_1.ensureIosCredentialsAsync)(ctx, ctx.ios.targets);
         },
         syncProjectConfigurationAsync: async () => {
+            var _a;
             await (0, syncProjectConfiguration_1.syncProjectConfigurationAsync)({
                 projectDir: ctx.projectDir,
                 exp: ctx.exp,
-                buildProfile: ctx.buildProfile,
                 targets: ctx.ios.targets,
+                localAutoIncrement: ((_a = ctx.easJsonCliConfig) === null || _a === void 0 ? void 0 : _a.appVersionSource) === eas_json_1.AppVersionSource.REMOTE
+                    ? false
+                    : ctx.buildProfile.autoIncrement,
             });
         },
         prepareJobAsync: async (ctx, jobData) => {

package/build/build/ios/graphql.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
 const graphql_1 = require("../graphql");
 function transformJob(job) {
+    var _a;
     return {
         type: (0, graphql_1.transformWorkflow)(job.type),
         projectArchive: (0, graphql_1.transformProjectArchive)(job.projectArchive),
@@ -14,6 +15,7 @@ function transformJob(job) {
         secrets: transformIosSecrets(job.secrets),
         builderEnvironment: job.builderEnvironment,
         cache: job.cache,
+        version: ((_a = job.version) === null || _a === void 0 ? void 0 : _a.buildNumber) ? { buildNumber: job.version.buildNumber } : undefined,
         scheme: job.scheme,
         buildConfiguration: job.buildConfiguration,
         artifactPath: job.artifactPath,

package/build/build/ios/prepareJob.js

@@ -54,6 +54,11 @@ async function prepareJobAsync(ctx, jobData) {
         buildConfiguration: ctx.buildProfile.buildConfiguration,
         artifactPath: ctx.buildProfile.artifactPath,
         username,
+        ...(ctx.ios.buildNumberOverride && {
+            version: {
+                buildNumber: ctx.ios.buildNumberOverride,
+            },
+        }),
         experimental: {
             prebuildCommand: ctx.buildProfile.prebuildCommand,
         },

package/build/build/ios/syncProjectConfiguration.d.ts

@@ -1,10 +1,9 @@
 import { ExpoConfig } from '@expo/config';
-import { Platform } from '@expo/eas-build-job';
-import { BuildProfile } from '@expo/eas-json';
+import { IosVersionAutoIncrement } from '@expo/eas-json';
 import { Target } from '../../credentials/ios/types';
-export declare function syncProjectConfigurationAsync({ projectDir, exp, buildProfile, targets, }: {
+export declare function syncProjectConfigurationAsync({ projectDir, exp, targets, localAutoIncrement, }: {
     projectDir: string;
     exp: ExpoConfig;
-    buildProfile: BuildProfile<Platform.IOS>;
     targets: Target[];
+    localAutoIncrement?: IosVersionAutoIncrement;
 }): Promise<void>;

package/build/build/ios/syncProjectConfiguration.js

@@ -6,10 +6,9 @@ const projectUtils_1 = require("../../project/projectUtils");
 const workflow_1 = require("../../project/workflow");
 const UpdatesModule_1 = require("../../update/ios/UpdatesModule");
 const version_1 = require("./version");
-async function syncProjectConfigurationAsync({ projectDir, exp, buildProfile, targets, }) {
+async function syncProjectConfigurationAsync({ projectDir, exp, targets, localAutoIncrement, }) {
     const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.IOS);
-    const { autoIncrement } = buildProfile;
-    const versionBumpStrategy = resolveVersionBumpStrategy(autoIncrement !== null && autoIncrement !== void 0 ? autoIncrement : false);
+    const versionBumpStrategy = resolveVersionBumpStrategy(localAutoIncrement !== null && localAutoIncrement !== void 0 ? localAutoIncrement : false);
     if (workflow === eas_build_job_1.Workflow.GENERIC) {
         if ((0, projectUtils_1.isExpoUpdatesInstalled)(projectDir)) {
             await (0, UpdatesModule_1.syncUpdatesConfigurationAsync)(projectDir, exp);

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

@@ -1,4 +1,6 @@
 import { ExpoConfig } from '@expo/config';
+import { Platform } from '@expo/eas-build-job';
+import { BuildProfile } from '@expo/eas-json';
 import type { XCBuildConfiguration } from 'xcode';
 import { Target } from '../../credentials/ios/types';
 export declare enum BumpStrategy {
@@ -31,3 +33,14 @@ export declare function updateNativeVersionsAsync({ projectDir, version, buildNu
     targets: Target[];
 }): Promise<void>;
 export declare function evaluateTemplateString(s: string, buildSettings: XCBuildConfiguration['buildSettings']): string;
+/**
+ * Returns buildNumber that will be used for the next build. If current build profile
+ * has an 'autoIncrement' option set, it increments the version on server.
+ */
+export declare function resolveRemoteBuildNumberAsync({ projectDir, projectId, exp, applicationTarget, buildProfile, }: {
+    projectDir: string;
+    projectId: string;
+    exp: ExpoConfig;
+    applicationTarget: Target;
+    buildProfile: BuildProfile<Platform.IOS>;
+}): Promise<string>;

package/build/build/ios/version.js

@@ -1,12 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.evaluateTemplateString = exports.updateNativeVersionsAsync = exports.getInfoPlistPath = exports.maybeResolveVersionsAsync = exports.readBuildNumberAsync = exports.readShortVersionAsync = exports.bumpVersionInAppJsonAsync = exports.bumpVersionAsync = exports.BumpStrategy = void 0;
+exports.resolveRemoteBuildNumberAsync = 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_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 generated_1 = require("../../graphql/generated");
+const AppVersionMutation_1 = require("../../graphql/mutations/AppVersionMutation");
+const AppVersionQuery_1 = require("../../graphql/queries/AppVersionQuery");
 const log_1 = tslib_1.__importDefault(require("../../log"));
+const ora_1 = require("../../ora");
 const target_1 = require("../../project/ios/target");
 const versions_1 = require("../../project/ios/versions");
 const workflow_1 = require("../../project/workflow");
@@ -186,3 +190,70 @@ function evaluateTemplateString(s, buildSettings) {
     });
 }
 exports.evaluateTemplateString = evaluateTemplateString;
+/**
+ * Returns buildNumber that will be used for the next build. If current build profile
+ * has an 'autoIncrement' option set, it increments the version on server.
+ */
+async function resolveRemoteBuildNumberAsync({ projectDir, projectId, exp, applicationTarget, buildProfile, }) {
+    var _a, _b, _c, _d;
+    const remoteVersions = await AppVersionQuery_1.AppVersionQuery.latestVersionAsync(projectId, generated_1.AppPlatform.Ios, applicationTarget.bundleIdentifier);
+    const localBuildNumber = await readBuildNumberAsync(projectDir, exp, (_a = applicationTarget.buildSettings) !== null && _a !== void 0 ? _a : {});
+    const localShortVersion = await readShortVersionAsync(projectDir, exp, (_b = applicationTarget.buildSettings) !== null && _b !== void 0 ? _b : {});
+    let currentBuildVersion;
+    if (remoteVersions === null || remoteVersions === void 0 ? void 0 : remoteVersions.buildVersion) {
+        currentBuildVersion = remoteVersions.buildVersion;
+    }
+    else {
+        if (localBuildNumber) {
+            log_1.default.warn('No remote versions are configured for this project, buildNumber will be initialized based on the value from the local project.');
+            currentBuildVersion = localBuildNumber;
+        }
+        else {
+            log_1.default.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.`);
+            throw new Error('Remote versions are not configured.');
+        }
+    }
+    if (!buildProfile.autoIncrement && (remoteVersions === null || remoteVersions === void 0 ? void 0 : remoteVersions.buildVersion)) {
+        return currentBuildVersion;
+    }
+    else if (!buildProfile.autoIncrement && !(remoteVersions === null || remoteVersions === void 0 ? void 0 : remoteVersions.buildVersion)) {
+        const spinner = (0, ora_1.ora)(`Initializing buildNumber with ${chalk_1.default.bold(currentBuildVersion)}.`).start();
+        try {
+            await AppVersionMutation_1.AppVersionMutation.createAppVersionAsync({
+                appId: projectId,
+                platform: generated_1.AppPlatform.Ios,
+                applicationIdentifier: applicationTarget.bundleIdentifier,
+                storeVersion: localShortVersion !== null && localShortVersion !== void 0 ? localShortVersion : '1.0.0',
+                buildVersion: currentBuildVersion,
+                runtimeVersion: (_c = config_plugins_1.Updates.getRuntimeVersionNullable(exp, eas_build_job_1.Platform.IOS)) !== null && _c !== void 0 ? _c : undefined,
+            });
+            spinner.succeed(`Initialized buildNumber with ${chalk_1.default.bold(currentBuildVersion)}.`);
+        }
+        catch (err) {
+            spinner.fail(`Failed to initialize buildNumber with ${chalk_1.default.bold(currentBuildVersion)}.`);
+            throw err;
+        }
+        return currentBuildVersion;
+    }
+    else {
+        const nextBuildVersion = (0, versions_1.getNextBuildNumber)(currentBuildVersion);
+        const spinner = (0, ora_1.ora)(`Incrementing buildNumber from ${chalk_1.default.bold(currentBuildVersion)} to ${chalk_1.default.bold(nextBuildVersion)}.`).start();
+        try {
+            await AppVersionMutation_1.AppVersionMutation.createAppVersionAsync({
+                appId: projectId,
+                platform: generated_1.AppPlatform.Ios,
+                applicationIdentifier: applicationTarget.bundleIdentifier,
+                storeVersion: localShortVersion !== null && localShortVersion !== void 0 ? localShortVersion : '1.0.0',
+                buildVersion: nextBuildVersion,
+                runtimeVersion: (_d = config_plugins_1.Updates.getRuntimeVersionNullable(exp, eas_build_job_1.Platform.IOS)) !== null && _d !== void 0 ? _d : undefined,
+            });
+            spinner.succeed(`Incremented buildNumber from ${chalk_1.default.bold(currentBuildVersion)} to ${chalk_1.default.bold(nextBuildVersion)}.`);
+        }
+        catch (err) {
+            spinner.fail(`Failed to increment buildNumber from ${chalk_1.default.bold(currentBuildVersion)} to ${chalk_1.default.bold(nextBuildVersion)}.`);
+            throw err;
+        }
+        return nextBuildVersion;
+    }
+}
+exports.resolveRemoteBuildNumberAsync = resolveRemoteBuildNumberAsync;

package/build/build/local.d.ts

@@ -1,4 +1,4 @@
-import { Job } from '@expo/eas-build-job';
+import { Job, Metadata } from '@expo/eas-build-job';
 export interface LocalBuildOptions {
     enable: boolean;
     skipCleanup?: boolean;
@@ -8,4 +8,4 @@ export interface LocalBuildOptions {
     workingdir?: string;
     verbose?: boolean;
 }
-export declare function runLocalBuildAsync(job: Job, options: LocalBuildOptions): Promise<void>;
+export declare function runLocalBuildAsync(job: Job, metadata: Metadata, options: LocalBuildOptions): Promise<void>;

package/build/build/local.js

@@ -6,10 +6,10 @@ const spawn_async_1 = tslib_1.__importDefault(require("@expo/spawn-async"));
 const semver_1 = tslib_1.__importDefault(require("semver"));
 const ora_1 = require("../ora");
 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
-const PLUGIN_PACKAGE_VERSION = '0.0.85';
-async function runLocalBuildAsync(job, options) {
+const PLUGIN_PACKAGE_VERSION = '0.0.99';
+async function runLocalBuildAsync(job, metadata, options) {
     var _a;
-    const { command, args } = await getCommandAndArgsAsync(job);
+    const { command, args } = await getCommandAndArgsAsync(job, metadata);
     let spinner;
     if (!options.verbose) {
         spinner = (0, ora_1.ora)().start(options.skipNativeBuild ? 'Preparing project' : 'Building project');
@@ -44,16 +44,16 @@ async function runLocalBuildAsync(job, options) {
     }
 }
 exports.runLocalBuildAsync = runLocalBuildAsync;
-async function getCommandAndArgsAsync(job) {
-    const jobBase64 = Buffer.from(JSON.stringify({ job })).toString('base64');
+async function getCommandAndArgsAsync(job, metadata) {
+    const jobAndMetadataBase64 = Buffer.from(JSON.stringify({ job, metadata })).toString('base64');
     if (process.env.EAS_LOCAL_BUILD_PLUGIN_PATH) {
         return {
             command: process.env.EAS_LOCAL_BUILD_PLUGIN_PATH,
-            args: [jobBase64],
+            args: [jobAndMetadataBase64],
         };
     }
     else {
-        const args = [`${PLUGIN_PACKAGE_NAME}@${PLUGIN_PACKAGE_VERSION}`, jobBase64];
+        const args = [`${PLUGIN_PACKAGE_NAME}@${PLUGIN_PACKAGE_VERSION}`, jobAndMetadataBase64];
         if (await isAtLeastNpm7Async()) {
             // npx shipped with npm >= 7.0.0 requires the "-y" flag to run commands without
             // prompting the user to install a package that is used for the first time

package/build/build/metadata.js

@@ -44,6 +44,8 @@ async function collectMetadataAsync(ctx) {
         ...(ctx.platform === eas_build_job_1.Platform.IOS && {
             iosEnterpriseProvisioning: resolveIosEnterpriseProvisioning(ctx),
         }),
+        runWithNoWaitFlag: ctx.noWait,
+        runFromCI: ctx.runFromCI,
     };
     return (0, eas_build_job_1.sanitizeMetadata)(metadata);
 }
@@ -51,11 +53,25 @@ 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.targets);
+        const resolvedVersion = await (0, version_2.maybeResolveVersionsAsync)(ctx.projectDir, ctx.exp, iosContext.ios.targets);
+        if (iosContext.ios.buildNumberOverride) {
+            return {
+                ...resolvedVersion,
+                appBuildVersion: iosContext.ios.buildNumberOverride,
+            };
+        }
+        return resolvedVersion;
     }
     else if (ctx.platform === eas_build_job_1.Platform.ANDROID) {
         const androidCtx = ctx;
-        return await (0, version_1.maybeResolveVersionsAsync)(ctx.projectDir, ctx.exp, androidCtx.buildProfile);
+        const resolvedVersion = await (0, version_1.maybeResolveVersionsAsync)(ctx.projectDir, ctx.exp, androidCtx.buildProfile);
+        if (androidCtx.android.versionCodeOverride) {
+            return {
+                ...resolvedVersion,
+                appBuildVersion: androidCtx.android.versionCodeOverride,
+            };
+        }
+        return resolvedVersion;
     }
     else {
         throw new Error(`Unsupported platform ${ctx.platform}`);

package/build/build/runBuildAndSubmit.js

@@ -7,11 +7,14 @@ const eas_json_1 = require("@expo/eas-json");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
 const generated_1 = require("../graphql/generated");
+const BuildQuery_1 = require("../graphql/queries/BuildQuery");
 const AppPlatform_1 = require("../graphql/types/AppPlatform");
 const log_1 = tslib_1.__importDefault(require("../log"));
 const platform_1 = require("../platform");
 const expoSdk_1 = require("../project/expoSdk");
 const metroConfig_1 = require("../project/metroConfig");
+const projectUtils_1 = require("../project/projectUtils");
+const remoteVersionSource_1 = require("../project/remoteVersionSource");
 const context_1 = require("../submit/context");
 const submit_1 = require("../submit/submit");
 const urls_1 = require("../submit/utils/urls");
@@ -61,6 +64,9 @@ async function runBuildAndSubmitAsync(projectDir, flags) {
         nonInteractive: flags.nonInteractive,
         buildProfiles,
     });
+    for (const buildProfile of buildProfiles) {
+        (0, remoteVersionSource_1.validateBuildProfileVersionSettings)(buildProfile, easJsonCliConfig);
+    }
     const startedBuilds = [];
     const buildCtxByPlatform = {};
     for (const buildProfile of buildProfiles) {
@@ -102,6 +108,7 @@ async function runBuildAndSubmitAsync(projectDir, flags) {
                 submitProfile,
                 nonInteractive: flags.nonInteractive,
             });
+            startedBuild.build = await BuildQuery_1.BuildQuery.withSubmissionsByIdAsync(startedBuild.build.id);
             submissions.push(submission);
         }
         log_1.default.newLine();
@@ -119,14 +126,24 @@ async function runBuildAndSubmitAsync(projectDir, flags) {
         buildIds: startedBuilds.map(({ build }) => build.id),
         accountName,
     });
-    (0, printBuildInfo_1.printBuildResults)(builds, flags.json);
+    if (!flags.json) {
+        (0, printBuildInfo_1.printBuildResults)(builds);
+    }
     const haveAllBuildsFailedOrCanceled = builds.every(build => (build === null || build === void 0 ? void 0 : build.status) && [generated_1.BuildStatus.Errored, generated_1.BuildStatus.Canceled].includes(build === null || build === void 0 ? void 0 : build.status));
     if (haveAllBuildsFailedOrCanceled || !flags.autoSubmit) {
+        if (flags.json) {
+            (0, json_1.printJsonOnlyOutput)(builds);
+        }
         exitWithNonZeroCodeIfSomeBuildsFailed(builds);
     }
     else {
-        // the following function also exits with non zero code if any of the submissions failed
-        await (0, submit_1.waitToCompleteAsync)(submissions);
+        const completedSubmissions = await (0, submit_1.waitToCompleteAsync)(submissions);
+        if (flags.json) {
+            (0, json_1.printJsonOnlyOutput)(await Promise.all(builds
+                .filter((i) => !!i)
+                .map(build => BuildQuery_1.BuildQuery.withSubmissionsByIdAsync(build.id))));
+        }
+        (0, submit_1.exitWithNonZeroCodeIfSomeSubmissionsDidntFinish)(completedSubmissions);
     }
 }
 exports.runBuildAndSubmitAsync = runBuildAndSubmitAsync;
@@ -137,6 +154,7 @@ async function prepareAndStartBuildAsync({ projectDir, flags, moreBuilds, buildP
         clearCache: flags.clearCache,
         buildProfile: buildProfile.profile,
         nonInteractive: flags.nonInteractive,
+        noWait: !flags.wait,
         platform: buildProfile.platform,
         projectDir,
         localBuildOptions: flags.localBuildOptions,
@@ -148,6 +166,10 @@ async function prepareAndStartBuildAsync({ projectDir, flags, moreBuilds, buildP
         const appPlatform = (0, AppPlatform_1.toAppPlatform)(buildProfile.platform);
         log_1.default.log(`${platform_1.appPlatformEmojis[appPlatform]} ${chalk_1.default.bold(`${platform_1.appPlatformDisplayNames[appPlatform]} build`)}`);
     }
+    await (0, projectUtils_1.validateAppVersionRuntimePolicySupportAsync)(buildCtx.projectDir, buildCtx.exp);
+    if ((easJsonCliConfig === null || easJsonCliConfig === void 0 ? void 0 : easJsonCliConfig.appVersionSource) === eas_json_1.AppVersionSource.REMOTE) {
+        (0, remoteVersionSource_1.validateAppConfigForRemoteVersionSource)(buildCtx.exp, buildProfile.platform);
+    }
     if (buildCtx.workflow === eas_build_job_1.Workflow.MANAGED) {
         if (!sdkVersionChecked) {
             await (0, expoSdk_1.checkExpoSdkIsSupportedAsync)(buildCtx);

package/build/build/utils/printBuildInfo.d.ts

@@ -1,5 +1,5 @@
 import { BuildError, BuildFragment, EasBuildDeprecationInfo } from '../../graphql/generated';
 export declare function printLogsUrls(builds: BuildFragment[]): void;
-export declare function printBuildResults(builds: (BuildFragment | null)[], json: boolean): void;
+export declare function printBuildResults(builds: (BuildFragment | null)[]): void;
 export declare function printDeprecationWarnings(deprecationInfo?: EasBuildDeprecationInfo | null): void;
 export declare function printUserError(error: BuildError): void;

package/build/build/utils/printBuildInfo.js

@@ -9,7 +9,6 @@ const qrcode_terminal_1 = tslib_1.__importDefault(require("qrcode-terminal"));
 const generated_1 = require("../../graphql/generated");
 const log_1 = tslib_1.__importStar(require("../../log"));
 const platform_1 = require("../../platform");
-const json_1 = require("../../utils/json");
 const url_1 = require("./url");
 function printLogsUrls(builds) {
     if (builds.length === 1) {
@@ -23,20 +22,15 @@ function printLogsUrls(builds) {
     }
 }
 exports.printLogsUrls = printLogsUrls;
-function printBuildResults(builds, json) {
-    if (json) {
-        (0, json_1.printJsonOnlyOutput)(builds);
+function printBuildResults(builds) {
+    log_1.default.newLine();
+    if (builds.length === 1) {
+        const [build] = builds;
+        (0, assert_1.default)(build, 'Build should be defined');
+        printBuildResult(build);
     }
     else {
-        log_1.default.newLine();
-        if (builds.length === 1) {
-            const [build] = builds;
-            (0, assert_1.default)(build, 'Build should be defined');
-            printBuildResult(build);
-        }
-        else {
-            builds.filter(i => i).forEach(build => printBuildResult(build));
-        }
+        builds.filter(i => i).forEach(build => printBuildResult(build));
     }
 }
 exports.printBuildResults = printBuildResults;

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

@@ -1,7 +1,6 @@
 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>;

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

@@ -26,12 +26,12 @@ class BuildVersionSetView extends EasCommand_1.default {
         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);
+        await (0, remoteVersionSource_1.ensureVersionSourceIsRemoteAsync)(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);
+        (0, remoteVersionSource_1.validateAppConfigForRemoteVersionSource)(exp, platform);
         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)
@@ -61,7 +61,6 @@ class BuildVersionSetView extends EasCommand_1.default {
 }
 exports.default = BuildVersionSetView;
 BuildVersionSetView.description = 'Update version of an app.';
-BuildVersionSetView.hidden = true;
 BuildVersionSetView.flags = {
     platform: core_1.Flags.enum({
         char: 'p',

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

@@ -1,7 +1,6 @@
 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>;

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

@@ -30,7 +30,7 @@ class BuildVersionSyncView extends EasCommand_1.default {
         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);
+        await (0, remoteVersionSource_1.ensureVersionSourceIsRemoteAsync)(projectDir, easJsonReader);
         const platforms = (0, platform_1.toPlatforms)(requestedPlatform);
         const buildProfiles = await (0, profiles_1.getProfilesAsync)({
             type: 'build',
@@ -41,7 +41,7 @@ class BuildVersionSyncView extends EasCommand_1.default {
         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);
+            (0, remoteVersionSource_1.validateAppConfigForRemoteVersionSource)(exp, profileInfo.platform);
             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);
@@ -111,7 +111,6 @@ class BuildVersionSyncView extends EasCommand_1.default {
 }
 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',

package/build/commands/submit.js

@@ -49,7 +49,10 @@ class Submit extends EasCommand_1.default {
         log_1.default.newLine();
         (0, urls_1.printSubmissionDetailsUrls)(submissions);
         if (flags.wait) {
-            await (0, submit_1.waitToCompleteAsync)(submissions, { verbose: flags.verbose });
+            const completedSubmissions = await (0, submit_1.waitToCompleteAsync)(submissions, {
+                verbose: flags.verbose,
+            });
+            (0, submit_1.exitWithNonZeroCodeIfSomeSubmissionsDidntFinish)(completedSubmissions);
         }
     }
     async sanitizeFlagsAsync(flags) {