@expo/build-tools 18.2.0 → 18.4.0

package/dist/android/gradle.js

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

package/dist/buildErrors/detectError.d.ts

@@ -1,3 +1,3 @@
 import { errors } from '@expo/eas-build-job';
 import { ErrorContext } from './errors.types';
-export declare function resolveBuildPhaseErrorAsync(error: any, logLines: string[], errorContext: ErrorContext, buildLogsDirectory: string): Promise<errors.BuildError>;
+export declare function resolveBuildPhaseErrorAsync(error: any, logLines: string[], errorContext: ErrorContext, buildLogsDirectory: string): Promise<errors.ExpoError>;

package/dist/buildErrors/detectError.js

@@ -49,24 +49,20 @@ function resolveError(errorHandlers, logLines, errorContext, xcodeBuildLogs) {
 }
 async function resolveBuildPhaseErrorAsync(error, logLines, errorContext, buildLogsDirectory) {
     const { phase } = errorContext;
-    if (error instanceof eas_build_job_1.errors.BuildError) {
+    if (error instanceof eas_build_job_1.errors.ExpoError) {
+        error.buildPhase ??= phase;
         return error;
     }
     const xcodeBuildLogs = await maybeReadXcodeBuildLogs(phase, buildLogsDirectory);
-    const userFacingError = error instanceof eas_build_job_1.errors.UserFacingError
-        ? error
-        : (resolveError(userErrorHandlers_1.userErrorHandlers, logLines, errorContext, xcodeBuildLogs) ??
-            new eas_build_job_1.errors.UnknownError(errorContext.phase));
+    const userError = resolveError(userErrorHandlers_1.userErrorHandlers, logLines, errorContext, xcodeBuildLogs) ??
+        new eas_build_job_1.errors.UnknownError(errorContext.phase);
     const buildError = resolveError(buildErrorHandlers_1.buildErrorHandlers, logLines, errorContext, xcodeBuildLogs);
-    const trackingCode = buildError && buildError.errorCode !== userFacingError.errorCode
-        ? buildError.errorCode
-        : undefined;
-    return new eas_build_job_1.errors.BuildError(userFacingError.message, {
-        errorCode: userFacingError.errorCode,
+    const trackingCode = buildError && buildError.errorCode !== userError.errorCode ? buildError.errorCode : undefined;
+    return new eas_build_job_1.errors.UserError(userError.errorCode, userError.message, {
         trackingCode,
-        docsUrl: userFacingError.docsUrl,
-        cause: error,
+        docsUrl: userError.docsUrl,
         buildPhase: phase,
         metadata: buildError?.metadata,
+        cause: error,
     });
 }

package/dist/buildErrors/userErrorHandlers.d.ts

@@ -1,4 +1,4 @@
 import { errors } from '@expo/eas-build-job';
 import { ErrorHandler } from './errors.types';
-import UserFacingError = errors.UserFacingError;
-export declare const userErrorHandlers: ErrorHandler<UserFacingError>[];
+import UserError = errors.UserError;
+export declare const userErrorHandlers: ErrorHandler<UserError>[];

package/dist/buildErrors/userErrorHandlers.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.userErrorHandlers = void 0;
 const eas_build_job_1 = require("@expo/eas-build-job");
 const errors_types_1 = require("./errors.types");
-var UserFacingError = eas_build_job_1.errors.UserFacingError;
+var UserError = eas_build_job_1.errors.UserError;
 exports.userErrorHandlers = [
     {
         platform: eas_build_job_1.Platform.IOS,
@@ -11,7 +11,7 @@ exports.userErrorHandlers = [
         regexp: /requires CocoaPods version/,
         // example log:
         // [!] `React` requires CocoaPods version `>= 1.10.1`, which is not satisfied by your current version, `1.10.0`.
-        createError: () => new UserFacingError('EAS_BUILD_UNSUPPORTED_COCOAPODS_VERSION_ERROR', `Your project requires a newer version of CocoaPods. You can update it in the build profile in eas.json by either:
+        createError: () => new UserError('EAS_BUILD_UNSUPPORTED_COCOAPODS_VERSION_ERROR', `Your project requires a newer version of CocoaPods. You can update it in the build profile in eas.json by either:
 - changing the current version under key "cocoapods"
 - switching to an image that supports that version under key "image"`, { docsUrl: 'https://docs.expo.dev/build-reference/eas-json/' }),
     },
@@ -21,7 +21,7 @@ exports.userErrorHandlers = [
         regexp: /Could not find 'bundler' (.*) required by your/,
         // example log:
         // /System/Library/Frameworks/Ruby.framework/Versions/2.6/usr/lib/ruby/2.6.0/rubygems/dependency.rb:313:in `to_specs': Could not find 'bundler' (2.2.3) required by your /Users/expo/project/build/ios/Gemfile.lock. (Gem::MissingSpecVersionError)
-        createError: () => new UserFacingError('EAS_BUILD_UNSUPPORTED_BUNDLER_VERSION_ERROR', `Your project requires a different version of the Ruby "bundler" program than the version installed in this EAS Build environment. You can specify which version of "bundler" to install by specifying the version under "build"→[buildProfileName]→"ios"→"bundler" in eas.json.`, { docsUrl: 'https://docs.expo.dev/build-reference/eas-json/' }),
+        createError: () => new UserError('EAS_BUILD_UNSUPPORTED_BUNDLER_VERSION_ERROR', `Your project requires a different version of the Ruby "bundler" program than the version installed in this EAS Build environment. You can specify which version of "bundler" to install by specifying the version under "build"→[buildProfileName]→"ios"→"bundler" in eas.json.`, { docsUrl: 'https://docs.expo.dev/build-reference/eas-json/' }),
     },
     {
         platform: eas_build_job_1.Platform.ANDROID,
@@ -29,7 +29,7 @@ exports.userErrorHandlers = [
         // example log:
         // > Failed to read key keyalias from store "/build/workingdir/build/generic/keystore-5787e6af-3002-4cb7-8a57-3e73d13313c2.jks": Invalid keystore format
         regexp: /Invalid keystore format/,
-        createError: () => new UserFacingError('EAS_BUILD_INVALID_KEYSTORE_FORMAT_ERROR', 'The keystore used in this build is malformed or it has an unsupported type. Make sure you provided the correct file.'),
+        createError: () => new UserError('EAS_BUILD_INVALID_KEYSTORE_FORMAT_ERROR', 'The keystore used in this build is malformed or it has an unsupported type. Make sure you provided the correct file.'),
     },
     {
         platform: eas_build_job_1.Platform.ANDROID,
@@ -37,7 +37,7 @@ exports.userErrorHandlers = [
         // example log:
         // > Failed to read key keyalias from store "/build/workingdir/build/generic/keystore-286069a8-4bb9-48a6-add9-acf6b58ea06d.jks": null
         regexp: /Failed to read key[^\n]+from store/,
-        createError: () => new UserFacingError('EAS_BUILD_INVALID_KEYSTORE_ALIAS_ERROR', 'The alias specified for this keystore does not exist. Make sure you specified the correct value.'),
+        createError: () => new UserError('EAS_BUILD_INVALID_KEYSTORE_ALIAS_ERROR', 'The alias specified for this keystore does not exist. Make sure you specified the correct value.'),
     },
     {
         platform: eas_build_job_1.Platform.ANDROID,
@@ -48,7 +48,7 @@ exports.userErrorHandlers = [
         // [11:17:29] [android.dangerous]: withAndroidDangerousBaseMod: Cannot copy google-services.json from /home/expo/workingdir/build/test/test-google-services.json to /home/expo/workingdir/build/android/app/google-services.json. Please make sure the source and destination paths exist.
         // [11:17:29] Error: [android.dangerous]: withAndroidDangerousBaseMod: Cannot copy google-services.json from /home/expo/workingdir/build/test/test-google-services.json to /home/expo/workingdir/build/android/app/google-services.json. Please make sure the source and destination paths exist.
         regexp: /Cannot copy google-services\.json/,
-        createError: () => new UserFacingError('EAS_BUILD_MISSING_GOOGLE_SERVICES_JSON_ERROR', '"google-services.json" is missing, make sure that the file exists. Remember that EAS Build only uploads the files tracked by git. Use EAS environment variables to provide EAS Build with the file.', { docsUrl: 'https://docs.expo.dev/eas/environment-variables/#file-environment-variables' }),
+        createError: () => new UserError('EAS_BUILD_MISSING_GOOGLE_SERVICES_JSON_ERROR', '"google-services.json" is missing, make sure that the file exists. Remember that EAS Build only uploads the files tracked by git. Use EAS environment variables to provide EAS Build with the file.', { docsUrl: 'https://docs.expo.dev/eas/environment-variables/#file-environment-variables' }),
     },
     {
         platform: eas_build_job_1.Platform.ANDROID,
@@ -57,7 +57,7 @@ exports.userErrorHandlers = [
         // > File google-services.json is missing. The Google Services Plugin cannot function without it.
         //    Searched Location:
         regexp: /File google-services\.json is missing\. The Google Services Plugin cannot function without it/,
-        createError: () => new UserFacingError('EAS_BUILD_MISSING_GOOGLE_SERVICES_JSON_ERROR', '"google-services.json" is missing, make sure that the file exists. Remember that EAS Build only uploads the files tracked by git. Use EAS environment variables to provide EAS Build with the file.', { docsUrl: 'https://docs.expo.dev/eas/environment-variables/#file-environment-variables' }),
+        createError: () => new UserError('EAS_BUILD_MISSING_GOOGLE_SERVICES_JSON_ERROR', '"google-services.json" is missing, make sure that the file exists. Remember that EAS Build only uploads the files tracked by git. Use EAS environment variables to provide EAS Build with the file.', { docsUrl: 'https://docs.expo.dev/eas/environment-variables/#file-environment-variables' }),
     },
     {
         platform: eas_build_job_1.Platform.IOS,
@@ -65,7 +65,7 @@ exports.userErrorHandlers = [
         // example log:
         // [08:44:18] ENOENT: no such file or directory, copyfile '/Users/expo/workingdir/build/managed/abc' -> '/Users/expo/workingdir/build/managed/ios/testapp/GoogleService-Info.plist'
         regexp: /ENOENT: no such file or directory, copyfile .*GoogleService-Info.plist/,
-        createError: () => new UserFacingError('EAS_BUILD_MISSING_GOOGLE_SERVICES_PLIST_ERROR', '"GoogleService-Info.plist" is missing, make sure that the file exists. Remember that EAS Build only uploads the files tracked by git. Use EAS environment variables to provide EAS Build with the file.', { docsUrl: 'https://docs.expo.dev/eas/environment-variables/#file-environment-variables' }),
+        createError: () => new UserError('EAS_BUILD_MISSING_GOOGLE_SERVICES_PLIST_ERROR', '"GoogleService-Info.plist" is missing, make sure that the file exists. Remember that EAS Build only uploads the files tracked by git. Use EAS environment variables to provide EAS Build with the file.', { docsUrl: 'https://docs.expo.dev/eas/environment-variables/#file-environment-variables' }),
     },
     {
         platform: eas_build_job_1.Platform.IOS,
@@ -78,7 +78,7 @@ exports.userErrorHandlers = [
         // Error: Compatible versions of some pods could not be resolved.
         regexp: /Specs satisfying the `(.*)` dependency were found, but they required a higher minimum deployment target/,
         createError: (_, { job }) => {
-            return new UserFacingError('EAS_BUILD_HIGHER_MINIMUM_DEPLOYMENT_TARGET_ERROR', `Some pods require a higher minimum deployment target.
+            return new UserError('EAS_BUILD_HIGHER_MINIMUM_DEPLOYMENT_TARGET_ERROR', `Some pods require a higher minimum deployment target.
 ${'type' in job && job.type === eas_build_job_1.Workflow.MANAGED
                 ? 'You can use the expo-build-properties config plugin (https://docs.expo.dev/versions/latest/sdk/build-properties/) to override the default native build properties and set a different minimum deployment target.'
                 : 'You need to manually update the minimum deployment target in your project to resolve this issue.'}
@@ -101,7 +101,7 @@ ${'type' in job && job.type === eas_build_job_1.Workflow.MANAGED
         //    You should run `pod update Firebase/Core` to apply changes you've made.
         regexp: /CocoaPods could not find compatible versions for pod /,
         createError: () => {
-            return new UserFacingError('EAS_BUILD_INCOMPATIBLE_PODS_ERROR', `Compatible versions of some pods could not be resolved.
+            return new UserError('EAS_BUILD_INCOMPATIBLE_PODS_ERROR', `Compatible versions of some pods could not be resolved.
 You are seeing this error because either:
   - Some of the pods used in your project depend on different versions of the same pod. See logs for more information.
   - If you are caching Podfile.lock using "cache" field in eas.json, then versions there might not match required values in Podspecs of some installed libraries. To fix this, you can re-run build command with "--clear-cache" option, or select "Clear cache and retry build" on the build page.
@@ -117,7 +117,7 @@ You are seeing this error because either:
         regexp: /Fix the upstream dependency conflict, or retry.*\s.*this command with --force, or --legacy-peer-deps/,
         createError: (matchResult) => {
             if (matchResult.length >= 2) {
-                return new UserFacingError('EAS_BUILD_NPM_CONFLICTING_PEER_DEPENDENCIES', `Some of your peer dependencies are not compatible. The recommended approach is to fix your dependencies by resolving any conflicts listed by "npm install". As a temporary workaround you can:
+                return new UserError('EAS_BUILD_NPM_CONFLICTING_PEER_DEPENDENCIES', `Some of your peer dependencies are not compatible. The recommended approach is to fix your dependencies by resolving any conflicts listed by "npm install". As a temporary workaround you can:
 - Add ".npmrc" file with "legacy-peer-deps=true" and commit that to your repo.
 - Delete package-lock.json and use yarn instead. It does not enforce peer dependencies.
 - Downgrade to older version of npm on EAS Build, by adding "npm install -g npm@version" in "eas-build-pre-install" script in package.json.`);
@@ -132,7 +132,7 @@ You are seeing this error because either:
         regexp: /Integrity check failed for "(.*)" \(computed integrity doesn't match our records, got/,
         createError: (matchResult) => {
             if (matchResult.length >= 2) {
-                return new UserFacingError('EAS_BUILD_YARN_LOCK_CHECKSUM_ERROR', `Checksum for package "${matchResult[1]}" does not match value in registry. To fix that:
+                return new UserError('EAS_BUILD_YARN_LOCK_CHECKSUM_ERROR', `Checksum for package "${matchResult[1]}" does not match value in registry. To fix that:
 - run "yarn cache clean"
 - remove yarn.lock (or only the section for that package)
 - run "yarn install --force"`);
@@ -152,7 +152,7 @@ You are seeing this error because either:
         regexp: /\[1\/4\] Resolving packages...\s*\[2\/4\] Fetching packages...\s*\[1\/4\] Resolving packages...\s*\[2\/4\] Fetching packages.../,
         createError: (matchResult) => {
             if (matchResult) {
-                return new UserFacingError('EAS_BUILD_YARN_MULTIPLE_INSTANCES_ERROR', `One of project dependencies is starting new install process while the main one is still in progress, which might result in corrupted packages. Most likely the reason for error is "prepare" script in git-referenced dependency of your project. Learn more: https://github.com/yarnpkg/yarn/issues/7212#issuecomment-493720324`);
+                return new UserError('EAS_BUILD_YARN_MULTIPLE_INSTANCES_ERROR', `One of project dependencies is starting new install process while the main one is still in progress, which might result in corrupted packages. Most likely the reason for error is "prepare" script in git-referenced dependency of your project. Learn more: https://github.com/yarnpkg/yarn/issues/7212#issuecomment-493720324`);
             }
             return undefined;
         },
@@ -175,11 +175,11 @@ You are seeing this error because either:
         // /Users/expo/workingdir/build/managed/ios/Pods/Pods.xcodeproj: error: Signing for "EXUpdates-EXUpdates" requires a development team. Select a development team in the Signing & Capabilities editor. (in target 'EXUpdates-EXUpdates' from project 'Pods')
         regexp: /error: Signing for "[a-zA-Z-0-9_]+" requires a development team/,
         createError: (_, { job }) => 'type' in job && job.type === eas_build_job_1.Workflow.MANAGED
-            ? new UserFacingError('XCODE_RESOURCE_BUNDLE_CODE_SIGNING_ERROR', `Starting from Xcode 14, resource bundles are signed by default, which requires setting the development team for each resource bundle target.
+            ? new UserError('XCODE_RESOURCE_BUNDLE_CODE_SIGNING_ERROR', `Starting from Xcode 14, resource bundles are signed by default, which requires setting the development team for each resource bundle target.
 To resolve this issue, downgrade to an older Xcode version using the "image" field in eas.json, or upgrade to SDK 46 or higher.`, {
                 docsUrl: 'https://docs.expo.dev/build-reference/infrastructure/#ios-build-server-configurations',
             })
-            : new UserFacingError('XCODE_RESOURCE_BUNDLE_CODE_SIGNING_ERROR', `Starting from Xcode 14, resource bundles are signed by default, which requires setting the development team for each resource bundle target.
+            : new UserError('XCODE_RESOURCE_BUNDLE_CODE_SIGNING_ERROR', `Starting from Xcode 14, resource bundles are signed by default, which requires setting the development team for each resource bundle target.
 To resolve this issue, downgrade to an older Xcode version using the "image" field in eas.json, or turn off signing resource bundles in your Podfile: https://expo.fyi/r/disable-bundle-resource-signing`, {
                 docsUrl: 'https://docs.expo.dev/build-reference/infrastructure/#ios-build-server-configurations',
             }),
@@ -188,21 +188,21 @@ To resolve this issue, downgrade to an older Xcode version using the "image" fie
         platform: eas_build_job_1.Platform.ANDROID,
         phase: eas_build_job_1.BuildPhase.RUN_GRADLEW,
         regexp: /.*/,
-        createError: () => new UserFacingError(eas_build_job_1.errors.ErrorCode.UNKNOWN_GRADLE_ERROR, 'Gradle build failed with unknown error. See logs for the "Run gradlew" phase for more information.'),
+        createError: () => new UserError(eas_build_job_1.errors.ErrorCode.UNKNOWN_GRADLE_ERROR, 'Gradle build failed with unknown error. See logs for the "Run gradlew" phase for more information.'),
     },
     {
         platform: eas_build_job_1.Platform.IOS,
         phase: eas_build_job_1.BuildPhase.RUN_FASTLANE,
         mode: eas_build_job_1.BuildMode.RESIGN,
         regexp: /No provisioning profile for application: '(.+)' with bundle identifier '(.+)'/,
-        createError: () => new UserFacingError('EAS_BUILD_RESIGN_PROVISIONING_PROFILE_MISMATCH_ERROR', `The bundle identifier in provisioning profile used to resign the app does not match the bundle identifier of the app selected to be resigned. See logs above for more information.`),
+        createError: () => new UserError('EAS_BUILD_RESIGN_PROVISIONING_PROFILE_MISMATCH_ERROR', `The bundle identifier in provisioning profile used to resign the app does not match the bundle identifier of the app selected to be resigned. See logs above for more information.`),
     },
     {
         platform: eas_build_job_1.Platform.IOS,
         phase: eas_build_job_1.BuildPhase.RUN_FASTLANE,
         mode: eas_build_job_1.BuildMode.RESIGN,
         regexp: /.*/,
-        createError: () => new UserFacingError(eas_build_job_1.errors.ErrorCode.UNKNOWN_FASTLANE_RESIGN_ERROR, `The "Run fastlane" step failed with an unknown error.`),
+        createError: () => new UserError(eas_build_job_1.errors.ErrorCode.UNKNOWN_FASTLANE_RESIGN_ERROR, `The "Run fastlane" step failed with an unknown error.`),
     },
     {
         platform: eas_build_job_1.Platform.IOS,
@@ -219,7 +219,7 @@ To resolve this issue, downgrade to an older Xcode version using the "image" fie
         // file modified: /Users/expo/workingdir/build/packages/video/ios/Vendor/dependency/ProgrammaticAccessLibrary.xcframework/ios-arm64_x86_64-simulator/ProgrammaticAccessLibrary.framework/ProgrammaticAccessLibrary
         // file modified: /Users/expo/workingdir/build/packages/video/ios/Vendor/dependency/ProgrammaticAccessLibrary.xcframework/ios-arm64/ProgrammaticAccessLibrary.framework/ProgrammaticAccessLibrary
         regexp: /error: .+/g,
-        createError: matchResult => new UserFacingError('XCODE_BUILD_ERROR', `The "Run fastlane" step failed because of an error in the Xcode build process. We automatically detected following errors in your Xcode build logs:\n${matchResult
+        createError: matchResult => new UserError('XCODE_BUILD_ERROR', `The "Run fastlane" step failed because of an error in the Xcode build process. We automatically detected following errors in your Xcode build logs:\n${matchResult
             .map(match => `- ${match.replace('error: ', '')}`)
             .join('\n')}\nRefer to "Xcode Logs" below for additional, more detailed logs.`),
     },
@@ -227,6 +227,6 @@ To resolve this issue, downgrade to an older Xcode version using the "image" fie
         platform: eas_build_job_1.Platform.IOS,
         phase: eas_build_job_1.BuildPhase.RUN_FASTLANE,
         regexp: /.*/,
-        createError: () => new UserFacingError(eas_build_job_1.errors.ErrorCode.UNKNOWN_FASTLANE_ERROR, `The "Run fastlane" step failed with an unknown error. Refer to "Xcode Logs" below for additional, more detailed logs.`),
+        createError: () => new UserError(eas_build_job_1.errors.ErrorCode.UNKNOWN_FASTLANE_ERROR, `The "Run fastlane" step failed with an unknown error. Refer to "Xcode Logs" below for additional, more detailed logs.`),
     },
 ];

package/dist/builders/android.js

@@ -11,13 +11,13 @@ const common_1 = require("./common");
 const custom_1 = require("./custom");
 const credentials_1 = require("../android/credentials");
 const gradle_1 = require("../android/gradle");
-const gradleConfig_1 = require("../android/gradleConfig");
 const eagerBundle_1 = require("../common/eagerBundle");
 const prebuild_1 = require("../common/prebuild");
 const setup_1 = require("../common/setup");
 const context_1 = require("../context");
 const restoreBuildCache_1 = require("../steps/functions/restoreBuildCache");
 const saveBuildCache_1 = require("../steps/functions/saveBuildCache");
+const gradleConfig_1 = require("../steps/utils/android/gradleConfig");
 const artifacts_1 = require("../utils/artifacts");
 const expoUpdates_1 = require("../utils/expoUpdates");
 const hooks_1 = require("../utils/hooks");
@@ -87,8 +87,18 @@ async function buildAsync(ctx) {
     });
     if ((0, nullthrows_1.default)(ctx.job.secrets, 'Secrets must be defined for non-custom builds').buildCredentials) {
         await ctx.runBuildPhase(eas_build_job_1.BuildPhase.PREPARE_CREDENTIALS, async () => {
+            await (0, gradleConfig_1.warnIfLegacyEasBuildGradleExists)(ctx);
             await (0, credentials_1.restoreCredentials)(ctx);
-            await (0, gradleConfig_1.configureBuildGradle)(ctx);
+            await (0, gradleConfig_1.injectCredentialsGradleConfig)(ctx.logger, ctx.getReactNativeProjectDirectory());
+        });
+    }
+    if (ctx.job.version?.versionCode || ctx.job.version?.versionName) {
+        await ctx.runBuildPhase(eas_build_job_1.BuildPhase.CONFIGURE_ANDROID_VERSION, async () => {
+            await (0, gradleConfig_1.warnIfLegacyEasBuildGradleExists)(ctx);
+            await (0, gradleConfig_1.injectConfigureVersionGradleConfig)(ctx.logger, ctx.getReactNativeProjectDirectory(), {
+                versionCode: ctx.job.version?.versionCode,
+                versionName: ctx.job.version?.versionName,
+            });
         });
     }
     await ctx.runBuildPhase(eas_build_job_1.BuildPhase.CONFIGURE_EXPO_UPDATES, async () => {

package/dist/builders/custom.js

@@ -83,6 +83,7 @@ async function runCustomBuildAsync(ctx) {
                     // do nothing, it's a non-breaking error.
                 }
             }
+            await customBuildCtx.drainPendingMetricUploads();
         }
     }
     catch (err) {

package/dist/common/setup.js

@@ -5,8 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupAsync = setupAsync;
 const eas_build_job_1 = require("@expo/eas-build-job");
-const common_1 = require("@expo/eas-build-job/dist/common");
-const errors_1 = require("@expo/eas-build-job/dist/errors");
 const turtle_spawn_1 = __importDefault(require("@expo/turtle-spawn"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const nullthrows_1 = __importDefault(require("nullthrows"));
@@ -44,7 +42,7 @@ async function setupAsync(ctx) {
         if (ctx.job.platform === eas_build_job_1.Platform.IOS && ctx.env.EAS_BUILD_RUNNER === 'eas-build') {
             await (0, xcodeEnv_1.deleteXcodeEnvLocalIfExistsAsync)(ctx);
         }
-        if (ctx.job.triggeredBy === common_1.BuildTrigger.GIT_BASED_INTEGRATION) {
+        if (ctx.job.triggeredBy === eas_build_job_1.BuildTrigger.GIT_BASED_INTEGRATION) {
             // We need to setup envs from eas.json before
             // eas-build-pre-install hook is called.
             const env = await (0, easBuildInternal_1.resolveEnvFromBuildProfileAsync)(ctx, {
@@ -97,7 +95,7 @@ async function setupAsync(ctx) {
         ctx.logger.info(JSON.stringify(appConfig, null, 2));
         await validateAppConfigAsync(ctx, appConfig);
     });
-    if (ctx.job.triggeredBy === common_1.BuildTrigger.GIT_BASED_INTEGRATION) {
+    if (ctx.job.triggeredBy === eas_build_job_1.BuildTrigger.GIT_BASED_INTEGRATION) {
         await ctx.runBuildPhase(eas_build_job_1.BuildPhase.EAS_BUILD_INTERNAL, async () => {
             if (!ctx.appConfig.ios?.bundleIdentifier && ctx.job.platform === eas_build_job_1.Platform.IOS) {
                 throw new Error('The "ios.bundleIdentifier" is required to be set in app config for builds triggered by GitHub integration. Learn more: https://docs.expo.dev/versions/latest/config/app/#bundleidentifier.');
@@ -228,7 +226,7 @@ async function validateAppConfigAsync(ctx, appConfig) {
         appConfig.extra.eas.projectId !== ctx.env.EAS_BUILD_PROJECT_ID) {
         const isUsingDynamicConfig = (await fs_extra_1.default.pathExists(path_1.default.join(ctx.getReactNativeProjectDirectory(), 'app.config.ts'))) ||
             (await fs_extra_1.default.pathExists(path_1.default.join(ctx.getReactNativeProjectDirectory(), 'app.config.js')));
-        const isGitHubBuild = ctx.job.triggeredBy === common_1.BuildTrigger.GIT_BASED_INTEGRATION;
+        const isGitHubBuild = ctx.job.triggeredBy === eas_build_job_1.BuildTrigger.GIT_BASED_INTEGRATION;
         let extraMessage = '';
         if (isGitHubBuild && isUsingDynamicConfig) {
             extraMessage =
@@ -241,7 +239,7 @@ async function validateAppConfigAsync(ctx, appConfig) {
             extraMessage =
                 'If you are using environment variables to switch between projects in app.config.js/app.config.ts, make sure those variables are also set inside EAS Build. You can do that using "env" field in eas.json or EAS environment variables. ';
         }
-        throw new errors_1.UserFacingError('EAS_BUILD_PROJECT_ID_MISMATCH', `The value of the "extra.eas.projectId" field (${appConfig.extra.eas.projectId}) in the app config does not match the current project id (${ctx.env.EAS_BUILD_PROJECT_ID}). ${extraMessage}Learn more: https://expo.fyi/eas-config-mismatch.`);
+        throw new eas_build_job_1.UserError('EAS_BUILD_PROJECT_ID_MISMATCH', `The value of the "extra.eas.projectId" field (${appConfig.extra.eas.projectId}) in the app config does not match the current project id (${ctx.env.EAS_BUILD_PROJECT_ID}). ${extraMessage}Learn more: https://expo.fyi/eas-config-mismatch.`);
     }
     else if (ctx.env.EAS_BUILD_PROJECT_ID && !appConfig?.extra?.eas?.projectId) {
         ctx.logger.error(`The "extra.eas.projectId" field is missing from your app config.`);

package/dist/context.d.ts

@@ -47,6 +47,7 @@ export interface BuildContextOptions {
     reportBuildPhaseStats?: (stats: BuildPhaseStats) => void;
     skipNativeBuild?: boolean;
     metadata?: Metadata;
+    expoApiV2BaseUrl?: string;
 }
 export declare class SkipNativeBuildError extends Error {
 }
@@ -60,6 +61,7 @@ export declare class BuildContext<TJob extends Job = Job> {
         extras?: Record<string, string>;
     }) => void;
     readonly skipNativeBuild?: boolean;
+    readonly expoApiV2BaseUrl?: string;
     artifacts: Artifacts;
     private readonly _isLocal;
     private _env;

package/dist/context.js

@@ -23,6 +23,7 @@ class BuildContext {
     cacheManager;
     reportError;
     skipNativeBuild;
+    expoApiV2BaseUrl;
     artifacts = {};
     _isLocal;
     _env;
@@ -47,6 +48,7 @@ class BuildContext {
         this._job = job;
         this._metadata = options.metadata;
         this.skipNativeBuild = options.skipNativeBuild;
+        this.expoApiV2BaseUrl = options.expoApiV2BaseUrl;
         this.reportBuildPhaseStats = options.reportBuildPhaseStats;
         const environmentSecrets = this.getEnvironmentSecrets(job);
         this._env = {

package/dist/customBuildContext.d.ts

@@ -1,6 +1,6 @@
 import { BuildJob, Env, Job, Metadata, StaticJobInterpolationContext } from '@expo/eas-build-job';
 import { bunyan } from '@expo/logger';
-import { BuildRuntimePlatform, ExternalBuildContextProvider } from '@expo/steps';
+import { BuildRuntimePlatform, ExternalBuildContextProvider, StepMetric } from '@expo/steps';
 import { Client } from '@urql/core';
 import { ArtifactToUpload, BuildContext } from './context';
 export interface BuilderRuntimeApi {
@@ -26,6 +26,8 @@ export declare class CustomBuildContext<TJob extends Job = Job> implements Exter
     job: TJob;
     metadata?: Metadata;
     private _env;
+    private readonly expoApiV2BaseUrl?;
+    private readonly pendingMetricUploads;
     constructor(buildCtx: BuildContext<TJob>);
     hasBuildJob(): this is CustomBuildContext<BuildJob>;
     get runtimePlatform(): BuildRuntimePlatform;
@@ -33,4 +35,6 @@ export declare class CustomBuildContext<TJob extends Job = Job> implements Exter
     staticContext(): Omit<StaticJobInterpolationContext, 'steps'>;
     updateEnv(env: Env): void;
     updateJobInformation(job: TJob, metadata: Metadata): void;
+    reportStepMetric(metric: StepMetric): void;
+    drainPendingMetricUploads(): Promise<void>;
 }

package/dist/customBuildContext.js

@@ -8,6 +8,7 @@ const eas_build_job_1 = require("@expo/eas-build-job");
 const steps_1 = require("@expo/steps");
 const assert_1 = __importDefault(require("assert"));
 const path_1 = __importDefault(require("path"));
+const stepMetrics_1 = require("./utils/stepMetrics");
 const platformToBuildRuntimePlatform = {
     [eas_build_job_1.Platform.ANDROID]: steps_1.BuildRuntimePlatform.LINUX,
     [eas_build_job_1.Platform.IOS]: steps_1.BuildRuntimePlatform.DARWIN,
@@ -39,6 +40,8 @@ class CustomBuildContext {
     job;
     metadata;
     _env;
+    expoApiV2BaseUrl;
+    pendingMetricUploads = [];
     constructor(buildCtx) {
         this._env = buildCtx.env;
         this.job = buildCtx.job;
@@ -52,6 +55,7 @@ class CustomBuildContext {
         this.runtimeApi = {
             uploadArtifact: (...args) => buildCtx['uploadArtifact'](...args),
         };
+        this.expoApiV2BaseUrl = buildCtx.expoApiV2BaseUrl;
         this.startTime = new Date();
     }
     hasBuildJob() {
@@ -106,5 +110,23 @@ class CustomBuildContext {
         };
         this.metadata = metadata;
     }
+    reportStepMetric(metric) {
+        const workflowJobId = this._env.__WORKFLOW_JOB_ID;
+        const robotAccessToken = this.job.secrets?.robotAccessToken;
+        if (!workflowJobId || !robotAccessToken || !this.expoApiV2BaseUrl) {
+            return;
+        }
+        const p = (0, stepMetrics_1.uploadStepMetricsToWwwAsync)({
+            workflowJobId,
+            robotAccessToken,
+            expoApiV2BaseUrl: this.expoApiV2BaseUrl,
+            stepMetrics: [metric],
+            logger: this.logger,
+        });
+        this.pendingMetricUploads.push(p);
+    }
+    async drainPendingMetricUploads() {
+        await Promise.allSettled(this.pendingMetricUploads);
+    }
 }
 exports.CustomBuildContext = CustomBuildContext;

package/dist/generic.d.ts

@@ -2,9 +2,7 @@ import { Generic } from '@expo/eas-build-job';
 import { Result } from '@expo/results';
 import { BuildWorkflow } from '@expo/steps';
 import { BuildContext } from './context';
-export declare function runGenericJobAsync(ctx: BuildContext<Generic.Job>, { expoApiV2BaseUrl }: {
-    expoApiV2BaseUrl: string;
-}): Promise<{
+export declare function runGenericJobAsync(ctx: BuildContext<Generic.Job>): Promise<{
     runResult: Result<void>;
     buildWorkflow: BuildWorkflow;
 }>;

package/dist/generic.js

@@ -8,14 +8,17 @@ const eas_build_job_1 = require("@expo/eas-build-job");
 const results_1 = require("@expo/results");
 const steps_1 = require("@expo/steps");
 const promises_1 = __importDefault(require("fs/promises"));
+const nullthrows_1 = __importDefault(require("nullthrows"));
 const projectSources_1 = require("./common/projectSources");
 const customBuildContext_1 = require("./customBuildContext");
 const easFunctionGroups_1 = require("./steps/easFunctionGroups");
 const easFunctions_1 = require("./steps/easFunctions");
 const outputs_1 = require("./utils/outputs");
 const retry_1 = require("./utils/retry");
-const stepMetrics_1 = require("./utils/stepMetrics");
-async function runGenericJobAsync(ctx, { expoApiV2BaseUrl }) {
+async function runGenericJobAsync(ctx) {
+    // expoApiV2BaseUrl is empty when running a local build, but generic jobs
+    // are never executed locally, so it is always present here.
+    const expoApiV2BaseUrl = (0, nullthrows_1.default)(ctx.expoApiV2BaseUrl, 'expoApiV2BaseUrl is required for generic jobs');
     const customBuildCtx = new customBuildContext_1.CustomBuildContext(ctx);
     await ctx.runBuildPhase(eas_build_job_1.BuildPhase.PREPARE_PROJECT, async () => {
         await (0, retry_1.retryAsync)(async () => {
@@ -51,20 +54,15 @@ async function runGenericJobAsync(ctx, { expoApiV2BaseUrl }) {
     });
     const runResult = await (0, results_1.asyncResult)(workflow.executeAsync());
     await ctx.runBuildPhase(eas_build_job_1.BuildPhase.COMPLETE_JOB, async () => {
-        await (0, outputs_1.uploadJobOutputsToWwwAsync)(globalContext, {
-            logger: ctx.logger,
-            expoApiV2BaseUrl,
-        });
-        const workflowJobId = globalContext.env.__WORKFLOW_JOB_ID;
-        const robotAccessToken = ctx.job.secrets?.robotAccessToken;
-        if (workflowJobId && robotAccessToken) {
-            await (0, stepMetrics_1.uploadStepMetricsToWwwAsync)({
-                workflowJobId,
-                robotAccessToken,
-                expoApiV2BaseUrl,
-                stepMetrics: globalContext.stepMetrics,
+        const results = await Promise.allSettled([
+            (0, outputs_1.uploadJobOutputsToWwwAsync)(globalContext, {
                 logger: ctx.logger,
-            });
+                expoApiV2BaseUrl,
+            }),
+            customBuildCtx.drainPendingMetricUploads(),
+        ]);
+        if (results[0].status === 'rejected') {
+            throw results[0].reason;
         }
     });
     return { runResult, buildWorkflow: workflow };

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

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

package/dist/ios/credentials/provisioningProfile.js

@@ -35,6 +35,7 @@ class ProvisioningProfile {
     }
     profilePath;
     profileData;
+    developerCertificates = [];
     constructor(ctx, profile, keychainPath, target, certificateCommonName) {
         this.ctx = ctx;
         this.profile = profile;
@@ -60,10 +61,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() {
@@ -87,6 +89,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,
@@ -94,7 +97,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),
         };
@@ -110,12 +113,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/steps/functions/downloadArtifact.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDownloadArtifactFunction = createDownloadArtifactFunction;
 exports.downloadArtifactAsync = downloadArtifactAsync;
-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 node_fetch_1 = __importDefault(require("node-fetch"));
@@ -52,11 +52,11 @@ function createDownloadArtifactFunction() {
             });
             const interpolationContext = stepsCtx.global.getInterpolationContext();
             if (!('workflow' in interpolationContext)) {
-                throw new errors_1.UserFacingError('EAS_DOWNLOAD_ARTIFACT_NO_WORKFLOW', 'No workflow found in the interpolation context.');
+                throw new eas_build_job_1.UserError('EAS_DOWNLOAD_ARTIFACT_NO_WORKFLOW', 'No workflow found in the interpolation context.');
             }
             const robotAccessToken = stepsCtx.global.staticContext.job.secrets?.robotAccessToken;
             if (!robotAccessToken) {
-                throw new errors_1.UserFacingError('EAS_DOWNLOAD_ARTIFACT_NO_ROBOT_ACCESS_TOKEN', 'No robot access token found in the job secrets.');
+                throw new eas_build_job_1.UserError('EAS_DOWNLOAD_ARTIFACT_NO_ROBOT_ACCESS_TOKEN', 'No robot access token found in the job secrets.');
             }
             const workflowRunId = interpolationContext.workflow.id;
             const { logger } = stepsCtx;

package/dist/steps/functions/downloadBuild.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDownloadBuildFunction = createDownloadBuildFunction;
 exports.downloadBuildAsync = downloadBuildAsync;
-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 fast_glob_1 = require("fast-glob");
@@ -98,7 +98,7 @@ async function downloadBuildAsync({ logger, buildId, expoApiServerURL, robotAcce
         onlyDirectories: false,
     });
     if (matchingFiles.length === 0) {
-        throw new errors_1.UserFacingError('EAS_DOWNLOAD_BUILD_NO_MATCHING_FILES', `No ${extensions.map(ext => `.${ext}`).join(', ')} entries found in the archive.`);
+        throw new eas_build_job_1.UserError('EAS_DOWNLOAD_BUILD_NO_MATCHING_FILES', `No ${extensions.map(ext => `.${ext}`).join(', ')} entries found in the archive.`);
     }
     logger.info(`Found ${matchingFiles.length} matching ${(0, strings_1.pluralize)(matchingFiles.length, 'entry')}:\n${matchingFiles.map(f => `- ${node_path_1.default.relative(extractionDirectory, f)}`).join('\n')}`);
     return { artifactPath: matchingFiles[0] };