@expo/build-tools 18.2.0 → 18.4.0

package/dist/steps/functions/internalMaestroTest.js

@@ -177,14 +177,14 @@ function createInternalEasMaestroTestFunction(ctx) {
             const failedFlows = [];
             for (const [flowIndex, flowPath] of flowPathsToExecute.entries()) {
                 stepCtx.logger.info('');
-                // If output_format is empty or noop, we won't use this.
-                const outputPath = node_path_1.default.join(maestroReportsDir, [
-                    `${output_format ? output_format + '-' : ''}report-flow-${flowIndex + 1}`,
-                    MaestroOutputFormatToExtensionMap[output_format ?? 'noop'],
-                ]
-                    .filter(Boolean)
-                    .join('.'));
                 for (let attemptCount = 0; attemptCount < retries; attemptCount++) {
+                    // Generate unique report path per attempt (not overwritten on retry)
+                    const outputPath = node_path_1.default.join(maestroReportsDir, [
+                        `${output_format ? output_format + '-' : ''}report-flow-${flowIndex + 1}-attempt-${attemptCount}`,
+                        MaestroOutputFormatToExtensionMap[output_format ?? 'noop'],
+                    ]
+                        .filter(Boolean)
+                        .join('.'));
                     const localDeviceName = `eas-simulator-${flowIndex}-${attemptCount}`;
                     // If the test passes, but the recording fails, we don't want to make the test fail,
                     // so we return two separate results.
@@ -227,11 +227,7 @@ function createInternalEasMaestroTestFunction(ctx) {
                     if (logsResult?.ok) {
                         try {
                             const extension = node_path_1.default.extname(logsResult.value.outputPath);
-                            const destinationPath = node_path_1.default.join(deviceLogsDir, `flow-${flowIndex}${extension}`);
-                            await node_fs_1.default.promises.rm(destinationPath, {
-                                force: true,
-                                recursive: true,
-                            });
+                            const destinationPath = node_path_1.default.join(deviceLogsDir, `flow-${flowIndex}-attempt-${attemptCount}${extension}`);
                             await node_fs_1.default.promises.rename(logsResult.value.outputPath, destinationPath);
                         }
                         catch (err) {

package/dist/steps/functions/maestroResultParser.js

@@ -23,6 +23,68 @@ const xmlParser = new fast_xml_parser_1.XMLParser({
     // Ensure single-element arrays are always arrays
     isArray: name => ['testsuite', 'testcase', 'property'].includes(name),
 });
+// Internal helper — not exported. Parses a single JUnit XML file.
+async function parseJUnitFile(filePath) {
+    const results = [];
+    try {
+        const content = await promises_1.default.readFile(filePath, 'utf-8');
+        const parsed = xmlParser.parse(content);
+        const testsuites = parsed?.testsuites?.testsuite;
+        if (!Array.isArray(testsuites)) {
+            return results;
+        }
+        for (const suite of testsuites) {
+            const testcases = suite?.testcase;
+            if (!Array.isArray(testcases)) {
+                continue;
+            }
+            for (const tc of testcases) {
+                const name = tc['@_name'];
+                if (!name) {
+                    continue;
+                }
+                const timeStr = tc['@_time'];
+                const timeSeconds = timeStr ? parseFloat(timeStr) : 0;
+                const duration = Number.isFinite(timeSeconds) ? Math.round(timeSeconds * 1000) : 0;
+                const status = tc['@_status'] === 'SUCCESS' ? 'passed' : 'failed';
+                const failureText = tc.failure != null
+                    ? typeof tc.failure === 'string'
+                        ? tc.failure
+                        : (tc.failure?.['#text'] ?? null)
+                    : null;
+                const errorText = tc.error != null
+                    ? typeof tc.error === 'string'
+                        ? tc.error
+                        : (tc.error?.['#text'] ?? null)
+                    : null;
+                const errorMessage = failureText ?? errorText ?? null;
+                const rawProperties = tc.properties?.property ?? [];
+                const properties = {};
+                for (const prop of rawProperties) {
+                    const propName = prop['@_name'];
+                    const value = prop['@_value'];
+                    if (typeof propName !== 'string' || typeof value !== 'string') {
+                        continue;
+                    }
+                    properties[propName] = value;
+                }
+                const tagsValue = properties['tags'];
+                const tags = tagsValue
+                    ? tagsValue
+                        .split(',')
+                        .map(t => t.trim())
+                        .filter(Boolean)
+                    : [];
+                delete properties['tags'];
+                results.push({ name, status, duration, errorMessage, tags, properties });
+            }
+        }
+    }
+    catch {
+        // Skip malformed XML files
+    }
+    return results;
+}
 async function parseJUnitTestCases(junitDirectory) {
     let entries;
     try {
@@ -37,68 +99,7 @@ async function parseJUnitTestCases(junitDirectory) {
     }
     const results = [];
     for (const xmlFile of xmlFiles) {
-        try {
-            const content = await promises_1.default.readFile(path_1.default.join(junitDirectory, xmlFile), 'utf-8');
-            const parsed = xmlParser.parse(content);
-            const testsuites = parsed?.testsuites?.testsuite;
-            if (!Array.isArray(testsuites)) {
-                continue;
-            }
-            for (const suite of testsuites) {
-                const testcases = suite?.testcase;
-                if (!Array.isArray(testcases)) {
-                    continue;
-                }
-                for (const tc of testcases) {
-                    const name = tc['@_name'];
-                    if (!name) {
-                        continue;
-                    }
-                    const timeStr = tc['@_time'];
-                    const timeSeconds = timeStr ? parseFloat(timeStr) : 0;
-                    const duration = Number.isFinite(timeSeconds) ? Math.round(timeSeconds * 1000) : 0;
-                    // Use @_status as primary indicator (more robust than checking <failure> presence)
-                    const status = tc['@_status'] === 'SUCCESS' ? 'passed' : 'failed';
-                    // Extract error message from <failure> or <error> elements
-                    const failureText = tc.failure != null
-                        ? typeof tc.failure === 'string'
-                            ? tc.failure
-                            : (tc.failure?.['#text'] ?? null)
-                        : null;
-                    const errorText = tc.error != null
-                        ? typeof tc.error === 'string'
-                            ? tc.error
-                            : (tc.error?.['#text'] ?? null)
-                        : null;
-                    const errorMessage = failureText ?? errorText ?? null;
-                    // Extract properties
-                    const rawProperties = tc.properties?.property ?? [];
-                    const properties = {};
-                    for (const prop of rawProperties) {
-                        const propName = prop['@_name'];
-                        const value = prop['@_value'];
-                        if (typeof propName !== 'string' || typeof value !== 'string') {
-                            continue;
-                        }
-                        properties[propName] = value;
-                    }
-                    // Extract tags from "tags" property (Maestro 2.2.0+, comma-separated)
-                    const tagsValue = properties['tags'];
-                    const tags = tagsValue
-                        ? tagsValue
-                            .split(',')
-                            .map(t => t.trim())
-                            .filter(Boolean)
-                        : [];
-                    delete properties['tags'];
-                    results.push({ name, status, duration, errorMessage, tags, properties });
-                }
-            }
-        }
-        catch {
-            // Skip malformed XML files
-            continue;
-        }
+        results.push(...(await parseJUnitFile(path_1.default.join(junitDirectory, xmlFile))));
     }
     return results;
 }
@@ -130,9 +131,26 @@ async function parseFlowMetadata(filePath) {
     }
 }
 async function parseMaestroResults(junitDirectory, testsDirectory, projectRoot) {
-    // 1. Parse JUnit XML files (primary source)
-    const junitResults = await parseJUnitTestCases(junitDirectory);
-    if (junitResults.length === 0) {
+    // 1. Parse JUnit XML files, tracking which file each result came from
+    let junitEntries;
+    try {
+        junitEntries = await promises_1.default.readdir(junitDirectory);
+    }
+    catch {
+        return [];
+    }
+    const xmlFiles = junitEntries.filter(f => f.endsWith('.xml')).sort();
+    if (xmlFiles.length === 0) {
+        return [];
+    }
+    const junitResultsWithSource = [];
+    for (const xmlFile of xmlFiles) {
+        const fileResults = await parseJUnitFile(path_1.default.join(junitDirectory, xmlFile));
+        for (const result of fileResults) {
+            junitResultsWithSource.push({ result, sourceFile: xmlFile });
+        }
+    }
+    if (junitResultsWithSource.length === 0) {
         return [];
     }
     // 2. Parse ai-*.json from debug output for flow_file_path + retryCount
@@ -172,23 +190,59 @@ async function parseMaestroResults(junitDirectory, testsDirectory, projectRoot)
     }
     // 3. Merge: JUnit results + ai-*.json metadata
     const results = [];
-    for (const junit of junitResults) {
-        const flowFilePath = flowPathMap.get(junit.name);
+    // Parse attempt index from filename pattern: *-attempt-N.*
+    const ATTEMPT_PATTERN = /attempt-(\d+)/;
+    // Group results by flow name
+    const resultsByName = new Map();
+    for (const entry of junitResultsWithSource) {
+        const group = resultsByName.get(entry.result.name) ?? [];
+        group.push(entry);
+        resultsByName.set(entry.result.name, group);
+    }
+    for (const [flowName, flowEntries] of resultsByName) {
+        const flowFilePath = flowPathMap.get(flowName);
         const relativePath = flowFilePath
             ? await relativizePathAsync(flowFilePath, projectRoot)
-            : junit.name; // fallback: use flow name if ai-*.json not found
-        const occurrences = flowOccurrences.get(junit.name) ?? 0;
-        const retryCount = Math.max(0, occurrences - 1);
-        results.push({
-            name: junit.name,
-            path: relativePath,
-            status: junit.status,
-            errorMessage: junit.errorMessage,
-            duration: junit.duration,
-            retryCount,
-            tags: junit.tags,
-            properties: junit.properties,
-        });
+            : flowName;
+        if (flowEntries.length === 1) {
+            // Single result for this flow — use ai-*.json occurrence count for retryCount
+            // (backward compat with old-style single JUnit file that gets overwritten)
+            const { result } = flowEntries[0];
+            const occurrences = flowOccurrences.get(flowName) ?? 0;
+            const retryCount = Math.max(0, occurrences - 1);
+            results.push({
+                name: flowName,
+                path: relativePath,
+                status: result.status,
+                errorMessage: result.errorMessage,
+                duration: result.duration,
+                retryCount,
+                tags: result.tags,
+                properties: result.properties,
+            });
+        }
+        else {
+            // Multiple results — per-attempt JUnit files. Sort by attempt index from filename.
+            const sorted = flowEntries
+                .map(entry => {
+                const match = entry.sourceFile.match(ATTEMPT_PATTERN);
+                const attemptIndex = match ? parseInt(match[1], 10) : 0;
+                return { ...entry, attemptIndex };
+            })
+                .sort((a, b) => a.attemptIndex - b.attemptIndex);
+            for (const { result, attemptIndex } of sorted) {
+                results.push({
+                    name: flowName,
+                    path: relativePath,
+                    status: result.status,
+                    errorMessage: result.errorMessage,
+                    duration: result.duration,
+                    retryCount: attemptIndex,
+                    tags: result.tags,
+                    properties: result.properties,
+                });
+            }
+        }
     }
     return results;
 }

package/dist/steps/functions/readIpaInfo.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createReadIpaInfoBuildFunction = createReadIpaInfoBuildFunction;
 exports.readIpaInfoAsync = readIpaInfoAsync;
-const errors_1 = require("@expo/eas-build-job/dist/errors");
+const eas_build_job_1 = require("@expo/eas-build-job");
 const steps_1 = require("@expo/steps");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const node_path_1 = __importDefault(require("node:path"));
@@ -45,7 +45,7 @@ function createReadIpaInfoBuildFunction() {
             const ipaPathInput = zod_1.z.string().parse(inputs.ipa_path.value);
             const ipaPath = node_path_1.default.resolve(stepCtx.workingDirectory, ipaPathInput);
             if (!(await fs_extra_1.default.pathExists(ipaPath))) {
-                throw new errors_1.UserFacingError('EAS_READ_IPA_INFO_FILE_NOT_FOUND', `IPA file not found: ${ipaPath}`);
+                throw new eas_build_job_1.UserError('EAS_READ_IPA_INFO_FILE_NOT_FOUND', `IPA file not found: ${ipaPath}`);
             }
             const ipaInfo = await readIpaInfoAsync(ipaPath);
             outputs.bundle_identifier.set(ipaInfo.bundleIdentifier);
@@ -60,15 +60,15 @@ async function readIpaInfoAsync(ipaPath) {
         const infoPlist = parseInfoPlistBuffer(infoPlistBuffer);
         const bundleIdentifier = infoPlist.CFBundleIdentifier;
         if (typeof bundleIdentifier !== 'string') {
-            throw new errors_1.UserFacingError('EAS_READ_IPA_INFO_INVALID_INFO_PLIST', 'Failed to read IPA info: Missing or invalid CFBundleIdentifier in Info.plist');
+            throw new eas_build_job_1.UserError('EAS_READ_IPA_INFO_INVALID_INFO_PLIST', 'Failed to read IPA info: Missing or invalid CFBundleIdentifier in Info.plist');
         }
         const bundleShortVersion = infoPlist.CFBundleShortVersionString;
         if (typeof bundleShortVersion !== 'string') {
-            throw new errors_1.UserFacingError('EAS_READ_IPA_INFO_INVALID_INFO_PLIST', 'Failed to read IPA info: Missing or invalid CFBundleShortVersionString in Info.plist');
+            throw new eas_build_job_1.UserError('EAS_READ_IPA_INFO_INVALID_INFO_PLIST', 'Failed to read IPA info: Missing or invalid CFBundleShortVersionString in Info.plist');
         }
         const bundleVersion = infoPlist.CFBundleVersion;
         if (typeof bundleVersion !== 'string') {
-            throw new errors_1.UserFacingError('EAS_READ_IPA_INFO_INVALID_INFO_PLIST', 'Failed to read IPA info: Missing or invalid CFBundleVersion in Info.plist');
+            throw new eas_build_job_1.UserError('EAS_READ_IPA_INFO_INVALID_INFO_PLIST', 'Failed to read IPA info: Missing or invalid CFBundleVersion in Info.plist');
         }
         return {
             bundleIdentifier,
@@ -77,10 +77,10 @@ async function readIpaInfoAsync(ipaPath) {
         };
     }
     catch (error) {
-        if (error instanceof errors_1.UserFacingError) {
+        if (error instanceof eas_build_job_1.UserError) {
             throw error;
         }
-        throw new errors_1.UserFacingError('EAS_READ_IPA_INFO_FAILED', `Failed to read IPA info: ${error.message}`, { cause: error });
+        throw new eas_build_job_1.UserError('EAS_READ_IPA_INFO_FAILED', `Failed to read IPA info: ${error.message}`, { cause: error });
     }
 }
 function parseInfoPlistBuffer(data) {
@@ -89,7 +89,7 @@ function parseInfoPlistBuffer(data) {
         const parsedBinaryPlists = bplist_parser_1.default.parseBuffer(data);
         const parsedBinaryPlist = parsedBinaryPlists[0];
         if (!parsedBinaryPlist || typeof parsedBinaryPlist !== 'object') {
-            throw new errors_1.UserFacingError('EAS_READ_IPA_INFO_INVALID_BINARY_PLIST', 'Invalid binary plist in IPA');
+            throw new eas_build_job_1.UserError('EAS_READ_IPA_INFO_INVALID_BINARY_PLIST', 'Invalid binary plist in IPA');
         }
         return parsedBinaryPlist;
     }
@@ -101,7 +101,7 @@ async function readInfoPlistBufferFromIpaAsync(ipaPath) {
         const entries = Object.values(await zip.entries());
         const infoPlistEntry = entries.find(entry => INFO_PLIST_PATH_REGEXP.test(entry.name));
         if (!infoPlistEntry) {
-            throw new errors_1.UserFacingError('EAS_READ_IPA_INFO_INFO_PLIST_NOT_FOUND', `Failed to read IPA info: Could not find Info.plist in ${ipaPath}`);
+            throw new eas_build_job_1.UserError('EAS_READ_IPA_INFO_INFO_PLIST_NOT_FOUND', `Failed to read IPA info: Could not find Info.plist in ${ipaPath}`);
         }
         return await zip.entryData(infoPlistEntry.name);
     }

package/dist/steps/functions/reportMaestroTestResults.js

@@ -56,13 +56,20 @@ function createReportMaestroTestResultsFunction(ctx) {
                     logger.info('No maestro test results found, skipping report');
                     return;
                 }
-                // Maestro allows overriding flow names via config, so different flow files can share
-                // the same name. JUnit XML only contains names (not file paths), making it impossible
-                // to map duplicates back to their original flow files. Skip and let the user fix it.
-                const names = flowResults.map(r => r.name);
-                const duplicates = names.filter((n, i) => names.indexOf(n) !== i);
-                if (duplicates.length > 0) {
-                    logger.error(`Duplicate test case names found in JUnit output: ${[...new Set(duplicates)].join(', ')}. Skipping report. Ensure each Maestro flow has a unique name.`);
+                // Detect truly conflicting results: same (name, retryCount) pair means different flow files
+                // share the same name (Maestro config override), which we can't disambiguate.
+                // Same name with different retryCount is expected (per-attempt results from retries).
+                const seen = new Set();
+                const conflicting = new Set();
+                for (const r of flowResults) {
+                    const key = `${r.name}:${r.retryCount}`;
+                    if (seen.has(key)) {
+                        conflicting.add(r.name);
+                    }
+                    seen.add(key);
+                }
+                if (conflicting.size > 0) {
+                    logger.error(`Duplicate test case names found in JUnit output: ${[...conflicting].join(', ')}. Skipping report. Ensure each Maestro flow has a unique name.`);
                     return;
                 }
                 const testCaseResults = flowResults.flatMap(f => {

package/dist/steps/functions/uploadToAsc.js

@@ -41,7 +41,7 @@ exports.isClosedVersionTrainError = isClosedVersionTrainError;
 exports.isInvalidBundleIdentifierError = isInvalidBundleIdentifierError;
 exports.isMissingPurposeStringError = isMissingPurposeStringError;
 exports.parseMissingUsageDescriptionKeys = parseMissingUsageDescriptionKeys;
-const errors_1 = require("@expo/eas-build-job/dist/errors");
+const eas_build_job_1 = require("@expo/eas-build-job");
 const results_1 = require("@expo/results");
 const steps_1 = require("@expo/steps");
 const fs_extra_1 = __importDefault(require("fs-extra"));
@@ -252,7 +252,7 @@ function createUploadToAscBuildFunction() {
                         const ipaBundleIdentifier = ipaInfoResult.ok
                             ? ipaInfoResult.value.bundleIdentifier
                             : null;
-                        throw new errors_1.UserFacingError('EAS_UPLOAD_TO_ASC_INVALID_BUNDLE_ID', `Build upload was rejected by App Store Connect because the app bundle identifier in the IPA does not match the selected App Store Connect app.\n\n` +
+                        throw new eas_build_job_1.UserError('EAS_UPLOAD_TO_ASC_INVALID_BUNDLE_ID', `Build upload was rejected by App Store Connect because the app bundle identifier in the IPA does not match the selected App Store Connect app.\n\n` +
                             `IPA bundle identifier: ${ipaBundleIdentifier ?? '(unavailable)'}\n` +
                             `App Store Connect app bundle identifier: ${ascAppBundleIdentifier}\n\n` +
                             'Bundle identifier cannot be changed for an existing App Store Connect app. ' +
@@ -261,7 +261,7 @@ function createUploadToAscBuildFunction() {
                     }
                     if (isMissingPurposeStringError(errors)) {
                         const missingUsageDescriptionKeys = parseMissingUsageDescriptionKeys(errors);
-                        throw new errors_1.UserFacingError('EAS_UPLOAD_TO_ASC_MISSING_PURPOSE_STRING', `Build upload was rejected by App Store Connect because Info.plist is missing one or more privacy purpose strings.\n\n` +
+                        throw new eas_build_job_1.UserError('EAS_UPLOAD_TO_ASC_MISSING_PURPOSE_STRING', `Build upload was rejected by App Store Connect because Info.plist is missing one or more privacy purpose strings.\n\n` +
                             `${missingUsageDescriptionKeys.length > 0
                                 ? `Missing keys reported by App Store Connect:\n- ${missingUsageDescriptionKeys.join('\n- ')}\n\n`
                                 : ''}` +
@@ -272,7 +272,7 @@ function createUploadToAscBuildFunction() {
                         });
                     }
                     if (isClosedVersionTrainError(errors)) {
-                        throw new errors_1.UserFacingError('EAS_UPLOAD_TO_ASC_CLOSED_VERSION_TRAIN', `Build upload was rejected by App Store Connect because the ${bundleShortVersion} app version is not accepted for new build submissions. ` +
+                        throw new eas_build_job_1.UserError('EAS_UPLOAD_TO_ASC_CLOSED_VERSION_TRAIN', `Build upload was rejected by App Store Connect because the ${bundleShortVersion} app version is not accepted for new build submissions. ` +
                             'This usually means the version train is closed or lower than a previously approved version. ' +
                             'Bump the iOS app version (CFBundleShortVersionString, e.g. expo.version) to a higher version, then rebuild and submit again.');
                     }

package/dist/steps/utils/android/gradle.js

@@ -25,7 +25,7 @@ async function runGradleCommand({ logger, gradleCommand, androidDir, env, extraE
                 return line;
             }
         },
-        env: { ...env, ...extraEnv },
+        env: { ...env, ...extraEnv, LC_ALL: 'C.UTF-8' },
     });
     if (env.EAS_BUILD_RUNNER === 'eas-build' && process.platform === 'linux') {
         adjustOOMScore(spawnPromise, logger);

package/dist/steps/utils/android/gradleConfig.d.ts

@@ -1,6 +1,9 @@
+import { Android } from '@expo/eas-build-job';
 import { bunyan } from '@expo/logger';
+import { BuildContext } from '../../../context';
 export declare function injectCredentialsGradleConfig(logger: bunyan, workingDir: string): Promise<void>;
 export declare function injectConfigureVersionGradleConfig(logger: bunyan, workingDir: string, { versionCode, versionName }: {
     versionCode?: string;
     versionName?: string;
 }): Promise<void>;
+export declare function warnIfLegacyEasBuildGradleExists(ctx: BuildContext<Android.Job>): Promise<void>;

package/dist/steps/utils/android/gradleConfig.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.injectCredentialsGradleConfig = injectCredentialsGradleConfig;
 exports.injectConfigureVersionGradleConfig = injectConfigureVersionGradleConfig;
+exports.warnIfLegacyEasBuildGradleExists = warnIfLegacyEasBuildGradleExists;
 const config_plugins_1 = require("@expo/config-plugins");
 const template_file_1 = require("@expo/template-file");
 const fs_extra_1 = __importDefault(require("fs-extra"));
@@ -41,6 +42,19 @@ async function deleteEasBuildConfigureVersionGradle(workingDir) {
     const targetPath = getEasBuildConfigureVersionGradlePath(workingDir);
     await fs_extra_1.default.remove(targetPath);
 }
+let legacyEasBuildGradleWarningEmitted = false;
+async function warnIfLegacyEasBuildGradleExists(ctx) {
+    const legacyGradlePath = getLegacyEasBuildGradlePath(ctx.getReactNativeProjectDirectory());
+    if ((await fs_extra_1.default.pathExists(legacyGradlePath)) &&
+        (process.env.NODE_ENV === 'test' || !legacyEasBuildGradleWarningEmitted)) {
+        legacyEasBuildGradleWarningEmitted = true;
+        ctx.logger.warn('eas-build.gradle script is deprecated, please remove it from your project.');
+        ctx.markBuildPhaseHasWarnings();
+    }
+}
+function getLegacyEasBuildGradlePath(projectRoot) {
+    return path_1.default.join(projectRoot, 'android/app/eas-build.gradle');
+}
 function getEasBuildInjectCredentialsGradlePath(workingDir) {
     return path_1.default.join(workingDir, 'android/app/eas-build-inject-android-credentials.gradle');
 }
@@ -83,6 +97,6 @@ function hasLine(haystack, needle) {
     return (haystack
         .replace(/\r\n/g, '\n')
         .split('\n')
-        // Check for both single and double quotes
+        // Check for both single and double quotes.
         .some(line => line === needle || line === needle.replace(/"/g, "'")));
 }

package/dist/steps/utils/ios/AscApiUtils.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AscApiUtils = void 0;
-const errors_1 = require("@expo/eas-build-job/dist/errors");
+const eas_build_job_1 = require("@expo/eas-build-job");
 const AscApiClient_1 = require("./AscApiClient");
 var AscApiUtils;
 (function (AscApiUtils) {
@@ -25,7 +25,7 @@ var AscApiUtils;
                 // Don't hide the original NOT_FOUND error with a secondary lookup failure.
                 throw error;
             }
-            throw new errors_1.UserFacingError('EAS_UPLOAD_TO_ASC_APP_NOT_FOUND', `App Store Connect app for application identifier ${appleAppIdentifier} was not found. ` +
+            throw new eas_build_job_1.UserError('EAS_UPLOAD_TO_ASC_APP_NOT_FOUND', `App Store Connect app for application identifier ${appleAppIdentifier} was not found. ` +
                 'Verify the configured application identifier and that the App Store Connect API key has access to the application in the correct App Store Connect account.' +
                 (visibleAppsSummary
                     ? `\n\nExample applications visible to this API key:\n${visibleAppsSummary}`
@@ -64,7 +64,7 @@ var AscApiUtils;
             const isDuplicateVersionError = errors.length > 0 &&
                 errors.every(item => item.code === 'ENTITY_ERROR.ATTRIBUTE.INVALID.DUPLICATE');
             if (isDuplicateVersionError) {
-                throw new errors_1.UserFacingError('EAS_UPLOAD_TO_ASC_VERSION_DUPLICATE', `Increment Build Number: Build number ${bundleVersion} for app version ${bundleShortVersion} has already been used. ` +
+                throw new eas_build_job_1.UserError('EAS_UPLOAD_TO_ASC_VERSION_DUPLICATE', `Increment Build Number: Build number ${bundleVersion} for app version ${bundleShortVersion} has already been used. ` +
                     'App Store Connect requires unique build numbers within each app version (version train). ' +
                     'Increment it by setting ios.buildNumber in app.json, or set "autoIncrement": true in eas.json (recommended). Then rebuild and resubmit.', {
                     docsUrl: 'https://docs.expo.dev/build-reference/app-versions/',

package/dist/steps/utils/ios/credentials/provisioningProfile.d.ts

@@ -23,11 +23,12 @@ export default class ProvisioningProfile {
     get data(): ProvisioningProfileData;
     private readonly profilePath;
     private profileData?;
+    private developerCertificates;
     constructor(profile: Buffer, keychainPath: string, target: string, certificateCommonName: string);
     init(logger: bunyan): Promise<void>;
     destroy(logger: bunyan): Promise<void>;
     verifyCertificate(fingerprint: string): void;
     private load;
     private resolveDistributionType;
-    private genDerCertFingerprint;
+    private getAllDerCertFingerprints;
 }

package/dist/steps/utils/ios/credentials/provisioningProfile.js

@@ -34,6 +34,7 @@ class ProvisioningProfile {
     }
     profilePath;
     profileData;
+    developerCertificates = [];
     constructor(profile, keychainPath, target, certificateCommonName) {
         this.profile = profile;
         this.keychainPath = keychainPath;
@@ -58,10 +59,11 @@ class ProvisioningProfile {
         await fs_extra_1.default.remove(this.profilePath);
     }
     verifyCertificate(fingerprint) {
-        const devCertFingerprint = this.genDerCertFingerprint();
-        if (devCertFingerprint !== fingerprint) {
-            throw new eas_build_job_1.errors.CredentialsDistCertMismatchError(`Provisioning profile and distribution certificate don't match.
-Profile's certificate fingerprint = ${devCertFingerprint}, distribution certificate fingerprint = ${fingerprint}`);
+        const devCertFingerprints = this.getAllDerCertFingerprints();
+        if (!devCertFingerprints.includes(fingerprint)) {
+            throw new eas_build_job_1.errors.CredentialsDistCertMismatchError(`Provisioning profile and distribution certificate don't match.\n` +
+                `Profile's certificate fingerprints = [${devCertFingerprints.join(', ')}], ` +
+                `distribution certificate fingerprint = ${fingerprint}`);
         }
     }
     async load() {
@@ -85,6 +87,7 @@ Profile's certificate fingerprint = ${devCertFingerprint}, distribution certific
         }
         const applicationIdentifier = plistData.Entitlements['application-identifier'];
         const bundleIdentifier = applicationIdentifier.replace(/^.+?\./, '');
+        this.developerCertificates = plistData.DeveloperCertificates.map((cert) => Buffer.from(cert, 'base64'));
         this.profileData = {
             path: this.profilePath,
             target: this.target,
@@ -92,7 +95,7 @@ Profile's certificate fingerprint = ${devCertFingerprint}, distribution certific
             teamId: plistData.TeamIdentifier[0],
             uuid: plistData.UUID,
             name: plistData.Name,
-            developerCertificate: Buffer.from(plistData.DeveloperCertificates[0], 'base64'),
+            developerCertificate: this.developerCertificates[0],
             certificateCommonName: this.certificateCommonName,
             distributionType: this.resolveDistributionType(plistData),
         };
@@ -108,12 +111,8 @@ Profile's certificate fingerprint = ${devCertFingerprint}, distribution certific
             return DistributionType.APP_STORE;
         }
     }
-    genDerCertFingerprint() {
-        return crypto_1.default
-            .createHash('sha1')
-            .update(new Uint8Array(this.data.developerCertificate))
-            .digest('hex')
-            .toUpperCase();
+    getAllDerCertFingerprints() {
+        return this.developerCertificates.map(cert => crypto_1.default.createHash('sha1').update(new Uint8Array(cert)).digest('hex').toUpperCase());
     }
 }
 exports.default = ProvisioningProfile;

package/dist/utils/stepMetrics.d.ts

@@ -1,9 +1,9 @@
 import { bunyan } from '@expo/logger';
-import { StepMetricsCollection } from '@expo/steps';
+import { StepMetric } from '@expo/steps';
 export declare function uploadStepMetricsToWwwAsync({ workflowJobId, robotAccessToken, expoApiV2BaseUrl, stepMetrics, logger, }: {
     workflowJobId: string;
     robotAccessToken: string;
     expoApiV2BaseUrl: string;
-    stepMetrics: StepMetricsCollection;
+    stepMetrics: StepMetric[];
     logger: bunyan;
 }): Promise<void>;

package/dist/utils/stepMetrics.js

@@ -3,22 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.uploadStepMetricsToWwwAsync = uploadStepMetricsToWwwAsync;
 const turtleFetch_1 = require("./turtleFetch");
 async function uploadStepMetricsToWwwAsync({ workflowJobId, robotAccessToken, expoApiV2BaseUrl, stepMetrics, logger, }) {
-    if (stepMetrics.length === 0) {
-        logger.debug('No step metrics to upload');
-        return;
-    }
     try {
         await (0, turtleFetch_1.turtleFetch)(new URL(`workflows/${workflowJobId}/metrics`, expoApiV2BaseUrl).toString(), 'POST', {
             json: { stepMetrics },
-            headers: {
-                Authorization: `Bearer ${robotAccessToken}`,
-            },
-            timeout: 20000,
+            headers: { Authorization: `Bearer ${robotAccessToken}` },
+            timeout: 5000,
+            retries: 2,
             logger,
         });
-        logger.info(`Uploaded ${stepMetrics.length} step metrics`);
     }
     catch {
-        // Don't display unactionable error to the user, let's send it to Sentry in the future
+        // Don't fail the build for metrics — silently give up
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/build-tools",
-  "version": "18.2.0",
+  "version": "18.4.0",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "license": "BUSL-1.1",
   "author": "Expo <support@expo.io>",
@@ -38,14 +38,14 @@
     "@expo/config": "10.0.6",
     "@expo/config-plugins": "9.0.12",
     "@expo/downloader": "18.0.1",
-    "@expo/eas-build-job": "18.2.0",
+    "@expo/eas-build-job": "18.4.0",
     "@expo/env": "^0.4.0",
     "@expo/logger": "18.0.1",
     "@expo/package-manager": "1.9.10",
     "@expo/plist": "^0.2.0",
     "@expo/results": "^1.0.0",
     "@expo/spawn-async": "1.7.2",
-    "@expo/steps": "18.2.0",
+    "@expo/steps": "18.4.0",
     "@expo/template-file": "18.0.1",
     "@expo/turtle-spawn": "18.0.1",
     "@expo/xcpretty": "^4.3.1",
@@ -97,5 +97,5 @@
     "typescript": "^5.5.4",
     "uuid": "^9.0.1"
   },
-  "gitHead": "5f400d77660990422c6976a65dfb41f99374c5cc"
+  "gitHead": "4e202db843be2dca6450af4b45ee76b226a662ea"
 }

package/dist/android/gradleConfig.d.ts

@@ -1,3 +0,0 @@
-import { Android } from '@expo/eas-build-job';
-import { BuildContext } from '../context';
-export declare function configureBuildGradle(ctx: BuildContext<Android.Job>): Promise<void>;