eas-cli 0.29.0 → 0.31.0

package/README.md

@@ -73,7 +73,7 @@ ALIASES
   $ eas login
 ```
 
-_See code: [src/commands/account/login.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/account/login.js)_
+_See code: [src/commands/account/login.js](https://github.com/expo/eas-cli/blob/v0.31.0/packages/eas-cli/src/commands/account/login.js)_
 
 ## `eas account:logout`
 
@@ -87,7 +87,7 @@ ALIASES
   $ eas logout
 ```
 
-_See code: [src/commands/account/logout.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/account/logout.js)_
+_See code: [src/commands/account/logout.js](https://github.com/expo/eas-cli/blob/v0.31.0/packages/eas-cli/src/commands/account/logout.js)_
 
 ## `eas account:view`
 
@@ -101,7 +101,7 @@ ALIASES
   $ eas whoami
 ```
 
-_See code: [src/commands/account/view.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/account/view.js)_
+_See code: [src/commands/account/view.js](https://github.com/expo/eas-cli/blob/v0.31.0/packages/eas-cli/src/commands/account/view.js)_
 
 ## `eas analytics [STATUS]`
 
@@ -112,7 +112,7 @@ USAGE
   $ eas analytics [STATUS]
 ```
 
-_See code: [src/commands/analytics.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/analytics.js)_
+_See code: [src/commands/analytics.js](https://github.com/expo/eas-cli/blob/v0.31.0/packages/eas-cli/src/commands/analytics.js)_
 
 ## `eas build`
 
@@ -145,7 +145,7 @@ OPTIONS
   --[no-]wait                              Wait for build(s) to complete
 ```
 
-_See code: [src/commands/build/index.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/build/index.js)_
+_See code: [src/commands/build/index.js](https://github.com/expo/eas-cli/blob/v0.31.0/packages/eas-cli/src/commands/build/index.js)_
 
 ## `eas build:cancel [BUILD_ID]`
 
@@ -156,7 +156,7 @@ USAGE
   $ eas build:cancel [BUILD_ID]
 ```
 
-_See code: [src/commands/build/cancel.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/build/cancel.js)_
+_See code: [src/commands/build/cancel.js](https://github.com/expo/eas-cli/blob/v0.31.0/packages/eas-cli/src/commands/build/cancel.js)_
 
 ## `eas build:configure`
 
@@ -170,7 +170,7 @@ OPTIONS
   -p, --platform=(android|ios|all)  Platform to configure
 ```
 
-_See code: [src/commands/build/configure.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/build/configure.js)_
+_See code: [src/commands/build/configure.js](https://github.com/expo/eas-cli/blob/v0.31.0/packages/eas-cli/src/commands/build/configure.js)_
 
 ## `eas build:list`
 
@@ -203,7 +203,7 @@ OPTIONS
   --status=(new|in-queue|in-progress|errored|finished|canceled)
 ```
 
-_See code: [src/commands/build/list.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/build/list.js)_
+_See code: [src/commands/build/list.js](https://github.com/expo/eas-cli/blob/v0.31.0/packages/eas-cli/src/commands/build/list.js)_
 
 ## `eas build:view [BUILD_ID]`
 
@@ -217,7 +217,7 @@ OPTIONS
   --json  Enable JSON output, non-JSON messages will be printed to stderr
 ```
 
-_See code: [src/commands/build/view.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/build/view.js)_
+_See code: [src/commands/build/view.js](https://github.com/expo/eas-cli/blob/v0.31.0/packages/eas-cli/src/commands/build/view.js)_
 
 ## `eas config`
 
@@ -232,7 +232,7 @@ OPTIONS
   --profile=profile
 ```
 
-_See code: [src/commands/config.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/config.js)_
+_See code: [src/commands/config.js](https://github.com/expo/eas-cli/blob/v0.31.0/packages/eas-cli/src/commands/config.js)_
 
 ## `eas credentials`
 
@@ -243,7 +243,7 @@ USAGE
   $ eas credentials
 ```
 
-_See code: [src/commands/credentials.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/credentials.js)_
+_See code: [src/commands/credentials.js](https://github.com/expo/eas-cli/blob/v0.31.0/packages/eas-cli/src/commands/credentials.js)_
 
 ## `eas device:create`
 
@@ -254,7 +254,7 @@ USAGE
   $ eas device:create
 ```
 
-_See code: [src/commands/device/create.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/device/create.js)_
+_See code: [src/commands/device/create.js](https://github.com/expo/eas-cli/blob/v0.31.0/packages/eas-cli/src/commands/device/create.js)_
 
 ## `eas device:list`
 
@@ -268,7 +268,7 @@ OPTIONS
   --apple-team-id=apple-team-id
 ```
 
-_See code: [src/commands/device/list.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/device/list.js)_
+_See code: [src/commands/device/list.js](https://github.com/expo/eas-cli/blob/v0.31.0/packages/eas-cli/src/commands/device/list.js)_
 
 ## `eas device:view [UDID]`
 
@@ -279,7 +279,7 @@ USAGE
   $ eas device:view [UDID]
 ```
 
-_See code: [src/commands/device/view.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/device/view.js)_
+_See code: [src/commands/device/view.js](https://github.com/expo/eas-cli/blob/v0.31.0/packages/eas-cli/src/commands/device/view.js)_
 
 ## `eas diagnostics`
 
@@ -290,7 +290,7 @@ USAGE
   $ eas diagnostics
 ```
 
-_See code: [src/commands/diagnostics.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/diagnostics.js)_
+_See code: [src/commands/diagnostics.js](https://github.com/expo/eas-cli/blob/v0.31.0/packages/eas-cli/src/commands/diagnostics.js)_
 
 ## `eas help [COMMAND]`
 
@@ -318,7 +318,7 @@ USAGE
   $ eas project:info
 ```
 
-_See code: [src/commands/project/info.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/project/info.js)_
+_See code: [src/commands/project/info.js](https://github.com/expo/eas-cli/blob/v0.31.0/packages/eas-cli/src/commands/project/info.js)_
 
 ## `eas project:init`
 
@@ -332,7 +332,7 @@ ALIASES
   $ eas init
 ```
 
-_See code: [src/commands/project/init.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/project/init.js)_
+_See code: [src/commands/project/init.js](https://github.com/expo/eas-cli/blob/v0.31.0/packages/eas-cli/src/commands/project/init.js)_
 
 ## `eas secret:create`
 
@@ -349,7 +349,7 @@ OPTIONS
   --value=value              Value of the secret
 ```
 
-_See code: [src/commands/secret/create.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/secret/create.js)_
+_See code: [src/commands/secret/create.js](https://github.com/expo/eas-cli/blob/v0.31.0/packages/eas-cli/src/commands/secret/create.js)_
 
 ## `eas secret:delete`
 
@@ -366,7 +366,7 @@ DESCRIPTION
   Unsure where to find the secret's ID? Run eas secrets:list
 ```
 
-_See code: [src/commands/secret/delete.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/secret/delete.js)_
+_See code: [src/commands/secret/delete.js](https://github.com/expo/eas-cli/blob/v0.31.0/packages/eas-cli/src/commands/secret/delete.js)_
 
 ## `eas secret:list`
 
@@ -377,7 +377,7 @@ USAGE
   $ eas secret:list
 ```
 
-_See code: [src/commands/secret/list.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/secret/list.js)_
+_See code: [src/commands/secret/list.js](https://github.com/expo/eas-cli/blob/v0.31.0/packages/eas-cli/src/commands/secret/list.js)_
 
 ## `eas submit`
 
@@ -410,7 +410,7 @@ ALIASES
   $ eas build:submit
 ```
 
-_See code: [src/commands/submit.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/submit.js)_
+_See code: [src/commands/submit.js](https://github.com/expo/eas-cli/blob/v0.31.0/packages/eas-cli/src/commands/submit.js)_
 
 ## `eas webhook:create`
 
@@ -429,7 +429,7 @@ OPTIONS
   --url=url        Webhook URL
 ```
 
-_See code: [src/commands/webhook/create.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/webhook/create.js)_
+_See code: [src/commands/webhook/create.js](https://github.com/expo/eas-cli/blob/v0.31.0/packages/eas-cli/src/commands/webhook/create.js)_
 
 ## `eas webhook:delete [ID]`
 
@@ -443,7 +443,7 @@ ARGUMENTS
   ID  ID of the webhook to delete
 ```
 
-_See code: [src/commands/webhook/delete.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/webhook/delete.js)_
+_See code: [src/commands/webhook/delete.js](https://github.com/expo/eas-cli/blob/v0.31.0/packages/eas-cli/src/commands/webhook/delete.js)_
 
 ## `eas webhook:list`
 
@@ -457,7 +457,7 @@ OPTIONS
   --event=(BUILD)  Event type that triggers the webhook
 ```
 
-_See code: [src/commands/webhook/list.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/webhook/list.js)_
+_See code: [src/commands/webhook/list.js](https://github.com/expo/eas-cli/blob/v0.31.0/packages/eas-cli/src/commands/webhook/list.js)_
 
 ## `eas webhook:update`
 
@@ -477,7 +477,7 @@ OPTIONS
   --url=url        Webhook URL
 ```
 
-_See code: [src/commands/webhook/update.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/webhook/update.js)_
+_See code: [src/commands/webhook/update.js](https://github.com/expo/eas-cli/blob/v0.31.0/packages/eas-cli/src/commands/webhook/update.js)_
 
 ## `eas webhook:view ID`
 
@@ -491,5 +491,5 @@ ARGUMENTS
   ID  ID of the webhook to view
 ```
 
-_See code: [src/commands/webhook/view.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/webhook/view.js)_
+_See code: [src/commands/webhook/view.js](https://github.com/expo/eas-cli/blob/v0.31.0/packages/eas-cli/src/commands/webhook/view.js)_
 <!-- commandsstop -->

package/build/analytics.js

@@ -53,7 +53,6 @@ async function initAsync() {
         rudderstackClient = new rudder_sdk_node_1.default(config.rudderstackWriteKey, new url_1.URL('/v1/batch', config.rudderstackDataPlaneURL).toString(), {
             flushInterval: 300,
         });
-        rudderstackClient.logger.silent = true;
     }
 }
 exports.initAsync = initAsync;
@@ -73,7 +72,7 @@ async function setUserDataAsync(userId, traits) {
 exports.setUserDataAsync = setUserDataAsync;
 async function flushAsync() {
     if (rudderstackClient) {
-        rudderstackClient.flush();
+        await rudderstackClient.flush();
     }
 }
 exports.flushAsync = flushAsync;
@@ -97,13 +96,11 @@ function ensureUserIdentified() {
     if (!rudderstackClient || userIdentified || !identifyData) {
         return;
     }
-    if (rudderstackClient) {
-        rudderstackClient.identify({
-            userId: identifyData.userId,
-            anonymousId: identifyData.deviceId,
-            traits: identifyData.traits,
-        });
-    }
+    rudderstackClient.identify({
+        userId: identifyData.userId,
+        anonymousId: identifyData.deviceId,
+        traits: identifyData.traits,
+    });
     userIdentified = true;
 }
 function getRudderStackContext() {

package/build/build/android/build.js

@@ -6,7 +6,6 @@ const eas_build_job_1 = require("@expo/eas-build-job");
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const nullthrows_1 = (0, tslib_1.__importDefault)(require("nullthrows"));
 const AndroidCredentialsProvider_1 = (0, tslib_1.__importDefault)(require("../../credentials/android/AndroidCredentialsProvider"));
-const context_1 = require("../../credentials/context");
 const BuildMutation_1 = require("../../graphql/mutations/BuildMutation");
 const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
 const applicationId_1 = require("../../project/android/applicationId");
@@ -46,9 +45,11 @@ This means that it will most likely produce an AAB and you will not be able to i
             return await ensureAndroidCredentialsAsync(ctx, gradleContext);
         },
         ensureProjectConfiguredAsync: async () => {
-            if (ctx.workflow === eas_build_job_1.Workflow.GENERIC) {
-                await (0, configure_1.validateAndSyncProjectConfigurationAsync)(ctx.projectDir, ctx.exp);
-            }
+            await (0, configure_1.validateAndSyncProjectConfigurationAsync)({
+                projectDir: ctx.projectDir,
+                exp: ctx.exp,
+                buildProfile,
+            });
         },
         getMetadataContext: () => ({
             gradleContext,
@@ -76,10 +77,7 @@ async function ensureAndroidCredentialsAsync(ctx, gradleContext) {
         return;
     }
     const androidApplicationIdentifier = await (0, applicationId_1.getApplicationIdAsync)(ctx.projectDir, ctx.exp, gradleContext);
-    const provider = new AndroidCredentialsProvider_1.default(await (0, context_1.createCredentialsContextAsync)(ctx.projectDir, {
-        exp: ctx.exp,
-        nonInteractive: ctx.nonInteractive,
-    }), {
+    const provider = new AndroidCredentialsProvider_1.default(ctx.credentialsCtx, {
         app: {
             account: (0, nullthrows_1.default)((0, Account_1.findAccountByName)(ctx.user.accounts, ctx.accountName), `You do not have access to account: ${ctx.accountName}`),
             projectName: ctx.projectName,

package/build/build/android/configure.d.ts

@@ -1,4 +1,9 @@
 import { ExpoConfig } from '@expo/config';
+import { AndroidBuildProfile } from '@expo/eas-json';
 import { ConfigureContext } from '../context';
 export declare function configureAndroidAsync(ctx: ConfigureContext): Promise<void>;
-export declare function validateAndSyncProjectConfigurationAsync(projectDir: string, exp: ExpoConfig): Promise<void>;
+export declare function validateAndSyncProjectConfigurationAsync({ projectDir, exp, buildProfile, }: {
+    projectDir: string;
+    exp: ExpoConfig;
+    buildProfile: AndroidBuildProfile;
+}): Promise<void>;

package/build/build/android/configure.js

@@ -3,11 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateAndSyncProjectConfigurationAsync = exports.configureAndroidAsync = 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 log_1 = (0, tslib_1.__importDefault)(require("../../log"));
 const applicationId_1 = require("../../project/android/applicationId");
+const workflow_1 = require("../../project/workflow");
 const vcs_1 = (0, tslib_1.__importDefault)(require("../../vcs"));
 const updates_1 = require("../utils/updates");
 const UpdatesModule_1 = require("./UpdatesModule");
+const version_1 = require("./version");
 async function configureAndroidAsync(ctx) {
     if (!ctx.hasAndroidNativeProject) {
         await (0, applicationId_1.ensureApplicationIdIsDefinedForManagedProjectAsync)(ctx.projectDir, ctx.exp);
@@ -23,12 +26,35 @@ async function configureAndroidAsync(ctx) {
     log_1.default.withTick('Android project configured');
 }
 exports.configureAndroidAsync = configureAndroidAsync;
-async function validateAndSyncProjectConfigurationAsync(projectDir, exp) {
-    if (!(await config_plugins_1.AndroidConfig.EasBuild.isEasBuildGradleConfiguredAsync(projectDir))) {
-        throw new Error('Project is not configured. Please run "eas build:configure" to configure the project.');
+async function validateAndSyncProjectConfigurationAsync({ projectDir, exp, buildProfile, }) {
+    const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.ANDROID);
+    const { autoIncrement } = buildProfile;
+    const versionBumpStrategy = resolveVersionBumpStrategy(autoIncrement !== null && autoIncrement !== void 0 ? autoIncrement : false);
+    if (workflow === eas_build_job_1.Workflow.GENERIC) {
+        if (!(await config_plugins_1.AndroidConfig.EasBuild.isEasBuildGradleConfiguredAsync(projectDir))) {
+            throw new Error('Project is not configured. Please run "eas build:configure" to configure the project.');
+        }
+        if ((0, updates_1.isExpoUpdatesInstalled)(projectDir)) {
+            await (0, UpdatesModule_1.syncUpdatesConfigurationAsync)(projectDir, exp);
+        }
+        await (0, version_1.bumpVersionAsync)({ projectDir, exp, bumpStrategy: versionBumpStrategy });
     }
-    if ((0, updates_1.isExpoUpdatesInstalled)(projectDir)) {
-        await (0, UpdatesModule_1.syncUpdatesConfigurationAsync)(projectDir, exp);
+    else {
+        await (0, version_1.bumpVersionInAppJsonAsync)({ projectDir, exp, bumpStrategy: versionBumpStrategy });
     }
 }
 exports.validateAndSyncProjectConfigurationAsync = validateAndSyncProjectConfigurationAsync;
+function resolveVersionBumpStrategy(autoIncrement) {
+    if (autoIncrement === true) {
+        return version_1.BumpStrategy.VERSION_CODE;
+    }
+    else if (autoIncrement === false) {
+        return version_1.BumpStrategy.NOOP;
+    }
+    else if (autoIncrement === 'versionCode') {
+        return version_1.BumpStrategy.VERSION_CODE;
+    }
+    else {
+        return version_1.BumpStrategy.APP_VERSION;
+    }
+}

package/build/build/android/prepareJob.js

@@ -4,6 +4,7 @@ exports.prepareJobAsync = void 0;
 const tslib_1 = require("tslib");
 const eas_build_job_1 = require("@expo/eas-build-job");
 const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const slash_1 = (0, tslib_1.__importDefault)(require("slash"));
 const projectUtils_1 = require("../../project/projectUtils");
 const actions_1 = require("../../user/actions");
 const vcs_1 = (0, tslib_1.__importDefault)(require("../../vcs"));
@@ -13,10 +14,9 @@ const cacheDefaults = {
     cacheDefaultPaths: true,
 };
 async function prepareJobAsync(ctx, jobData) {
-    var _a;
     const username = (0, projectUtils_1.getUsername)(ctx.exp, await (0, actions_1.ensureLoggedInAsync)());
     const buildProfile = ctx.buildProfile;
-    const projectRootDirectory = path_1.default.relative(await vcs_1.default.getRootPathAsync(), ctx.projectDir) || '.';
+    const projectRootDirectory = (0, slash_1.default)(path_1.default.relative(await vcs_1.default.getRootPathAsync(), ctx.projectDir)) || '.';
     const { credentials } = jobData;
     const buildCredentials = credentials
         ? {
@@ -40,7 +40,7 @@ async function prepareJobAsync(ctx, jobData) {
         projectRootDirectory,
         projectArchive: jobData.projectArchive,
         builderEnvironment: {
-            image: (_a = buildProfile.image) !== null && _a !== void 0 ? _a : 'default',
+            image: buildProfile.image,
             node: buildProfile.node,
             yarn: buildProfile.yarn,
             ndk: buildProfile.ndk,

package/build/build/android/version.d.ts

@@ -1,6 +1,21 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
+export declare enum BumpStrategy {
+    APP_VERSION = 0,
+    VERSION_CODE = 1,
+    NOOP = 2
+}
+export declare function bumpVersionAsync({ bumpStrategy, projectDir, exp, }: {
+    projectDir: string;
+    exp: ExpoConfig;
+    bumpStrategy: BumpStrategy;
+}): Promise<void>;
+export declare function bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp, }: {
+    bumpStrategy: BumpStrategy;
+    projectDir: string;
+    exp: ExpoConfig;
+}): Promise<void>;
 export declare function maybeResolveVersionsAsync(projectDir: string, exp: ExpoConfig, buildProfile: BuildProfile<Platform.ANDROID>): Promise<{
     appVersion?: string;
     appBuildVersion?: string;

package/build/build/android/version.js

@@ -1,10 +1,63 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.maybeResolveVersionsAsync = void 0;
+exports.maybeResolveVersionsAsync = 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 = (0, tslib_1.__importDefault)(require("chalk"));
+const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
+const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
 const gradleUtils_1 = require("../../project/android/gradleUtils");
 const workflow_1 = require("../../project/workflow");
+const appJson_1 = require("../utils/appJson");
+const version_1 = require("../utils/version");
+var BumpStrategy;
+(function (BumpStrategy) {
+    BumpStrategy[BumpStrategy["APP_VERSION"] = 0] = "APP_VERSION";
+    BumpStrategy[BumpStrategy["VERSION_CODE"] = 1] = "VERSION_CODE";
+    BumpStrategy[BumpStrategy["NOOP"] = 2] = "NOOP";
+})(BumpStrategy = exports.BumpStrategy || (exports.BumpStrategy = {}));
+async function bumpVersionAsync({ bumpStrategy, projectDir, exp, }) {
+    var _a, _b;
+    if (bumpStrategy === BumpStrategy.NOOP) {
+        return;
+    }
+    (0, version_1.ensureStaticConfigExists)(projectDir);
+    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('Automatic version bumping is not supported for multi-flavor Android projects.');
+    }
+    await bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp });
+    log_1.default.log('Updated versions in app.json');
+    await writeVersionsToBuildGradleAsync({
+        projectDir,
+        exp,
+    });
+    log_1.default.log('Synchronized versions with build gradle');
+}
+exports.bumpVersionAsync = bumpVersionAsync;
+async function bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp, }) {
+    var _a;
+    if (bumpStrategy === BumpStrategy.NOOP) {
+        return;
+    }
+    (0, version_1.ensureStaticConfigExists)(projectDir);
+    log_1.default.addNewLineIfNone();
+    if (bumpStrategy === BumpStrategy.APP_VERSION) {
+        const appVersion = (_a = config_plugins_1.AndroidConfig.Version.getVersionName(exp)) !== null && _a !== void 0 ? _a : '1.0.0';
+        await (0, version_1.bumpAppVersionAsync)({ appVersion, projectDir, exp });
+    }
+    else {
+        const versionCode = config_plugins_1.AndroidConfig.Version.getVersionCode(exp);
+        const bumpedVersionCode = versionCode + 1;
+        log_1.default.log(`Bumping ${chalk_1.default.bold('expo.android.versionCode')} from ${chalk_1.default.bold(versionCode)} to ${chalk_1.default.bold(bumpedVersionCode)}`);
+        await (0, appJson_1.updateAppJsonConfigAsync)({ projectDir, exp }, config => {
+            config.android = { ...config.android, versionCode: bumpedVersionCode };
+        });
+    }
+}
+exports.bumpVersionInAppJsonAsync = bumpVersionInAppJsonAsync;
 async function maybeResolveVersionsAsync(projectDir, exp, buildProfile) {
     var _a, _b;
     const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.ANDROID);
@@ -31,3 +84,24 @@ async function maybeResolveVersionsAsync(projectDir, exp, buildProfile) {
     }
 }
 exports.maybeResolveVersionsAsync = maybeResolveVersionsAsync;
+async function writeVersionsToBuildGradleAsync({ projectDir, exp, }) {
+    const buildGradle = await readBuildGradleAsync(projectDir);
+    if (!buildGradle) {
+        throw new Error('This project is missing a build.gradle file.');
+    }
+    let updatedBuildGradle = config_plugins_1.AndroidConfig.Version.setVersionName(exp, buildGradle);
+    updatedBuildGradle = config_plugins_1.AndroidConfig.Version.setVersionCode(exp, updatedBuildGradle);
+    await writeBuildGradleAsync({ projectDir, buildGradle: updatedBuildGradle });
+    return updatedBuildGradle;
+}
+async function readBuildGradleAsync(projectDir) {
+    const buildGradlePath = config_plugins_1.AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
+    if (!(await fs_extra_1.default.pathExists(buildGradlePath))) {
+        return undefined;
+    }
+    return await fs_extra_1.default.readFile(buildGradlePath, 'utf8');
+}
+async function writeBuildGradleAsync({ projectDir, buildGradle, }) {
+    const buildGradlePath = config_plugins_1.AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
+    await fs_extra_1.default.writeFile(buildGradlePath, buildGradle);
+}

package/build/build/context.d.ts

@@ -1,6 +1,7 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
+import { CredentialsContext } from '../credentials/context';
 import { RequestedPlatform } from '../platform';
 import { Actor } from '../user/User';
 import { TrackingContext } from './types';
@@ -19,6 +20,7 @@ export interface BuildContext<T extends Platform> {
     buildProfile: BuildProfile<T>;
     buildProfileName: string;
     clearCache: boolean;
+    credentialsCtx: CredentialsContext;
     exp: ExpoConfig;
     local: boolean;
     nonInteractive: boolean;

package/build/build/context.js

@@ -6,6 +6,7 @@ const eas_build_job_1 = require("@expo/eas-build-job");
 const json_file_1 = (0, tslib_1.__importDefault)(require("@expo/json-file"));
 const resolve_from_1 = (0, tslib_1.__importDefault)(require("resolve-from"));
 const uuid_1 = require("uuid");
+const context_1 = require("../credentials/context");
 const expoConfig_1 = require("../project/expoConfig");
 const projectUtils_1 = require("../project/projectUtils");
 const workflow_1 = require("../project/workflow");
@@ -21,6 +22,12 @@ async function createBuildContextAsync({ buildProfileName, buildProfile, clearCa
     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 credentialsCtx = new context_1.CredentialsContext({
+        exp,
+        nonInteractive,
+        projectDir,
+        user,
+    });
     const devClientProperties = getDevClientEventProperties({
         platform,
         projectDir,
@@ -41,6 +48,7 @@ async function createBuildContextAsync({ buildProfileName, buildProfile, clearCa
         buildProfile,
         buildProfileName,
         clearCache,
+        credentialsCtx,
         exp,
         local,
         nonInteractive,

package/build/build/ios/UpdatesModule.js

@@ -16,7 +16,9 @@ async function configureUpdatesAsync(projectDir, exp) {
     let xcodeProject = config_plugins_1.IOSConfig.XcodeUtils.getPbxproj(projectDir);
     if (!config_plugins_1.IOSConfig.Updates.isShellScriptBuildPhaseConfigured(projectDir, xcodeProject)) {
         xcodeProject = config_plugins_1.IOSConfig.Updates.ensureBundleReactNativePhaseContainsConfigurationScript(projectDir, xcodeProject);
-        await fs_extra_1.default.writeFile(config_plugins_1.IOSConfig.Paths.getPBXProjectPath(projectDir), xcodeProject.writeSync());
+        await fs_extra_1.default.writeFile(config_plugins_1.IOSConfig.Paths.getPBXProjectPath(projectDir), 
+        // eslint-disable-next-line node/no-sync
+        xcodeProject.writeSync());
     }
     let expoPlist = await readExpoPlistAsync(projectDir);
     if (!config_plugins_1.IOSConfig.Updates.isPlistConfigurationSynced(exp, expoPlist, accountName)) {

package/build/build/ios/configure.js

@@ -47,6 +47,6 @@ function resolveVersionBumpStrategy(autoIncrement) {
         return version_1.BumpStrategy.BUILD_NUMBER;
     }
     else {
-        return version_1.BumpStrategy.SHORT_VERSION;
+        return version_1.BumpStrategy.APP_VERSION;
     }
 }

package/build/build/ios/credentials.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureIosCredentialsAsync = void 0;
 const tslib_1 = require("tslib");
 const eas_build_job_1 = require("@expo/eas-build-job");
-const context_1 = require("../../credentials/context");
 const IosCredentialsProvider_1 = (0, tslib_1.__importDefault)(require("../../credentials/ios/IosCredentialsProvider"));
 const BuildCredentialsUtils_1 = require("../../credentials/ios/actions/BuildCredentialsUtils");
 const entitlements_1 = require("../../credentials/ios/appstore/entitlements");
@@ -13,12 +12,8 @@ async function ensureIosCredentialsAsync(buildCtx, targets) {
     if (!shouldProvideCredentials(buildCtx)) {
         return;
     }
-    const credentialsCtx = await (0, context_1.createCredentialsContextAsync)(buildCtx.projectDir, {
-        exp: buildCtx.exp,
-        nonInteractive: buildCtx.nonInteractive,
-    });
-    const provider = new IosCredentialsProvider_1.default(credentialsCtx, {
-        app: (0, BuildCredentialsUtils_1.getAppFromContext)(credentialsCtx),
+    const provider = new IosCredentialsProvider_1.default(buildCtx.credentialsCtx, {
+        app: (0, BuildCredentialsUtils_1.getAppFromContext)(buildCtx.credentialsCtx),
         targets,
         iosCapabilitiesOptions: {
             entitlements: await (0, entitlements_1.resolveEntitlementsJsonAsync)(buildCtx.projectDir, buildCtx.workflow),

package/build/build/ios/prepareJob.js

@@ -4,7 +4,7 @@ exports.prepareJobAsync = void 0;
 const tslib_1 = require("tslib");
 const eas_build_job_1 = require("@expo/eas-build-job");
 const path_1 = (0, tslib_1.__importDefault)(require("path"));
-const semver_1 = (0, tslib_1.__importDefault)(require("semver"));
+const slash_1 = (0, tslib_1.__importDefault)(require("slash"));
 const projectUtils_1 = require("../../project/projectUtils");
 const actions_1 = require("../../user/actions");
 const vcs_1 = (0, tslib_1.__importDefault)(require("../../vcs"));
@@ -14,7 +14,7 @@ const cacheDefaults = {
     cacheDefaultPaths: true,
 };
 async function prepareJobAsync(ctx, jobData) {
-    const projectRootDirectory = path_1.default.relative(await vcs_1.default.getRootPathAsync(), ctx.projectDir) || '.';
+    const projectRootDirectory = (0, slash_1.default)(path_1.default.relative(await vcs_1.default.getRootPathAsync(), ctx.projectDir)) || '.';
     const username = (0, projectUtils_1.getUsername)(ctx.exp, await (0, actions_1.ensureLoggedInAsync)());
     const buildCredentials = {};
     if (jobData.credentials) {
@@ -30,7 +30,7 @@ async function prepareJobAsync(ctx, jobData) {
         projectRootDirectory,
         distribution: ctx.buildProfile.simulator ? 'simulator' : ctx.buildProfile.distribution,
         builderEnvironment: {
-            image: resolveImage(ctx),
+            image: ctx.buildProfile.image,
             node: ctx.buildProfile.node,
             yarn: ctx.buildProfile.yarn,
             bundler: ctx.buildProfile.bundler,
@@ -60,17 +60,6 @@ async function prepareJobAsync(ctx, jobData) {
     return (0, eas_build_job_1.sanitizeJob)(job);
 }
 exports.prepareJobAsync = prepareJobAsync;
-function resolveImage(ctx) {
-    var _a;
-    // see https://linear.app/expo/issue/ENG-1396/make-default-image-dependent-on-sdk-version
-    if (!ctx.buildProfile.image && ctx.exp.sdkVersion) {
-        const majorSdkVersion = semver_1.default.major(ctx.exp.sdkVersion);
-        if (majorSdkVersion <= 41) {
-            return 'macos-catalina-10.15-xcode-12.4';
-        }
-    }
-    return (_a = ctx.buildProfile.image) !== null && _a !== void 0 ? _a : 'default';
-}
 function prepareTargetCredentials(targetCredentials) {
     return {
         provisioningProfileBase64: targetCredentials.provisioningProfile,

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

@@ -1,7 +1,7 @@
 import { ExpoConfig } from '@expo/config';
 import type { XCBuildConfiguration } from 'xcode';
 export declare enum BumpStrategy {
-    SHORT_VERSION = 0,
+    APP_VERSION = 0,
     BUILD_NUMBER = 1,
     NOOP = 2
 }