eas-cli 0.36.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/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

@@ -3,11 +3,9 @@ import { AndroidSubmissionConfigInput, SubmissionFragment } from '../../graphql/
 import { Archive, ArchiveSource } from '../ArchiveSource';
 import BaseSubmitter, { SubmissionInput } from '../BaseSubmitter';
 import { SubmissionContext } from '../context';
-import { AndroidPackageSource } from './AndroidPackageSource';
 import { ServiceAccountKeyResult, ServiceAccountSource } from './ServiceAccountSource';
 export interface AndroidSubmissionOptions extends Pick<AndroidSubmissionConfigInput, 'track' | 'releaseStatus' | 'changesNotSentForReview'> {
     projectId: string;
-    androidPackageSource: AndroidPackageSource;
     archiveSource: ArchiveSource;
     serviceAccountSource: ServiceAccountSource;
 }

package/build/submit/android/AndroidSubmitter.js

@@ -8,7 +8,6 @@ const formatFields_1 = (0, tslib_1.__importDefault)(require("../../utils/formatF
 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 {
     constructor(ctx, options) {
@@ -17,8 +16,7 @@ class AndroidSubmitter extends BaseSubmitter_1.default {
             archive: async () => await (0, ArchiveSource_1.getArchiveAsync)(this.options.archiveSource),
             // eslint-disable-next-line async-protect/async-suffix
             serviceAccountKeyResult: async () => {
-                const androidPackage = await (0, AndroidPackageSource_1.getAndroidPackageAsync)(this.options.androidPackageSource);
-                return await (0, ServiceAccountSource_1.getServiceAccountKeyResultAsync)(this.ctx, this.options.serviceAccountSource, androidPackage);
+                return await (0, ServiceAccountSource_1.getServiceAccountKeyResultAsync)(this.ctx, this.options.serviceAccountSource);
             },
         };
         const sourceOptionsAnalytics = {

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 {};

package/build/submit/android/ServiceAccountSource.js

@@ -8,6 +8,7 @@ const nullthrows_1 = (0, tslib_1.__importDefault)(require("nullthrows"));
 const SetUpGoogleServiceAccountKey_1 = require("../../credentials/android/actions/SetUpGoogleServiceAccountKey");
 const googleServiceAccountKey_1 = require("../../credentials/android/utils/googleServiceAccountKey");
 const log_1 = (0, tslib_1.__importStar)(require("../../log"));
+const applicationId_1 = require("../../project/android/applicationId");
 const prompts_1 = require("../../prompts");
 const Account_1 = require("../../user/Account");
 const files_1 = require("../utils/files");
@@ -17,9 +18,9 @@ var ServiceAccountSourceType;
     ServiceAccountSourceType[ServiceAccountSourceType["prompt"] = 1] = "prompt";
     ServiceAccountSourceType[ServiceAccountSourceType["credentialsService"] = 2] = "credentialsService";
 })(ServiceAccountSourceType = exports.ServiceAccountSourceType || (exports.ServiceAccountSourceType = {}));
-async function getServiceAccountKeyResultAsync(ctx, source, androidApplicationIdentifier) {
+async function getServiceAccountKeyResultAsync(ctx, source) {
     if (source.sourceType === ServiceAccountSourceType.credentialsService) {
-        return await getServiceAccountFromCredentialsServiceAsync(ctx, androidApplicationIdentifier);
+        return await getServiceAccountFromCredentialsServiceAsync(ctx, source);
     }
     else {
         return await getServiceAccountLocallyAsync(source);
@@ -50,12 +51,23 @@ async function getServiceAccountKeyPathAsync(source) {
     }
 }
 exports.getServiceAccountKeyPathAsync = getServiceAccountKeyPathAsync;
-async function getServiceAccountFromCredentialsServiceAsync(ctx, androidApplicationIdentifier) {
+async function promptForApplicationIdAsync() {
+    const { androidPackage } = await (0, prompts_1.promptAsync)({
+        name: 'androidPackage',
+        message: 'Android package name:',
+        type: 'text',
+        validate: value => ((0, applicationId_1.isApplicationIdValid)(value) ? true : applicationId_1.INVALID_APPLICATION_ID_MESSAGE),
+    });
+    return androidPackage;
+}
+async function getServiceAccountFromCredentialsServiceAsync(ctx, source) {
+    var _a;
     const appLookupParams = {
         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,
-        androidApplicationIdentifier,
+        androidApplicationIdentifier: (_a = source.androidApplicationIdentifier) !== null && _a !== void 0 ? _a : (await promptForApplicationIdAsync()),
     };
+    log_1.default.log(`Looking up credentials configuration for ${appLookupParams.androidApplicationIdentifier}...`);
     const setupGoogleServiceAccountKeyAction = new SetUpGoogleServiceAccountKey_1.SetUpGoogleServiceAccountKey(appLookupParams);
     const androidAppCredentials = await setupGoogleServiceAccountKeyAction.runAsync(ctx.credentialsCtx);
     const googleServiceAccountKey = (0, nullthrows_1.default)(androidAppCredentials.googleServiceAccountKeyForSubmissions, 'Credentials Service must provide a valid GoogleServiceAccountKey');

package/build/submit/ios/CredentialsServiceSource.d.ts

@@ -6,9 +6,12 @@ import { AscApiKeyResult } from './AscApiKeySource';
  * The Credentials Service will either return an ASC API Key or an App Specific Password
  * When we no longer support the App Specific Password user prompt, refactor this into the AscApiKeySource
  */
-export declare const CREDENTIALS_SERVICE_SOURCE = "CREDENTIALS_SERVICE_SOURCE";
-export declare type CredentialsServiceSource = typeof CREDENTIALS_SERVICE_SOURCE;
-export declare function getFromCredentialsServiceAsync(ctx: SubmissionContext<Platform.IOS>): Promise<{
+export declare const CREDENTIALS_SERVICE_SOURCE: "CREDENTIALS_SERVICE_SOURCE";
+export interface CredentialsServiceSource {
+    sourceType: typeof CREDENTIALS_SERVICE_SOURCE;
+    bundleIdentifier?: string;
+}
+export declare function getFromCredentialsServiceAsync(ctx: SubmissionContext<Platform.IOS>, source: CredentialsServiceSource): Promise<{
     appSpecificPassword: AppSpecificPasswordCredentials;
 } | {
     ascApiKeyResult: AscApiKeyResult;

package/build/submit/ios/CredentialsServiceSource.js

@@ -6,6 +6,7 @@ const nullthrows_1 = (0, tslib_1.__importDefault)(require("nullthrows"));
 const SetUpSubmissionCredentials_1 = require("../../credentials/ios/actions/SetUpSubmissionCredentials");
 const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
 const bundleIdentifier_1 = require("../../project/ios/bundleIdentifier");
+const prompts_1 = require("../../prompts");
 const Account_1 = require("../../user/Account");
 const AppSpecificPasswordSource_1 = require("./AppSpecificPasswordSource");
 /**
@@ -13,8 +14,18 @@ const AppSpecificPasswordSource_1 = require("./AppSpecificPasswordSource");
  * When we no longer support the App Specific Password user prompt, refactor this into the AscApiKeySource
  */
 exports.CREDENTIALS_SERVICE_SOURCE = 'CREDENTIALS_SERVICE_SOURCE';
-async function getFromCredentialsServiceAsync(ctx) {
-    const bundleIdentifier = await (0, bundleIdentifier_1.getBundleIdentifierAsync)(ctx.projectDir, ctx.exp);
+async function promptForBundleIdentifierAsync() {
+    const { bundleIdentifier } = await (0, prompts_1.promptAsync)({
+        name: 'bundleIdentifier',
+        message: 'Bundle identifier:',
+        type: 'text',
+        validate: value => ((0, bundleIdentifier_1.isBundleIdentifierValid)(value) ? true : bundleIdentifier_1.INVALID_BUNDLE_IDENTIFIER_MESSAGE),
+    });
+    return bundleIdentifier;
+}
+async function getFromCredentialsServiceAsync(ctx, source) {
+    var _a;
+    const bundleIdentifier = (_a = source.bundleIdentifier) !== null && _a !== void 0 ? _a : (await promptForBundleIdentifierAsync());
     log_1.default.log(`Looking up credentials configuration for ${bundleIdentifier}...`);
     const appLookupParams = {
         account: (0, nullthrows_1.default)((0, Account_1.findAccountByName)(ctx.user.accounts, ctx.accountName), `You do not have access to account: ${ctx.accountName}`),

package/build/submit/ios/IosSubmitCommand.d.ts

@@ -5,8 +5,9 @@ export default class IosSubmitCommand {
     private ctx;
     constructor(ctx: SubmissionContext<Platform.IOS>);
     runAsync(): Promise<SubmissionFragment>;
-    private resolveCredentialSubmissionOptions;
     private resolveSubmissionOptionsAsync;
+    private maybeGetIosBundleIdentifierAsync;
+    private resolveCredentialSubmissionOptionsAsync;
     private resolveAppSpecificPasswordSource;
     private resolveAscApiKeySource;
     private resolveArchiveSource;

package/build/submit/ios/IosSubmitCommand.js

@@ -8,6 +8,7 @@ const getenv_1 = (0, tslib_1.__importDefault)(require("getenv"));
 const wrap_ansi_1 = (0, tslib_1.__importDefault)(require("wrap-ansi"));
 const errors_1 = require("../../credentials/errors");
 const log_1 = (0, tslib_1.__importStar)(require("../../log"));
+const bundleIdentifier_1 = require("../../project/ios/bundleIdentifier");
 const commons_1 = require("../commons");
 const AppProduce_1 = require("./AppProduce");
 const AppSpecificPasswordSource_1 = require("./AppSpecificPasswordSource");
@@ -24,25 +25,9 @@ class IosSubmitCommand {
         const submitter = new IosSubmitter_1.default(this.ctx, options);
         return await submitter.submitAsync();
     }
-    resolveCredentialSubmissionOptions() {
-        const ascApiKeySource = this.resolveAscApiKeySource();
-        const shouldSkipAscApiKeySource = !ascApiKeySource.ok && ascApiKeySource.enforceError() instanceof errors_1.MissingCredentialsError;
-        if (!shouldSkipAscApiKeySource) {
-            return { ascApiKeySource };
-        }
-        const appSpecificPasswordSource = this.resolveAppSpecificPasswordSource();
-        const shouldSkipAppSpecificPasswordSource = !appSpecificPasswordSource.ok &&
-            appSpecificPasswordSource.enforceError() instanceof errors_1.MissingCredentialsError;
-        if (!shouldSkipAppSpecificPasswordSource) {
-            return { appSpecificPasswordSource: this.resolveAppSpecificPasswordSource() };
-        }
-        return {
-            credentialsServiceSource: (0, results_1.result)(CredentialsServiceSource_1.CREDENTIALS_SERVICE_SOURCE),
-        };
-    }
     async resolveSubmissionOptionsAsync() {
         const archiveSource = this.resolveArchiveSource();
-        const credentialsSource = this.resolveCredentialSubmissionOptions();
+        const credentialsSource = await this.resolveCredentialSubmissionOptionsAsync();
         const maybeAppSpecificPasswordSource = 'appSpecificPasswordSource' in credentialsSource
             ? credentialsSource.appSpecificPasswordSource
             : null;
@@ -84,6 +69,50 @@ class IosSubmitCommand {
                 : null),
         };
     }
+    async maybeGetIosBundleIdentifierAsync() {
+        try {
+            return (0, results_1.result)(await (0, bundleIdentifier_1.getBundleIdentifierAsync)(this.ctx.projectDir, this.ctx.exp));
+        }
+        catch (error) {
+            if (error instanceof bundleIdentifier_1.AmbiguousBundleIdentifierError) {
+                log_1.default.warn('bundleIdentifier in the Xcode project is ambiguous, specify it via "bundleIdentifier" 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 bundleIdentifier in the Xcode project: ${error.message}.`));
+        }
+    }
+    async resolveCredentialSubmissionOptionsAsync() {
+        const ascApiKeySource = this.resolveAscApiKeySource();
+        const shouldSkipAscApiKeySource = !ascApiKeySource.ok && ascApiKeySource.enforceError() instanceof errors_1.MissingCredentialsError;
+        if (!shouldSkipAscApiKeySource) {
+            return { ascApiKeySource };
+        }
+        const appSpecificPasswordSource = this.resolveAppSpecificPasswordSource();
+        const shouldSkipAppSpecificPasswordSource = !appSpecificPasswordSource.ok &&
+            appSpecificPasswordSource.enforceError() instanceof errors_1.MissingCredentialsError;
+        if (!shouldSkipAppSpecificPasswordSource) {
+            return { appSpecificPasswordSource: this.resolveAppSpecificPasswordSource() };
+        }
+        let bundleIdentifier = this.ctx.profile.bundleIdentifier;
+        if (!bundleIdentifier) {
+            const bundleIdentifierResult = await this.maybeGetIosBundleIdentifierAsync();
+            if (!bundleIdentifierResult.ok) {
+                return {
+                    credentialsServiceSource: (0, results_1.result)(bundleIdentifierResult.reason),
+                };
+            }
+            const bundleIdentifierValue = bundleIdentifierResult.enforceValue();
+            if (bundleIdentifierValue) {
+                bundleIdentifier = bundleIdentifierValue;
+            }
+        }
+        return {
+            credentialsServiceSource: (0, results_1.result)({
+                sourceType: CredentialsServiceSource_1.CREDENTIALS_SERVICE_SOURCE,
+                bundleIdentifier,
+            }),
+        };
+    }
     resolveAppSpecificPasswordSource() {
         const envAppSpecificPassword = getenv_1.default.string('EXPO_APPLE_APP_SPECIFIC_PASSWORD', '');
         if (envAppSpecificPassword) {

package/build/submit/ios/IosSubmitter.js

@@ -25,7 +25,7 @@ class IosSubmitter extends BaseSubmitter_1.default {
                     ? await (0, AscApiKeySource_1.getAscApiKeyLocallyAsync)(this.ctx, this.options.ascApiKeySource)
                     : null;
                 const maybeAscOrAspFromCredentialsService = this.options.credentialsServiceSource
-                    ? await (0, CredentialsServiceSource_1.getFromCredentialsServiceAsync)(this.ctx)
+                    ? await (0, CredentialsServiceSource_1.getFromCredentialsServiceAsync)(this.ctx, this.options.credentialsServiceSource)
                     : null;
                 return {
                     ...(maybeAppSpecificPassword ? { appSpecificPassword: maybeAppSpecificPassword } : null),