eas-cli 0.34.1 → 0.37.0

package/build/project/android/applicationId.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject = exports.getApplicationIdAsync = exports.ensureApplicationIdIsDefinedForManagedProjectAsync = void 0;
+exports.warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject = exports.isApplicationIdValid = exports.getApplicationIdAsync = exports.getApplicationIdFromBareAsync = exports.AmbiguousApplicationIdError = exports.ensureApplicationIdIsDefinedForManagedProjectAsync = exports.INVALID_APPLICATION_ID_MESSAGE = void 0;
 const tslib_1 = require("tslib");
 const config_1 = require("@expo/config");
 const config_plugins_1 = require("@expo/config-plugins");
@@ -16,7 +16,7 @@ const prompts_1 = require("../../prompts");
 const actions_1 = require("../../user/actions");
 const workflow_1 = require("../workflow");
 const gradleUtils = (0, tslib_1.__importStar)(require("./gradleUtils"));
-const INVALID_APPLICATION_ID_MESSAGE = `Invalid format of Android applicationId. Only alphanumeric characters, '.' and '_' are allowed, and each '.' must be followed by a letter.`;
+exports.INVALID_APPLICATION_ID_MESSAGE = `Invalid format of Android applicationId. Only alphanumeric characters, '.' and '_' are allowed, and each '.' must be followed by a letter.`;
 async function ensureApplicationIdIsDefinedForManagedProjectAsync(projectDir, exp) {
     const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.ANDROID);
     (0, assert_1.default)(workflow === eas_build_job_1.Workflow.MANAGED, 'This function should be called only for managed projects');
@@ -30,40 +30,49 @@ async function ensureApplicationIdIsDefinedForManagedProjectAsync(projectDir, ex
     }
 }
 exports.ensureApplicationIdIsDefinedForManagedProjectAsync = ensureApplicationIdIsDefinedForManagedProjectAsync;
+class AmbiguousApplicationIdError extends Error {
+    constructor(message) {
+        super(message !== null && message !== void 0 ? message : 'Could not resolve applicationId.');
+    }
+}
+exports.AmbiguousApplicationIdError = AmbiguousApplicationIdError;
+async function getApplicationIdFromBareAsync(projectDir, gradleContext) {
+    const errorMessage = 'Could not read applicationId from Android project.';
+    if (gradleContext) {
+        const buildGradle = await gradleUtils.getAppBuildGradleAsync(projectDir);
+        const applicationIdSuffix = gradleUtils.resolveConfigValue(buildGradle, 'applicationIdSuffix', gradleContext.flavor);
+        if (applicationIdSuffix) {
+            throw new Error('"applicationIdSuffix" in app/build.gradle is not supported.');
+        }
+        const applicationId = gradleUtils.resolveConfigValue(buildGradle, 'applicationId', gradleContext.flavor);
+        return (0, nullthrows_1.default)(applicationId, errorMessage);
+    }
+    else {
+        // should return value only if productFlavors are not used
+        const buildGradlePath = config_plugins_1.AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
+        const buildGradle = await fs_extra_1.default.readFile(buildGradlePath, 'utf8');
+        const matchResult = buildGradle.match(/applicationId ['"](.*)['"]/);
+        if (buildGradle.match(/applicationIdSuffix/)) {
+            throw new Error('"applicationIdSuffix" in app/build.gradle is not supported.');
+        }
+        if (buildGradle.match(/productFlavors/)) {
+            throw new AmbiguousApplicationIdError('Failed to autodetect applicationId in multi-flavor project.');
+        }
+        return (0, nullthrows_1.default)(matchResult === null || matchResult === void 0 ? void 0 : matchResult[1], errorMessage);
+    }
+}
+exports.getApplicationIdFromBareAsync = getApplicationIdFromBareAsync;
 async function getApplicationIdAsync(projectDir, exp, gradleContext) {
     const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.ANDROID);
     if (workflow === eas_build_job_1.Workflow.GENERIC) {
         warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject(projectDir, exp);
-        const errorMessage = 'Could not read application id from Android project.';
-        if (gradleContext) {
-            const buildGradle = await gradleUtils.getAppBuildGradleAsync(projectDir);
-            const applicationId = gradleUtils.resolveConfigValue(buildGradle, 'applicationId', gradleContext.flavor);
-            return (0, nullthrows_1.default)(applicationId, errorMessage);
-        }
-        else {
-            // fallback to best effort approach, this logic can be dropped when we start supporting
-            // modules different than 'app' and 'flavorDimensions'
-            let buildGradlePath = null;
-            try {
-                buildGradlePath = config_plugins_1.AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
-            }
-            catch { }
-            if (!buildGradlePath || !(await fs_extra_1.default.pathExists(buildGradlePath))) {
-                throw new Error(errorMessage);
-            }
-            const buildGradle = await fs_extra_1.default.readFile(buildGradlePath, 'utf8');
-            const matchResult = buildGradle.match(/applicationId ['"](.*)['"]/);
-            const applicationId = (0, nullthrows_1.default)(matchResult === null || matchResult === void 0 ? void 0 : matchResult[1], errorMessage);
-            log_1.default.warn(`Unable to detect applicationId`);
-            log_1.default.warn(`Falling back to best effort approach, using applicationId ${applicationId}`);
-            return applicationId;
-        }
+        return getApplicationIdFromBareAsync(projectDir, gradleContext);
     }
     else {
         const applicationId = config_plugins_1.AndroidConfig.Package.getPackage(exp);
         if (!applicationId || !isApplicationIdValid(applicationId)) {
             if (applicationId) {
-                log_1.default.warn(INVALID_APPLICATION_ID_MESSAGE);
+                log_1.default.warn(exports.INVALID_APPLICATION_ID_MESSAGE);
             }
             throw new Error(`Specify "android.package" in ${(0, projectUtils_1.getProjectConfigDescription)(projectDir)} and run this command again.`);
         }
@@ -78,7 +87,7 @@ async function configureApplicationIdAsync(projectDir, exp) {
     const paths = (0, config_1.getConfigFilePaths)(projectDir);
     // we can't automatically update app.config.js
     if (paths.dynamicConfigPath) {
-        throw new Error(`"android.package" is not defined in your app.config.js and we can't update this file programatically. Add the value on your own and run this command again.`);
+        throw new Error(`"android.package" is not defined in your app.config.js and we can't update this file programmatically. Add the value on your own and run this command again.`);
     }
     (0, assert_1.default)(paths.staticConfigPath, 'app.json must exist');
     log_1.default.addNewLineIfNone();
@@ -89,7 +98,7 @@ async function configureApplicationIdAsync(projectDir, exp) {
         type: 'text',
         message: `What would you like your Android application id to be?`,
         initial: suggestedAndroidApplicationId,
-        validate: value => (isApplicationIdValid(value) ? true : INVALID_APPLICATION_ID_MESSAGE),
+        validate: value => (isApplicationIdValid(value) ? true : exports.INVALID_APPLICATION_ID_MESSAGE),
     });
     const rawStaticConfig = (0, appJson_1.readAppJson)(paths.staticConfigPath);
     rawStaticConfig.expo = {
@@ -103,6 +112,7 @@ async function configureApplicationIdAsync(projectDir, exp) {
 function isApplicationIdValid(applicationId) {
     return /^[a-zA-Z][a-zA-Z0-9_]*(\.[a-zA-Z][a-zA-Z0-9_]*)+$/.test(applicationId);
 }
+exports.isApplicationIdValid = isApplicationIdValid;
 let warnPrinted = false;
 function warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject(projectDir, exp) {
     if (config_plugins_1.AndroidConfig.Package.getPackage(exp) && !warnPrinted) {

package/build/project/android/gradle.js

@@ -18,7 +18,7 @@ async function resolveGradleBuildContextAsync(projectDir, buildProfile) {
                     : undefined;
                 if ((parsedGradleCommand === null || parsedGradleCommand === void 0 ? void 0 : parsedGradleCommand.moduleName) &&
                     parsedGradleCommand.moduleName !== gradleUtils.DEFAULT_MODULE_NAME) {
-                    log_1.default.warn(`Building modules different than "${gradleUtils.DEFAULT_MODULE_NAME}" might result in unexpected behavior`);
+                    log_1.default.warn(`Building modules different than "${gradleUtils.DEFAULT_MODULE_NAME}" might result in unexpected behavior.`);
                 }
                 return {
                     moduleName: (_a = parsedGradleCommand === null || parsedGradleCommand === void 0 ? void 0 : parsedGradleCommand.moduleName) !== null && _a !== void 0 ? _a : gradleUtils.DEFAULT_MODULE_NAME,
@@ -30,7 +30,8 @@ async function resolveGradleBuildContextAsync(projectDir, buildProfile) {
             }
         }
         catch (err) {
-            log_1.default.warn(`Unable to read project config from app/build.gradle: ${err.message}`);
+            log_1.default.warn(`Unable to read gradle project config: ${err.message}.`);
+            log_1.default.warn('Values from app/build.gradle might be resolved incorrectly.');
             return undefined;
         }
     }

package/build/project/android/gradleUtils.d.ts

@@ -5,6 +5,7 @@ interface GradleCommand {
 }
 interface Config {
     applicationId?: string;
+    applicationIdSuffix?: string;
     versionCode?: string;
     versionName?: string;
 }

package/build/project/ios/bundleIdentifier.d.ts

@@ -1,8 +1,13 @@
 import { ExpoConfig } from '@expo/config';
+export declare const INVALID_BUNDLE_IDENTIFIER_MESSAGE = "Invalid format of iOS bundle identifier. Only alphanumeric characters, '.' and '-' are allowed, and each '.' must be followed by a letter.";
 export declare function ensureBundleIdentifierIsDefinedForManagedProjectAsync(projectDir: string, exp: ExpoConfig): Promise<string>;
-export declare function getBundleIdentifierAsync(projectDir: string, exp: ExpoConfig, { targetName, buildConfiguration }?: {
+export declare class AmbiguousBundleIdentifierError extends Error {
+    constructor(message?: string);
+}
+export declare function getBundleIdentifierAsync(projectDir: string, exp: ExpoConfig, xcodeContext?: {
     targetName?: string;
     buildConfiguration?: string;
 }): Promise<string>;
+export declare function isBundleIdentifierValid(bundleIdentifier: string): boolean;
 export declare function warnIfBundleIdentifierDefinedInAppConfigForBareWorkflowProject(projectDir: string, exp: ExpoConfig): void;
 export declare function isWildcardBundleIdentifier(bundleIdentifier: string): boolean;

package/build/project/ios/bundleIdentifier.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isWildcardBundleIdentifier = exports.warnIfBundleIdentifierDefinedInAppConfigForBareWorkflowProject = exports.getBundleIdentifierAsync = exports.ensureBundleIdentifierIsDefinedForManagedProjectAsync = void 0;
+exports.isWildcardBundleIdentifier = exports.warnIfBundleIdentifierDefinedInAppConfigForBareWorkflowProject = exports.isBundleIdentifierValid = exports.getBundleIdentifierAsync = exports.AmbiguousBundleIdentifierError = exports.ensureBundleIdentifierIsDefinedForManagedProjectAsync = exports.INVALID_BUNDLE_IDENTIFIER_MESSAGE = void 0;
 const tslib_1 = require("tslib");
 const config_1 = require("@expo/config");
 const config_plugins_1 = require("@expo/config-plugins");
@@ -14,7 +14,7 @@ const prompts_1 = require("../../prompts");
 const actions_1 = require("../../user/actions");
 const projectUtils_1 = require("../projectUtils");
 const workflow_1 = require("../workflow");
-const INVALID_BUNDLE_IDENTIFIER_MESSAGE = `Invalid format of iOS bundle identifier. Only alphanumeric characters, '.' and '-' are allowed, and each '.' must be followed by a letter.`;
+exports.INVALID_BUNDLE_IDENTIFIER_MESSAGE = `Invalid format of iOS bundle identifier. Only alphanumeric characters, '.' and '-' are allowed, and each '.' must be followed by a letter.`;
 async function ensureBundleIdentifierIsDefinedForManagedProjectAsync(projectDir, exp) {
     const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.IOS);
     (0, assert_1.default)(workflow === eas_build_job_1.Workflow.MANAGED, 'This function should be called only for managed projects');
@@ -26,16 +26,25 @@ async function ensureBundleIdentifierIsDefinedForManagedProjectAsync(projectDir,
     }
 }
 exports.ensureBundleIdentifierIsDefinedForManagedProjectAsync = ensureBundleIdentifierIsDefinedForManagedProjectAsync;
-async function getBundleIdentifierAsync(projectDir, exp, { targetName, buildConfiguration } = {}) {
+class AmbiguousBundleIdentifierError extends Error {
+    constructor(message) {
+        super(message !== null && message !== void 0 ? message : 'Could not resolve bundle identifier.');
+    }
+}
+exports.AmbiguousBundleIdentifierError = AmbiguousBundleIdentifierError;
+async function getBundleIdentifierAsync(projectDir, exp, xcodeContext) {
     const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.IOS);
     if (workflow === eas_build_job_1.Workflow.GENERIC) {
         warnIfBundleIdentifierDefinedInAppConfigForBareWorkflowProject(projectDir, exp);
-        const bundleIdentifier = config_plugins_1.IOSConfig.BundleIdentifier.getBundleIdentifierFromPbxproj(projectDir, {
-            targetName,
-            buildConfiguration,
-        });
-        const buildConfigurationDesc = targetName && buildConfiguration
-            ? ` (target = ${targetName}, build configuration = ${buildConfiguration})`
+        const xcodeProject = config_plugins_1.IOSConfig.XcodeUtils.getPbxproj(projectDir);
+        const isMultiScheme = config_plugins_1.IOSConfig.BuildScheme.getSchemesFromXcodeproj(projectDir).length > 1;
+        const isMultiTarget = config_plugins_1.IOSConfig.Target.getNativeTargets(xcodeProject).filter(([, target]) => config_plugins_1.IOSConfig.Target.isTargetOfType(target, config_plugins_1.IOSConfig.Target.TargetType.APPLICATION)).length > 1;
+        if (!xcodeContext && isMultiScheme && isMultiTarget) {
+            throw new AmbiguousBundleIdentifierError("Multiple schemes and targets found in Xcode project, bundle identifier couldn't be resolved.");
+        }
+        const bundleIdentifier = config_plugins_1.IOSConfig.BundleIdentifier.getBundleIdentifierFromPbxproj(projectDir, xcodeContext !== null && xcodeContext !== void 0 ? xcodeContext : {});
+        const buildConfigurationDesc = (xcodeContext === null || xcodeContext === void 0 ? void 0 : xcodeContext.targetName) && (xcodeContext === null || xcodeContext === void 0 ? void 0 : xcodeContext.buildConfiguration)
+            ? ` (target = ${xcodeContext.targetName}, build configuration = ${xcodeContext.buildConfiguration})`
             : '';
         (0, assert_1.default)(bundleIdentifier, `Could not read bundle identifier from Xcode project${buildConfigurationDesc}.`);
         if (!isBundleIdentifierValid(bundleIdentifier)) {
@@ -45,17 +54,18 @@ async function getBundleIdentifierAsync(projectDir, exp, { targetName, buildConf
     }
     else {
         // TODO: the following asserts are only temporary until we support app extensions in managed projects
-        (0, assert_1.default)(!targetName || targetName === config_plugins_1.IOSConfig.XcodeUtils.sanitizedName(exp.name), 'targetName cannot be set to an arbitrary value for managed projects');
-        (0, assert_1.default)(!buildConfiguration, 'buildConfiguration cannot be passed for managed projects');
-        const bundleIdentifer = config_plugins_1.IOSConfig.BundleIdentifier.getBundleIdentifier(exp);
-        if (!bundleIdentifer || !isBundleIdentifierValid(bundleIdentifer)) {
-            if (bundleIdentifer) {
-                log_1.default.warn(INVALID_BUNDLE_IDENTIFIER_MESSAGE);
+        (0, assert_1.default)(!(xcodeContext === null || xcodeContext === void 0 ? void 0 : xcodeContext.targetName) ||
+            (xcodeContext === null || xcodeContext === void 0 ? void 0 : xcodeContext.targetName) === config_plugins_1.IOSConfig.XcodeUtils.sanitizedName(exp.name), 'targetName cannot be set to an arbitrary value for managed projects.');
+        (0, assert_1.default)(!(xcodeContext === null || xcodeContext === void 0 ? void 0 : xcodeContext.buildConfiguration), 'buildConfiguration cannot be passed for managed projects.');
+        const bundleIdentifier = config_plugins_1.IOSConfig.BundleIdentifier.getBundleIdentifier(exp);
+        if (!bundleIdentifier || !isBundleIdentifierValid(bundleIdentifier)) {
+            if (bundleIdentifier) {
+                log_1.default.warn(exports.INVALID_BUNDLE_IDENTIFIER_MESSAGE);
             }
             throw new Error(`Specify "ios.bundleIdentifier" in ${(0, projectUtils_1.getProjectConfigDescription)(projectDir)} and run this command again.`);
         }
         else {
-            return bundleIdentifer;
+            return bundleIdentifier;
         }
     }
 }
@@ -65,7 +75,7 @@ async function configureBundleIdentifierAsync(projectDir, exp) {
     const paths = (0, config_1.getConfigFilePaths)(projectDir);
     // we can't automatically update app.config.js
     if (paths.dynamicConfigPath) {
-        throw new Error(`"ios.bundleIdentifier" is not defined in your app.config.js and we can't update this file programatically. Add the value on your own and run this command again.`);
+        throw new Error(`"ios.bundleIdentifier" is not defined in your app.config.js and we can't update this file programmatically. Add the value on your own and run this command again.`);
     }
     (0, assert_1.default)(paths.staticConfigPath, 'app.json must exist');
     log_1.default.addNewLineIfNone();
@@ -76,7 +86,7 @@ async function configureBundleIdentifierAsync(projectDir, exp) {
         type: 'text',
         message: `What would you like your iOS bundle identifier to be?`,
         initial: suggestedBundleIdentifier,
-        validate: value => (isBundleIdentifierValid(value) ? true : INVALID_BUNDLE_IDENTIFIER_MESSAGE),
+        validate: value => (isBundleIdentifierValid(value) ? true : exports.INVALID_BUNDLE_IDENTIFIER_MESSAGE),
     });
     const rawStaticConfig = (0, appJson_1.readAppJson)(paths.staticConfigPath);
     rawStaticConfig.expo = {
@@ -90,6 +100,7 @@ async function configureBundleIdentifierAsync(projectDir, exp) {
 function isBundleIdentifierValid(bundleIdentifier) {
     return /^[a-zA-Z0-9-.]+$/.test(bundleIdentifier);
 }
+exports.isBundleIdentifierValid = isBundleIdentifierValid;
 let warnPrinted = false;
 function warnIfBundleIdentifierDefinedInAppConfigForBareWorkflowProject(projectDir, exp) {
     if (config_plugins_1.IOSConfig.BundleIdentifier.getBundleIdentifier(exp) && !warnPrinted) {

package/build/submit/ArchiveSource.js

@@ -188,7 +188,7 @@ async function handleBuildListSourceAsync(source) {
     }
 }
 function formatBuildChoice(build, expiryDate) {
-    const { id, platform, updatedAt, appVersion, sdkVersion, runtimeVersion, buildProfile, appBuildVersion, releaseChannel, } = build;
+    const { id, platform, updatedAt, appVersion, sdkVersion, runtimeVersion, buildProfile, appBuildVersion, releaseChannel, initiatingActor, } = build;
     const formatValue = (field) => field ? chalk_1.default.bold(field) : chalk_1.default.dim('Unknown');
     const buildDate = new Date(updatedAt);
     const maybeRuntimeVersion = runtimeVersion ? `Runtime: ${formatValue(runtimeVersion)}` : null;
@@ -204,6 +204,7 @@ function formatBuildChoice(build, expiryDate) {
             .filter(it => it != null)
             .join(', '),
         `\tProfile: ${formatValue(buildProfile)}, Release channel: ${formatValue(releaseChannel)}`,
+        `\tAuthored by: ${formatValue(initiatingActor === null || initiatingActor === void 0 ? void 0 : initiatingActor.displayName)}`,
     ].join('\n');
     return {
         title,

package/build/submit/BaseSubmitter.d.ts

@@ -1,4 +1,5 @@
 import { Platform } from '@expo/eas-build-job';
+import { Event } from '../analytics/events';
 import { AndroidSubmissionConfigInput, IosSubmissionConfigInput, SubmissionFragment } from '../graphql/generated';
 import { SubmissionContext } from './context';
 export interface SubmissionInput<P extends Platform> {
@@ -6,11 +7,26 @@ export interface SubmissionInput<P extends Platform> {
     submissionConfig: P extends Platform.ANDROID ? AndroidSubmissionConfigInput : IosSubmissionConfigInput;
     buildId?: string;
 }
-export default abstract class BaseSubmitter<P extends Platform, SubmissionOptions> {
+interface AnalyticEvents {
+    attemptEvent: Event;
+    successEvent: Event;
+    failureEvent: Event;
+}
+export default abstract class BaseSubmitter<P extends Platform, ResolvedSourceOptions, SubmissionOptions> {
     protected ctx: SubmissionContext<P>;
     protected options: SubmissionOptions;
-    constructor(ctx: SubmissionContext<P>, options: SubmissionOptions);
-    abstract submitAsync(): Promise<SubmissionFragment>;
-    protected createSubmissionAsync(submissionInput: SubmissionInput<P>): Promise<SubmissionFragment>;
+    protected sourceOptionResolver: {
+        [K in keyof ResolvedSourceOptions]: () => Promise<ResolvedSourceOptions[K]>;
+    };
+    protected sourceOptionAnalytics: Record<keyof ResolvedSourceOptions, AnalyticEvents>;
+    constructor(ctx: SubmissionContext<P>, options: SubmissionOptions, sourceOptionResolver: {
+        [K in keyof ResolvedSourceOptions]: () => Promise<ResolvedSourceOptions[K]>;
+    }, sourceOptionAnalytics: Record<keyof ResolvedSourceOptions, AnalyticEvents>);
+    private getSourceOptionsAsync;
+    submitAsync(): Promise<SubmissionFragment>;
+    abstract createSubmissionInputAsync(resolvedOptions: ResolvedSourceOptions): Promise<SubmissionInput<P>>;
+    private createSubmissionAsync;
+    private createSubmissionWithAnalyticsAsync;
     protected abstract createPlatformSubmissionAsync(input: SubmissionInput<P>): Promise<SubmissionFragment>;
 }
+export {};

package/build/submit/BaseSubmitter.js

@@ -1,14 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+const common_1 = require("../analytics/common");
+const events_1 = require("../analytics/events");
 const AppPlatform_1 = require("../graphql/types/AppPlatform");
 const log_1 = (0, tslib_1.__importDefault)(require("../log"));
 const ora_1 = require("../ora");
 const platform_1 = require("../platform");
 class BaseSubmitter {
-    constructor(ctx, options) {
+    constructor(ctx, options, sourceOptionResolver, sourceOptionAnalytics) {
         this.ctx = ctx;
         this.options = options;
+        this.sourceOptionResolver = sourceOptionResolver;
+        this.sourceOptionAnalytics = sourceOptionAnalytics;
+    }
+    async getSourceOptionsAsync() {
+        const resolvedSourceOptions = {};
+        // Do not perform this in parallel as some of these require user interaction
+        for (const key in this.sourceOptionResolver) {
+            const sourceOptionKey = key;
+            const sourceOptionAnalytics = this.sourceOptionAnalytics[sourceOptionKey];
+            const sourceOption = await (0, common_1.withAnalyticsAsync)(async () => await this.sourceOptionResolver[sourceOptionKey](), {
+                attemptEvent: sourceOptionAnalytics.attemptEvent,
+                successEvent: sourceOptionAnalytics.successEvent,
+                failureEvent: sourceOptionAnalytics.failureEvent,
+                trackingCtx: this.ctx.trackingCtx,
+            });
+            resolvedSourceOptions[sourceOptionKey] = sourceOption;
+        }
+        return resolvedSourceOptions;
+    }
+    async submitAsync() {
+        const resolvedSourceOptions = await this.getSourceOptionsAsync();
+        const input = await this.createSubmissionInputAsync(resolvedSourceOptions);
+        return await this.createSubmissionWithAnalyticsAsync(input);
     }
     async createSubmissionAsync(submissionInput) {
         log_1.default.addNewLineIfNone();
@@ -24,5 +49,13 @@ class BaseSubmitter {
             throw err;
         }
     }
+    async createSubmissionWithAnalyticsAsync(submissionInput) {
+        return await (0, common_1.withAnalyticsAsync)(async () => this.createSubmissionAsync(submissionInput), {
+            attemptEvent: events_1.SubmissionEvent.SUBMIT_REQUEST_ATTEMPT,
+            successEvent: events_1.SubmissionEvent.SUBMIT_REQUEST_SUCCESS,
+            failureEvent: events_1.SubmissionEvent.SUBMIT_REQUEST_FAIL,
+            trackingCtx: this.ctx.trackingCtx,
+        });
+    }
 }
 exports.default = BaseSubmitter;

package/build/submit/android/AndroidSubmitCommand.d.ts

@@ -7,9 +7,8 @@ export default class AndroidSubmitCommand {
     runAsync(): Promise<SubmissionFragment>;
     private getAndroidSubmissionOptionsAsync;
     private maybeGetAndroidPackageFromCurrentProjectAsync;
-    private resolveAndroidPackageSourceAsync;
     private resolveTrack;
     private resolveReleaseStatus;
     private resolveArchiveSource;
-    private resolveServiceAccountSource;
+    private resolveServiceAccountSourceAsync;
 }

package/build/submit/android/AndroidSubmitCommand.js

@@ -7,10 +7,8 @@ const results_1 = require("@expo/results");
 const generated_1 = require("../../graphql/generated");
 const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
 const applicationId_1 = require("../../project/android/applicationId");
-const gradleUtils = (0, tslib_1.__importStar)(require("../../project/android/gradleUtils"));
 const capitalize_1 = (0, tslib_1.__importDefault)(require("../../utils/expodash/capitalize"));
 const commons_1 = require("../commons");
-const AndroidPackageSource_1 = require("./AndroidPackageSource");
 const AndroidSubmitter_1 = (0, tslib_1.__importDefault)(require("./AndroidSubmitter"));
 const ServiceAccountSource_1 = require("./ServiceAccountSource");
 class AndroidSubmitCommand {
@@ -24,18 +22,11 @@ class AndroidSubmitCommand {
         return await submitter.submitAsync();
     }
     async getAndroidSubmissionOptionsAsync() {
-        const androidPackageSource = await this.resolveAndroidPackageSourceAsync();
         const track = this.resolveTrack();
         const releaseStatus = this.resolveReleaseStatus();
         const archiveSource = this.resolveArchiveSource();
-        const serviceAccountSource = this.resolveServiceAccountSource();
-        const errored = [
-            androidPackageSource,
-            track,
-            releaseStatus,
-            archiveSource,
-            serviceAccountSource,
-        ].filter(r => !r.ok);
+        const serviceAccountSource = await this.resolveServiceAccountSourceAsync();
+        const errored = [track, releaseStatus, archiveSource, serviceAccountSource].filter(r => !r.ok);
         if (errored.length > 0) {
             const message = errored.map(err => { var _a; return (_a = err.reason) === null || _a === void 0 ? void 0 : _a.message; }).join('\n');
             log_1.default.error(message);
@@ -43,7 +34,6 @@ class AndroidSubmitCommand {
         }
         return {
             projectId: this.ctx.projectId,
-            androidPackageSource: androidPackageSource.enforceValue(),
             track: track.enforceValue(),
             releaseStatus: releaseStatus.enforceValue(),
             archiveSource: archiveSource.enforceValue(),
@@ -53,29 +43,14 @@ class AndroidSubmitCommand {
     }
     async maybeGetAndroidPackageFromCurrentProjectAsync() {
         try {
-            return await (0, applicationId_1.getApplicationIdAsync)(this.ctx.projectDir, this.ctx.exp, {
-                moduleName: gradleUtils.DEFAULT_MODULE_NAME,
-            });
+            return (0, results_1.result)(await (0, applicationId_1.getApplicationIdAsync)(this.ctx.projectDir, this.ctx.exp));
         }
-        catch {
-            return undefined;
-        }
-    }
-    async resolveAndroidPackageSourceAsync() {
-        const androidPackage = await this.maybeGetAndroidPackageFromCurrentProjectAsync();
-        if (androidPackage) {
-            return (0, results_1.result)({
-                sourceType: AndroidPackageSource_1.AndroidPackageSourceType.userDefined,
-                androidPackage,
-            });
-        }
-        else if (this.ctx.nonInteractive) {
-            return (0, results_1.result)(new Error("Couldn't resolve the Android package."));
-        }
-        else {
-            return (0, results_1.result)({
-                sourceType: AndroidPackageSource_1.AndroidPackageSourceType.prompt,
-            });
+        catch (error) {
+            if (error instanceof applicationId_1.AmbiguousApplicationIdError) {
+                log_1.default.warn('"applicationId" is ambiguous, specify it via "applicationId" field in the submit profile in the eas.json.');
+                return (0, results_1.result)(null);
+            }
+            return (0, results_1.result)(new Error(`Failed to resolve applicationId in Android project: ${error.message}.`));
         }
     }
     resolveTrack() {
@@ -112,7 +87,7 @@ class AndroidSubmitCommand {
             return (0, results_1.result)(err);
         }
     }
-    resolveServiceAccountSource() {
+    async resolveServiceAccountSourceAsync() {
         const { serviceAccountKeyPath } = this.ctx.profile;
         if (serviceAccountKeyPath) {
             return (0, results_1.result)({
@@ -120,8 +95,20 @@ class AndroidSubmitCommand {
                 path: serviceAccountKeyPath,
             });
         }
+        let androidApplicationIdentifier = this.ctx.profile.applicationId;
+        if (!androidApplicationIdentifier) {
+            const androidApplicationIdentifierResult = await this.maybeGetAndroidPackageFromCurrentProjectAsync();
+            if (!androidApplicationIdentifierResult.ok) {
+                return (0, results_1.result)(androidApplicationIdentifierResult.reason);
+            }
+            const androidApplicationIdentifierValue = androidApplicationIdentifierResult.enforceValue();
+            if (androidApplicationIdentifierValue) {
+                androidApplicationIdentifier = androidApplicationIdentifierValue;
+            }
+        }
         return (0, results_1.result)({
             sourceType: ServiceAccountSource_1.ServiceAccountSourceType.credentialsService,
+            androidApplicationIdentifier,
         });
     }
 }

package/build/submit/android/AndroidSubmitter.d.ts

@@ -1,19 +1,23 @@
 import { Platform } from '@expo/eas-build-job';
 import { AndroidSubmissionConfigInput, SubmissionFragment } from '../../graphql/generated';
-import { ArchiveSource } from '../ArchiveSource';
+import { Archive, ArchiveSource } from '../ArchiveSource';
 import BaseSubmitter, { SubmissionInput } from '../BaseSubmitter';
-import { AndroidPackageSource } from './AndroidPackageSource';
-import { ServiceAccountSource } from './ServiceAccountSource';
+import { SubmissionContext } from '../context';
+import { ServiceAccountKeyResult, ServiceAccountSource } from './ServiceAccountSource';
 export interface AndroidSubmissionOptions extends Pick<AndroidSubmissionConfigInput, 'track' | 'releaseStatus' | 'changesNotSentForReview'> {
     projectId: string;
-    androidPackageSource: AndroidPackageSource;
     archiveSource: ArchiveSource;
     serviceAccountSource: ServiceAccountSource;
 }
-export default class AndroidSubmitter extends BaseSubmitter<Platform.ANDROID, AndroidSubmissionOptions> {
-    submitAsync(): Promise<SubmissionFragment>;
+interface ResolvedSourceOptions {
+    archive: Archive;
+    serviceAccountKeyResult: ServiceAccountKeyResult;
+}
+export default class AndroidSubmitter extends BaseSubmitter<Platform.ANDROID, ResolvedSourceOptions, AndroidSubmissionOptions> {
+    constructor(ctx: SubmissionContext<Platform.ANDROID>, options: AndroidSubmissionOptions);
+    createSubmissionInputAsync(resolvedSourceOptions: ResolvedSourceOptions): Promise<SubmissionInput<Platform.ANDROID>>;
     protected createPlatformSubmissionAsync({ projectId, submissionConfig, buildId, }: SubmissionInput<Platform.ANDROID>): Promise<SubmissionFragment>;
-    private resolveSourceOptionsAsync;
-    private formatSubmissionConfigAsync;
+    private formatSubmissionConfig;
     private prepareSummaryData;
 }
+export {};

package/build/submit/android/AndroidSubmitter.js

@@ -2,24 +2,46 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
+const events_1 = require("../../analytics/events");
 const SubmissionMutation_1 = require("../../graphql/mutations/SubmissionMutation");
 const formatFields_1 = (0, tslib_1.__importDefault)(require("../../utils/formatFields"));
 const ArchiveSource_1 = require("../ArchiveSource");
 const BaseSubmitter_1 = (0, tslib_1.__importDefault)(require("../BaseSubmitter"));
 const summary_1 = require("../utils/summary");
-const AndroidPackageSource_1 = require("./AndroidPackageSource");
 const ServiceAccountSource_1 = require("./ServiceAccountSource");
 class AndroidSubmitter extends BaseSubmitter_1.default {
-    async submitAsync() {
+    constructor(ctx, options) {
+        const sourceOptionsResolver = {
+            // eslint-disable-next-line async-protect/async-suffix
+            archive: async () => await (0, ArchiveSource_1.getArchiveAsync)(this.options.archiveSource),
+            // eslint-disable-next-line async-protect/async-suffix
+            serviceAccountKeyResult: async () => {
+                return await (0, ServiceAccountSource_1.getServiceAccountKeyResultAsync)(this.ctx, this.options.serviceAccountSource);
+            },
+        };
+        const sourceOptionsAnalytics = {
+            archive: {
+                attemptEvent: events_1.SubmissionEvent.GATHER_ARCHIVE_ATTEMPT,
+                successEvent: events_1.SubmissionEvent.GATHER_ARCHIVE_SUCCESS,
+                failureEvent: events_1.SubmissionEvent.GATHER_ARCHIVE_FAIL,
+            },
+            serviceAccountKeyResult: {
+                attemptEvent: events_1.SubmissionEvent.GATHER_CREDENTIALS_ATTEMPT,
+                successEvent: events_1.SubmissionEvent.GATHER_CREDENTIALS_SUCCESS,
+                failureEvent: events_1.SubmissionEvent.GATHER_CREDENTIALS_FAIL,
+            },
+        };
+        super(ctx, options, sourceOptionsResolver, sourceOptionsAnalytics);
+    }
+    async createSubmissionInputAsync(resolvedSourceOptions) {
         var _a;
-        const resolvedSourceOptions = await this.resolveSourceOptionsAsync();
-        const submissionConfig = await this.formatSubmissionConfigAsync(this.options, resolvedSourceOptions);
+        const submissionConfig = await this.formatSubmissionConfig(this.options, resolvedSourceOptions);
         (0, summary_1.printSummary)(this.prepareSummaryData(this.options, resolvedSourceOptions), SummaryHumanReadableKeys);
-        return await this.createSubmissionAsync({
+        return {
             projectId: this.options.projectId,
             submissionConfig,
             buildId: (_a = resolvedSourceOptions.archive.build) === null || _a === void 0 ? void 0 : _a.id,
-        });
+        };
     }
     async createPlatformSubmissionAsync({ projectId, submissionConfig, buildId, }) {
         return await SubmissionMutation_1.SubmissionMutation.createAndroidSubmissionAsync({
@@ -28,20 +50,9 @@ class AndroidSubmitter extends BaseSubmitter_1.default {
             submittedBuildId: buildId,
         });
     }
-    async resolveSourceOptionsAsync() {
-        const androidPackage = await (0, AndroidPackageSource_1.getAndroidPackageAsync)(this.options.androidPackageSource);
-        const archive = await (0, ArchiveSource_1.getArchiveAsync)(this.options.archiveSource);
-        const serviceAccountKeyResult = await (0, ServiceAccountSource_1.getServiceAccountKeyResultAsync)(this.ctx, this.options.serviceAccountSource, androidPackage);
-        return {
-            androidPackage,
-            archive,
-            serviceAccountKeyResult,
-        };
-    }
-    async formatSubmissionConfigAsync(options, { archive, androidPackage, serviceAccountKeyResult }) {
+    formatSubmissionConfig(options, { archive, serviceAccountKeyResult }) {
         const { track, releaseStatus, changesNotSentForReview } = options;
         return {
-            applicationIdentifier: androidPackage,
             archiveUrl: archive.url,
             track,
             changesNotSentForReview,
@@ -49,12 +60,11 @@ class AndroidSubmitter extends BaseSubmitter_1.default {
             ...serviceAccountKeyResult.result,
         };
     }
-    prepareSummaryData(options, { archive, androidPackage, serviceAccountKeyResult }) {
+    prepareSummaryData(options, { archive, serviceAccountKeyResult }) {
         const { projectId, track, releaseStatus, changesNotSentForReview } = options;
         // structuring order affects table rows order
         return {
             projectId,
-            androidPackage,
             track,
             changesNotSentForReview: changesNotSentForReview !== null && changesNotSentForReview !== void 0 ? changesNotSentForReview : undefined,
             releaseStatus: releaseStatus !== null && releaseStatus !== void 0 ? releaseStatus : undefined,
@@ -65,7 +75,6 @@ class AndroidSubmitter extends BaseSubmitter_1.default {
 }
 exports.default = AndroidSubmitter;
 const SummaryHumanReadableKeys = {
-    androidPackage: 'Android package',
     archivePath: 'Archive path',
     archiveUrl: 'Download URL',
     changesNotSentForReview: 'Changes not sent for a review',

package/build/submit/android/ServiceAccountSource.d.ts

@@ -17,6 +17,7 @@ interface ServiceAccountPromptSource extends ServiceAccountSourceBase {
 }
 export interface ServiceAccountCredentialsServiceSource extends ServiceAccountSourceBase {
     sourceType: ServiceAccountSourceType.credentialsService;
+    androidApplicationIdentifier?: string;
 }
 export declare type ServiceAccountKeyResult = {
     result: ServiceAccountKeyFile | ServiceAccountKeyFromExpoServers;
@@ -34,7 +35,7 @@ declare type ServiceAccountKeyFromExpoServers = {
     googleServiceAccountKeyId: string;
 };
 export declare type ServiceAccountSource = ServiceAccountPathSource | ServiceAccountPromptSource | ServiceAccountCredentialsServiceSource;
-export declare function getServiceAccountKeyResultAsync(ctx: SubmissionContext<Platform.ANDROID>, source: ServiceAccountSource, androidApplicationIdentifier: string): Promise<ServiceAccountKeyResult>;
+export declare function getServiceAccountKeyResultAsync(ctx: SubmissionContext<Platform.ANDROID>, source: ServiceAccountSource): Promise<ServiceAccountKeyResult>;
 export declare function getServiceAccountKeyPathAsync(source: ServiceAccountSource): Promise<string>;
-export declare function getServiceAccountFromCredentialsServiceAsync(ctx: SubmissionContext<Platform.ANDROID>, androidApplicationIdentifier: string): Promise<ServiceAccountKeyResult>;
+export declare function getServiceAccountFromCredentialsServiceAsync(ctx: SubmissionContext<Platform.ANDROID>, source: ServiceAccountCredentialsServiceSource): Promise<ServiceAccountKeyResult>;
 export {};