@expo/build-tools 1.0.30 → 1.0.32

package/dist/builders/custom.js

@@ -17,10 +17,11 @@ async function runCustomBuildAsync(ctx) {
     await (0, projectSources_1.prepareProjectSourcesAsync)(ctx, customBuildCtx.projectSourceDirectory);
     const relativeConfigPath = (0, nullthrows_1.default)((_a = ctx.job.customBuildConfig) === null || _a === void 0 ? void 0 : _a.path, 'Custom build config must be defined for custom builds');
     const configPath = path_1.default.join(ctx.getReactNativeProjectDirectory(customBuildCtx.projectSourceDirectory), relativeConfigPath);
-    const globalContext = new steps_1.BuildStepGlobalContext(customBuildCtx, false, configPath);
+    const globalContext = new steps_1.BuildStepGlobalContext(customBuildCtx, false);
     const easFunctions = (0, easFunctions_1.getEasFunctions)(customBuildCtx, ctx);
     const parser = new steps_1.BuildConfigParser(globalContext, {
         externalFunctions: easFunctions,
+        configPath,
     });
     const workflow = await ctx.runBuildPhase(eas_build_job_1.BuildPhase.PARSE_CUSTOM_WORKFLOW_CONFIG, async () => {
         try {

package/dist/builders/custom.js.map

@@ -1 +1 @@
-{"version":3,"file":"custom.js","sourceRoot":"","sources":["../../src/builders/custom.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,uDAAsD;AACtD,uCAAgF;AAChF,4DAAoC;AAGpC,6DAAsE;AACtE,wDAAwD;AACxD,8DAA2D;AAEpD,KAAK,UAAU,mBAAmB,CAAgB,GAAoB;;IAC3E,MAAM,cAAc,GAAG,IAAI,uCAAkB,CAAC,GAAG,CAAC,CAAC;IACnD,MAAM,IAAA,2CAA0B,EAAC,GAAG,EAAE,cAAc,CAAC,sBAAsB,CAAC,CAAC;IAC7E,MAAM,kBAAkB,GAAG,IAAA,oBAAU,EACnC,MAAA,GAAG,CAAC,GAAG,CAAC,iBAAiB,0CAAE,IAAI,EAC/B,uDAAuD,CACxD,CAAC;IACF,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAC1B,GAAG,CAAC,8BAA8B,CAAC,cAAc,CAAC,sBAAsB,CAAC,EACzE,kBAAkB,CACnB,CAAC;IAEF,MAAM,aAAa,GAAG,IAAI,8BAAsB,CAAC,cAAc,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;IACpF,MAAM,YAAY,GAAG,IAAA,8BAAe,EAAC,cAAc,EAAE,GAAG,CAAC,CAAC;IAC1D,MAAM,MAAM,GAAG,IAAI,yBAAiB,CAAC,aAAa,EAAE;QAClD,iBAAiB,EAAE,YAAY;KAChC,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,aAAa,CAAC,0BAAU,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;QAC3F,IAAI;YACF,OAAO,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;SAClC;QAAC,OAAO,UAAe,EAAE;YACxB,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAC;YAClE,IAAI,UAAU,YAAY,cAAM,CAAC,kBAAkB,EAAE;gBACnD,KAAK,MAAM,GAAG,IAAI,UAAU,CAAC,MAAM,EAAE;oBACnC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;iBAC3B;aACF;YACD,MAAM,UAAU,CAAC;SAClB;IACH,CAAC,CAAC,CAAC;IACH,IAAI;QACF,MAAM,QAAQ,CAAC,YAAY,EAAE,CAAC;KAC/B;IAAC,OAAO,GAAQ,EAAE;QACjB,GAAG,CAAC,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC;QAC9B,MAAM,GAAG,CAAC;KACX;IAED,OAAO,GAAG,CAAC,SAAS,CAAC;AACvB,CAAC;AAtCD,kDAsCC","sourcesContent":["import path from 'path';\n\nimport { BuildPhase, Job } from '@expo/eas-build-job';\nimport { BuildConfigParser, BuildStepGlobalContext, errors } from '@expo/steps';\nimport nullthrows from 'nullthrows';\n\nimport { Artifacts, BuildContext } from '../context';\nimport { prepareProjectSourcesAsync } from '../common/projectSources';\nimport { getEasFunctions } from '../steps/easFunctions';\nimport { CustomBuildContext } from '../customBuildContext';\n\nexport async function runCustomBuildAsync<T extends Job>(ctx: BuildContext<T>): Promise<Artifacts> {\n  const customBuildCtx = new CustomBuildContext(ctx);\n  await prepareProjectSourcesAsync(ctx, customBuildCtx.projectSourceDirectory);\n  const relativeConfigPath = nullthrows(\n    ctx.job.customBuildConfig?.path,\n    'Custom build config must be defined for custom builds'\n  );\n  const configPath = path.join(\n    ctx.getReactNativeProjectDirectory(customBuildCtx.projectSourceDirectory),\n    relativeConfigPath\n  );\n\n  const globalContext = new BuildStepGlobalContext(customBuildCtx, false, configPath);\n  const easFunctions = getEasFunctions(customBuildCtx, ctx);\n  const parser = new BuildConfigParser(globalContext, {\n    externalFunctions: easFunctions,\n  });\n  const workflow = await ctx.runBuildPhase(BuildPhase.PARSE_CUSTOM_WORKFLOW_CONFIG, async () => {\n    try {\n      return await parser.parseAsync();\n    } catch (parseError: any) {\n      ctx.logger.error('Failed to parse the custom build config file.');\n      if (parseError instanceof errors.BuildWorkflowError) {\n        for (const err of parseError.errors) {\n          ctx.logger.error({ err });\n        }\n      }\n      throw parseError;\n    }\n  });\n  try {\n    await workflow.executeAsync();\n  } catch (err: any) {\n    err.artifacts = ctx.artifacts;\n    throw err;\n  }\n\n  return ctx.artifacts;\n}\n"]}
+{"version":3,"file":"custom.js","sourceRoot":"","sources":["../../src/builders/custom.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,uDAAsD;AACtD,uCAAgF;AAChF,4DAAoC;AAGpC,6DAAsE;AACtE,wDAAwD;AACxD,8DAA2D;AAEpD,KAAK,UAAU,mBAAmB,CAAgB,GAAoB;;IAC3E,MAAM,cAAc,GAAG,IAAI,uCAAkB,CAAC,GAAG,CAAC,CAAC;IACnD,MAAM,IAAA,2CAA0B,EAAC,GAAG,EAAE,cAAc,CAAC,sBAAsB,CAAC,CAAC;IAC7E,MAAM,kBAAkB,GAAG,IAAA,oBAAU,EACnC,MAAA,GAAG,CAAC,GAAG,CAAC,iBAAiB,0CAAE,IAAI,EAC/B,uDAAuD,CACxD,CAAC;IACF,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAC1B,GAAG,CAAC,8BAA8B,CAAC,cAAc,CAAC,sBAAsB,CAAC,EACzE,kBAAkB,CACnB,CAAC;IAEF,MAAM,aAAa,GAAG,IAAI,8BAAsB,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;IACxE,MAAM,YAAY,GAAG,IAAA,8BAAe,EAAC,cAAc,EAAE,GAAG,CAAC,CAAC;IAC1D,MAAM,MAAM,GAAG,IAAI,yBAAiB,CAAC,aAAa,EAAE;QAClD,iBAAiB,EAAE,YAAY;QAC/B,UAAU;KACX,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,aAAa,CAAC,0BAAU,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;QAC3F,IAAI;YACF,OAAO,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;SAClC;QAAC,OAAO,UAAe,EAAE;YACxB,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAC;YAClE,IAAI,UAAU,YAAY,cAAM,CAAC,kBAAkB,EAAE;gBACnD,KAAK,MAAM,GAAG,IAAI,UAAU,CAAC,MAAM,EAAE;oBACnC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;iBAC3B;aACF;YACD,MAAM,UAAU,CAAC;SAClB;IACH,CAAC,CAAC,CAAC;IACH,IAAI;QACF,MAAM,QAAQ,CAAC,YAAY,EAAE,CAAC;KAC/B;IAAC,OAAO,GAAQ,EAAE;QACjB,GAAG,CAAC,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC;QAC9B,MAAM,GAAG,CAAC;KACX;IAED,OAAO,GAAG,CAAC,SAAS,CAAC;AACvB,CAAC;AAvCD,kDAuCC","sourcesContent":["import path from 'path';\n\nimport { BuildPhase, Job } from '@expo/eas-build-job';\nimport { BuildConfigParser, BuildStepGlobalContext, errors } from '@expo/steps';\nimport nullthrows from 'nullthrows';\n\nimport { Artifacts, BuildContext } from '../context';\nimport { prepareProjectSourcesAsync } from '../common/projectSources';\nimport { getEasFunctions } from '../steps/easFunctions';\nimport { CustomBuildContext } from '../customBuildContext';\n\nexport async function runCustomBuildAsync<T extends Job>(ctx: BuildContext<T>): Promise<Artifacts> {\n  const customBuildCtx = new CustomBuildContext(ctx);\n  await prepareProjectSourcesAsync(ctx, customBuildCtx.projectSourceDirectory);\n  const relativeConfigPath = nullthrows(\n    ctx.job.customBuildConfig?.path,\n    'Custom build config must be defined for custom builds'\n  );\n  const configPath = path.join(\n    ctx.getReactNativeProjectDirectory(customBuildCtx.projectSourceDirectory),\n    relativeConfigPath\n  );\n\n  const globalContext = new BuildStepGlobalContext(customBuildCtx, false);\n  const easFunctions = getEasFunctions(customBuildCtx, ctx);\n  const parser = new BuildConfigParser(globalContext, {\n    externalFunctions: easFunctions,\n    configPath,\n  });\n  const workflow = await ctx.runBuildPhase(BuildPhase.PARSE_CUSTOM_WORKFLOW_CONFIG, async () => {\n    try {\n      return await parser.parseAsync();\n    } catch (parseError: any) {\n      ctx.logger.error('Failed to parse the custom build config file.');\n      if (parseError instanceof errors.BuildWorkflowError) {\n        for (const err of parseError.errors) {\n          ctx.logger.error({ err });\n        }\n      }\n      throw parseError;\n    }\n  });\n  try {\n    await workflow.executeAsync();\n  } catch (err: any) {\n    err.artifacts = ctx.artifacts;\n    throw err;\n  }\n\n  return ctx.artifacts;\n}\n"]}

package/dist/steps/easFunctions.js

@@ -5,11 +5,12 @@ const uploadArtifact_1 = require("./functions/utils/uploadArtifact");
 const checkout_1 = require("./functions/eas/checkout");
 const setUpNpmrc_1 = require("./functions/eas/setUpNpmrc");
 const installNodeModules_1 = require("./functions/eas/installNodeModules");
-const runGradle_1 = require("./functions/utils/runGradle");
 const prebuild_1 = require("./functions/eas/prebuild");
 const buildReactNativeApp_1 = require("./functions/eas/buildReactNativeApp");
 const findAndUploadBuildArtifacts_1 = require("./functions/eas/findAndUploadBuildArtifacts");
 const configureExpoUpdatesIfInstalled_1 = require("./functions/eas/configureExpoUpdatesIfInstalled");
+const injectAndroidCredentials_1 = require("./functions/utils/injectAndroidCredentials");
+const configureAndroidVersion_1 = require("./functions/utils/configureAndroidVersion");
 function getEasFunctions(ctx, oldCtx // TODO: remove
 ) {
     return [
@@ -18,10 +19,11 @@ function getEasFunctions(ctx, oldCtx // TODO: remove
         (0, setUpNpmrc_1.createSetUpNpmrcBuildFunction)(ctx),
         (0, installNodeModules_1.createInstallNodeModulesBuildFunction)(ctx),
         (0, prebuild_1.createPrebuildBuildFunction)(ctx),
-        (0, runGradle_1.createRunGradleBuildFunction)(oldCtx),
         (0, buildReactNativeApp_1.createBuildReactNativeAppBuildFunction)(oldCtx),
         (0, findAndUploadBuildArtifacts_1.createFindAndUploadBuildArtifactsBuildFunction)(ctx),
         (0, configureExpoUpdatesIfInstalled_1.configureEASUpdateIfInstalledFunction)(),
+        (0, injectAndroidCredentials_1.injectAndroidCredentialsFunction)(),
+        (0, configureAndroidVersion_1.configureAndroidVersionFunction)(),
     ];
 }
 exports.getEasFunctions = getEasFunctions;

package/dist/steps/easFunctions.js.map

@@ -1 +1 @@
-{"version":3,"file":"easFunctions.js","sourceRoot":"","sources":["../../src/steps/easFunctions.ts"],"names":[],"mappings":";;;AAMA,qEAAqF;AACrF,uDAAuE;AACvE,2DAA2E;AAC3E,2EAA2F;AAC3F,2DAA2E;AAC3E,uDAAuE;AACvE,6EAA6F;AAC7F,6FAA6G;AAC7G,qGAAwG;AAExG,SAAgB,eAAe,CAC7B,GAAuB,EACvB,MAAyB,CAAC,eAAe;;IAEzC,OAAO;QACL,IAAA,sCAA2B,GAAE;QAC7B,IAAA,kDAAiC,EAAC,GAAG,CAAC;QACtC,IAAA,0CAA6B,EAAC,GAAG,CAAC;QAClC,IAAA,0DAAqC,EAAC,GAAG,CAAC;QAC1C,IAAA,sCAA2B,EAAC,GAAG,CAAC;QAChC,IAAA,wCAA4B,EAAC,MAAM,CAAC;QACpC,IAAA,4DAAsC,EAAC,MAAM,CAAC;QAC9C,IAAA,4EAA8C,EAAC,GAAG,CAAC;QACnD,IAAA,uEAAqC,GAAE;KACxC,CAAC;AACJ,CAAC;AAfD,0CAeC","sourcesContent":["import { Job } from '@expo/eas-build-job';\nimport { BuildFunction } from '@expo/steps';\n\nimport { BuildContext } from '../context';\nimport { CustomBuildContext } from '../customBuildContext';\n\nimport { createUploadArtifactBuildFunction } from './functions/utils/uploadArtifact';\nimport { createCheckoutBuildFunction } from './functions/eas/checkout';\nimport { createSetUpNpmrcBuildFunction } from './functions/eas/setUpNpmrc';\nimport { createInstallNodeModulesBuildFunction } from './functions/eas/installNodeModules';\nimport { createRunGradleBuildFunction } from './functions/utils/runGradle';\nimport { createPrebuildBuildFunction } from './functions/eas/prebuild';\nimport { createBuildReactNativeAppBuildFunction } from './functions/eas/buildReactNativeApp';\nimport { createFindAndUploadBuildArtifactsBuildFunction } from './functions/eas/findAndUploadBuildArtifacts';\nimport { configureEASUpdateIfInstalledFunction } from './functions/eas/configureExpoUpdatesIfInstalled';\n\nexport function getEasFunctions(\n  ctx: CustomBuildContext,\n  oldCtx: BuildContext<Job> // TODO: remove\n): BuildFunction[] {\n  return [\n    createCheckoutBuildFunction(),\n    createUploadArtifactBuildFunction(ctx),\n    createSetUpNpmrcBuildFunction(ctx),\n    createInstallNodeModulesBuildFunction(ctx),\n    createPrebuildBuildFunction(ctx),\n    createRunGradleBuildFunction(oldCtx),\n    createBuildReactNativeAppBuildFunction(oldCtx),\n    createFindAndUploadBuildArtifactsBuildFunction(ctx),\n    configureEASUpdateIfInstalledFunction(),\n  ];\n}\n"]}
+{"version":3,"file":"easFunctions.js","sourceRoot":"","sources":["../../src/steps/easFunctions.ts"],"names":[],"mappings":";;;AAMA,qEAAqF;AACrF,uDAAuE;AACvE,2DAA2E;AAC3E,2EAA2F;AAC3F,uDAAuE;AACvE,6EAA6F;AAC7F,6FAA6G;AAC7G,qGAAwG;AACxG,yFAA8F;AAC9F,uFAA4F;AAE5F,SAAgB,eAAe,CAC7B,GAAuB,EACvB,MAAyB,CAAC,eAAe;;IAEzC,OAAO;QACL,IAAA,sCAA2B,GAAE;QAC7B,IAAA,kDAAiC,EAAC,GAAG,CAAC;QACtC,IAAA,0CAA6B,EAAC,GAAG,CAAC;QAClC,IAAA,0DAAqC,EAAC,GAAG,CAAC;QAC1C,IAAA,sCAA2B,EAAC,GAAG,CAAC;QAChC,IAAA,4DAAsC,EAAC,MAAM,CAAC;QAC9C,IAAA,4EAA8C,EAAC,GAAG,CAAC;QACnD,IAAA,uEAAqC,GAAE;QACvC,IAAA,2DAAgC,GAAE;QAClC,IAAA,yDAA+B,GAAE;KAClC,CAAC;AACJ,CAAC;AAhBD,0CAgBC","sourcesContent":["import { Job } from '@expo/eas-build-job';\nimport { BuildFunction } from '@expo/steps';\n\nimport { BuildContext } from '../context';\nimport { CustomBuildContext } from '../customBuildContext';\n\nimport { createUploadArtifactBuildFunction } from './functions/utils/uploadArtifact';\nimport { createCheckoutBuildFunction } from './functions/eas/checkout';\nimport { createSetUpNpmrcBuildFunction } from './functions/eas/setUpNpmrc';\nimport { createInstallNodeModulesBuildFunction } from './functions/eas/installNodeModules';\nimport { createPrebuildBuildFunction } from './functions/eas/prebuild';\nimport { createBuildReactNativeAppBuildFunction } from './functions/eas/buildReactNativeApp';\nimport { createFindAndUploadBuildArtifactsBuildFunction } from './functions/eas/findAndUploadBuildArtifacts';\nimport { configureEASUpdateIfInstalledFunction } from './functions/eas/configureExpoUpdatesIfInstalled';\nimport { injectAndroidCredentialsFunction } from './functions/utils/injectAndroidCredentials';\nimport { configureAndroidVersionFunction } from './functions/utils/configureAndroidVersion';\n\nexport function getEasFunctions(\n  ctx: CustomBuildContext,\n  oldCtx: BuildContext<Job> // TODO: remove\n): BuildFunction[] {\n  return [\n    createCheckoutBuildFunction(),\n    createUploadArtifactBuildFunction(ctx),\n    createSetUpNpmrcBuildFunction(ctx),\n    createInstallNodeModulesBuildFunction(ctx),\n    createPrebuildBuildFunction(ctx),\n    createBuildReactNativeAppBuildFunction(oldCtx),\n    createFindAndUploadBuildArtifactsBuildFunction(ctx),\n    configureEASUpdateIfInstalledFunction(),\n    injectAndroidCredentialsFunction(),\n    configureAndroidVersionFunction(),\n  ];\n}\n"]}

package/dist/steps/functions/utils/configureAndroidVersion.d.ts

@@ -0,0 +1,2 @@
+import { BuildFunction } from '@expo/steps';
+export declare function configureAndroidVersionFunction(): BuildFunction;

package/dist/steps/functions/utils/configureAndroidVersion.js

@@ -0,0 +1,43 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.configureAndroidVersionFunction = void 0;
+const steps_1 = require("@expo/steps");
+const semver_1 = __importDefault(require("semver"));
+const gradleConfig_1 = require("../../utils/android/gradleConfig");
+function configureAndroidVersionFunction() {
+    return new steps_1.BuildFunction({
+        namespace: 'utils',
+        id: 'configure_android_version',
+        name: 'Configure Android version',
+        inputProviders: [
+            steps_1.BuildStepInput.createProvider({
+                id: 'version_name',
+                required: true,
+                allowedValueTypeName: steps_1.BuildStepInputValueTypeName.STRING,
+                defaultValue: '${ eas.job.version.versionName }',
+            }),
+            steps_1.BuildStepInput.createProvider({
+                id: 'version_code',
+                required: true,
+                allowedValueTypeName: steps_1.BuildStepInputValueTypeName.NUMBER,
+                defaultValue: '${ eas.job.version.versionCode }',
+            }),
+        ],
+        fn: async (stepCtx, { inputs }) => {
+            const versionCode = inputs.version_code.value;
+            const versionName = inputs.version_name.value;
+            if (!semver_1.default.valid(versionName)) {
+                throw new Error(`Version name provided by the "version_name" input is not a valid semver version: ${versionName}`);
+            }
+            await (0, gradleConfig_1.injectConfigureVersionGradleConfig)(stepCtx.logger, stepCtx.workingDirectory, {
+                versionCode,
+                versionName,
+            });
+        },
+    });
+}
+exports.configureAndroidVersionFunction = configureAndroidVersionFunction;
+//# sourceMappingURL=configureAndroidVersion.js.map

package/dist/steps/functions/utils/configureAndroidVersion.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"configureAndroidVersion.js","sourceRoot":"","sources":["../../../../src/steps/functions/utils/configureAndroidVersion.ts"],"names":[],"mappings":";;;;;;AAAA,uCAAyF;AACzF,oDAA4B;AAE5B,mEAAsF;AAEtF,SAAgB,+BAA+B;IAC7C,OAAO,IAAI,qBAAa,CAAC;QACvB,SAAS,EAAE,OAAO;QAClB,EAAE,EAAE,2BAA2B;QAC/B,IAAI,EAAE,2BAA2B;QACjC,cAAc,EAAE;YACd,sBAAc,CAAC,cAAc,CAAC;gBAC5B,EAAE,EAAE,cAAc;gBAClB,QAAQ,EAAE,IAAI;gBACd,oBAAoB,EAAE,mCAA2B,CAAC,MAAM;gBACxD,YAAY,EAAE,kCAAkC;aACjD,CAAC;YACF,sBAAc,CAAC,cAAc,CAAC;gBAC5B,EAAE,EAAE,cAAc;gBAClB,QAAQ,EAAE,IAAI;gBACd,oBAAoB,EAAE,mCAA2B,CAAC,MAAM;gBACxD,YAAY,EAAE,kCAAkC;aACjD,CAAC;SACH;QACD,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;YAChC,MAAM,WAAW,GAAG,MAAM,CAAC,YAAY,CAAC,KAAe,CAAC;YACxD,MAAM,WAAW,GAAG,MAAM,CAAC,YAAY,CAAC,KAAe,CAAC;YACxD,IAAI,CAAC,gBAAM,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;gBAC9B,MAAM,IAAI,KAAK,CACb,oFAAoF,WAAW,EAAE,CAClG,CAAC;aACH;YACD,MAAM,IAAA,iDAAkC,EAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,gBAAgB,EAAE;gBACjF,WAAW;gBACX,WAAW;aACZ,CAAC,CAAC;QACL,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAjCD,0EAiCC","sourcesContent":["import { BuildFunction, BuildStepInput, BuildStepInputValueTypeName } from '@expo/steps';\nimport semver from 'semver';\n\nimport { injectConfigureVersionGradleConfig } from '../../utils/android/gradleConfig';\n\nexport function configureAndroidVersionFunction(): BuildFunction {\n  return new BuildFunction({\n    namespace: 'utils',\n    id: 'configure_android_version',\n    name: 'Configure Android version',\n    inputProviders: [\n      BuildStepInput.createProvider({\n        id: 'version_name',\n        required: true,\n        allowedValueTypeName: BuildStepInputValueTypeName.STRING,\n        defaultValue: '${ eas.job.version.versionName }',\n      }),\n      BuildStepInput.createProvider({\n        id: 'version_code',\n        required: true,\n        allowedValueTypeName: BuildStepInputValueTypeName.NUMBER,\n        defaultValue: '${ eas.job.version.versionCode }',\n      }),\n    ],\n    fn: async (stepCtx, { inputs }) => {\n      const versionCode = inputs.version_code.value as number;\n      const versionName = inputs.version_name.value as string;\n      if (!semver.valid(versionName)) {\n        throw new Error(\n          `Version name provided by the \"version_name\" input is not a valid semver version: ${versionName}`\n        );\n      }\n      await injectConfigureVersionGradleConfig(stepCtx.logger, stepCtx.workingDirectory, {\n        versionCode,\n        versionName,\n      });\n    },\n  });\n}\n"]}

package/dist/steps/functions/utils/injectAndroidCredentials.d.ts

@@ -0,0 +1,2 @@
+import { BuildFunction } from '@expo/steps';
+export declare function injectAndroidCredentialsFunction(): BuildFunction;

package/dist/steps/functions/utils/injectAndroidCredentials.js

@@ -0,0 +1,68 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.injectAndroidCredentialsFunction = void 0;
+const path_1 = __importDefault(require("path"));
+const uuid_1 = require("uuid");
+const steps_1 = require("@expo/steps");
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const joi_1 = __importDefault(require("joi"));
+const gradleConfig_1 = require("../../utils/android/gradleConfig");
+const KeystoreSchema = joi_1.default.object({
+    dataBase64: joi_1.default.string().required(),
+    keystorePassword: joi_1.default.string().allow('').required(),
+    keyAlias: joi_1.default.string().required(),
+    keyPassword: joi_1.default.string().allow(''),
+});
+const AndroidBuildCredentialsSchema = joi_1.default.object({
+    keystore: KeystoreSchema.required(),
+}).required();
+function injectAndroidCredentialsFunction() {
+    return new steps_1.BuildFunction({
+        namespace: 'utils',
+        id: 'inject_android_credentials',
+        name: 'Inject Android credentials',
+        inputProviders: [
+            steps_1.BuildStepInput.createProvider({
+                id: 'credentials',
+                required: true,
+                allowedValueTypeName: steps_1.BuildStepInputValueTypeName.JSON,
+                defaultValue: '${ eas.job.secrets.buildCredentials }',
+            }),
+        ],
+        fn: async (stepCtx, { inputs }) => {
+            const rawCredentialsInput = inputs.credentials.value;
+            const { value, error } = AndroidBuildCredentialsSchema.validate(rawCredentialsInput, {
+                stripUnknown: true,
+                convert: true,
+                abortEarly: false,
+            });
+            if (error) {
+                throw error;
+            }
+            const credentials = value;
+            await restoreCredentials(stepCtx, credentials);
+            await (0, gradleConfig_1.injectCredentialsGradleConfig)(stepCtx.logger, stepCtx.workingDirectory);
+        },
+    });
+}
+exports.injectAndroidCredentialsFunction = injectAndroidCredentialsFunction;
+async function restoreCredentials(stepsCtx, buildCredentials) {
+    stepsCtx.logger.info("Writing secrets to the project's directory");
+    const keystorePath = path_1.default.join(stepsCtx.global.projectTargetDirectory, `keystore-${(0, uuid_1.v4)()}`);
+    await fs_extra_1.default.writeFile(keystorePath, Buffer.from(buildCredentials.keystore.dataBase64, 'base64'));
+    const credentialsJson = {
+        android: {
+            keystore: {
+                keystorePath,
+                keystorePassword: buildCredentials.keystore.keystorePassword,
+                keyAlias: buildCredentials.keystore.keyAlias,
+                keyPassword: buildCredentials.keystore.keyPassword,
+            },
+        },
+    };
+    await fs_extra_1.default.writeFile(path_1.default.join(stepsCtx.global.projectTargetDirectory, 'credentials.json'), JSON.stringify(credentialsJson));
+}
+//# sourceMappingURL=injectAndroidCredentials.js.map

package/dist/steps/functions/utils/injectAndroidCredentials.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"injectAndroidCredentials.js","sourceRoot":"","sources":["../../../../src/steps/functions/utils/injectAndroidCredentials.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,+BAAoC;AACpC,uCAKqB;AACrB,wDAA0B;AAC1B,8CAAsB;AAGtB,mEAAiF;AAEjF,MAAM,cAAc,GAAG,aAAG,CAAC,MAAM,CAAC;IAChC,UAAU,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACnC,gBAAgB,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE;IACnD,QAAQ,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACjC,WAAW,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;CACpC,CAAC,CAAC;AAEH,MAAM,6BAA6B,GAAG,aAAG,CAAC,MAAM,CAAiC;IAC/E,QAAQ,EAAE,cAAc,CAAC,QAAQ,EAAE;CACpC,CAAC,CAAC,QAAQ,EAAE,CAAC;AAEd,SAAgB,gCAAgC;IAC9C,OAAO,IAAI,qBAAa,CAAC;QACvB,SAAS,EAAE,OAAO;QAClB,EAAE,EAAE,4BAA4B;QAChC,IAAI,EAAE,4BAA4B;QAClC,cAAc,EAAE;YACd,sBAAc,CAAC,cAAc,CAAC;gBAC5B,EAAE,EAAE,aAAa;gBACjB,QAAQ,EAAE,IAAI;gBACd,oBAAoB,EAAE,mCAA2B,CAAC,IAAI;gBACtD,YAAY,EAAE,uCAAuC;aACtD,CAAC;SACH;QACD,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;YAChC,MAAM,mBAAmB,GAAG,MAAM,CAAC,WAAW,CAAC,KAA4B,CAAC;YAC5E,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,6BAA6B,CAAC,QAAQ,CAAC,mBAAmB,EAAE;gBACnF,YAAY,EAAE,IAAI;gBAClB,OAAO,EAAE,IAAI;gBACb,UAAU,EAAE,KAAK;aAClB,CAAC,CAAC;YACH,IAAI,KAAK,EAAE;gBACT,MAAM,KAAK,CAAC;aACb;YACD,MAAM,WAAW,GAAG,KAAK,CAAC;YAE1B,MAAM,kBAAkB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;YAC/C,MAAM,IAAA,4CAA6B,EAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAChF,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AA7BD,4EA6BC;AAED,KAAK,UAAU,kBAAkB,CAC/B,QAA0B,EAC1B,gBAEC;IAED,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC;IACnE,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,sBAAsB,EAAE,YAAY,IAAA,SAAM,GAAE,EAAE,CAAC,CAAC;IAC/F,MAAM,kBAAE,CAAC,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC9F,MAAM,eAAe,GAAG;QACtB,OAAO,EAAE;YACP,QAAQ,EAAE;gBACR,YAAY;gBACZ,gBAAgB,EAAE,gBAAgB,CAAC,QAAQ,CAAC,gBAAgB;gBAC5D,QAAQ,EAAE,gBAAgB,CAAC,QAAQ,CAAC,QAAQ;gBAC5C,WAAW,EAAE,gBAAgB,CAAC,QAAQ,CAAC,WAAW;aACnD;SACF;KACF,CAAC;IACF,MAAM,kBAAE,CAAC,SAAS,CAChB,cAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,sBAAsB,EAAE,kBAAkB,CAAC,EACrE,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,CAChC,CAAC;AACJ,CAAC","sourcesContent":["import path from 'path';\n\nimport { v4 as uuidv4 } from 'uuid';\nimport {\n  BuildFunction,\n  BuildStepContext,\n  BuildStepInput,\n  BuildStepInputValueTypeName,\n} from '@expo/steps';\nimport fs from 'fs-extra';\nimport Joi from 'joi';\nimport { Android } from '@expo/eas-build-job';\n\nimport { injectCredentialsGradleConfig } from '../../utils/android/gradleConfig';\n\nconst KeystoreSchema = Joi.object({\n  dataBase64: Joi.string().required(),\n  keystorePassword: Joi.string().allow('').required(),\n  keyAlias: Joi.string().required(),\n  keyPassword: Joi.string().allow(''),\n});\n\nconst AndroidBuildCredentialsSchema = Joi.object<{ keystore: Android.Keystore }>({\n  keystore: KeystoreSchema.required(),\n}).required();\n\nexport function injectAndroidCredentialsFunction(): BuildFunction {\n  return new BuildFunction({\n    namespace: 'utils',\n    id: 'inject_android_credentials',\n    name: 'Inject Android credentials',\n    inputProviders: [\n      BuildStepInput.createProvider({\n        id: 'credentials',\n        required: true,\n        allowedValueTypeName: BuildStepInputValueTypeName.JSON,\n        defaultValue: '${ eas.job.secrets.buildCredentials }',\n      }),\n    ],\n    fn: async (stepCtx, { inputs }) => {\n      const rawCredentialsInput = inputs.credentials.value as Record<string, any>;\n      const { value, error } = AndroidBuildCredentialsSchema.validate(rawCredentialsInput, {\n        stripUnknown: true,\n        convert: true,\n        abortEarly: false,\n      });\n      if (error) {\n        throw error;\n      }\n      const credentials = value;\n\n      await restoreCredentials(stepCtx, credentials);\n      await injectCredentialsGradleConfig(stepCtx.logger, stepCtx.workingDirectory);\n    },\n  });\n}\n\nasync function restoreCredentials(\n  stepsCtx: BuildStepContext,\n  buildCredentials: {\n    keystore: Android.Keystore;\n  }\n): Promise<void> {\n  stepsCtx.logger.info(\"Writing secrets to the project's directory\");\n  const keystorePath = path.join(stepsCtx.global.projectTargetDirectory, `keystore-${uuidv4()}`);\n  await fs.writeFile(keystorePath, Buffer.from(buildCredentials.keystore.dataBase64, 'base64'));\n  const credentialsJson = {\n    android: {\n      keystore: {\n        keystorePath,\n        keystorePassword: buildCredentials.keystore.keystorePassword,\n        keyAlias: buildCredentials.keystore.keyAlias,\n        keyPassword: buildCredentials.keystore.keyPassword,\n      },\n    },\n  };\n  await fs.writeFile(\n    path.join(stepsCtx.global.projectTargetDirectory, 'credentials.json'),\n    JSON.stringify(credentialsJson)\n  );\n}\n"]}

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

@@ -0,0 +1,7 @@
+/// <reference types="bunyan" />
+import { bunyan } from '@expo/logger';
+export declare function injectCredentialsGradleConfig(logger: bunyan, workingDir: string): Promise<void>;
+export declare function injectConfigureVersionGradleConfig(logger: bunyan, workingDir: string, { versionCode, versionName }: {
+    versionCode: number;
+    versionName: string;
+}): Promise<void>;

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

@@ -0,0 +1,83 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.injectConfigureVersionGradleConfig = exports.injectCredentialsGradleConfig = void 0;
+const path_1 = __importDefault(require("path"));
+const config_plugins_1 = require("@expo/config-plugins");
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const template_file_1 = __importDefault(require("@expo/template-file"));
+const EAS_BUILD_INJECT_CREDENTIALS_GRADLE_TEMPLATE_PATH = path_1.default.join(__dirname, '../../../../templates/eas-build-inject-android-credentials.gradle');
+const EAS_BUILD_CONFIGURE_VERSION_GRADLE_TEMPLATE_PATH = path_1.default.join(__dirname, '../../../../templates/eas-build-configure-version.gradle.template');
+const APPLY_EAS_BUILD_INJECT_CREDENTIALS_GRADLE_LINE = 'apply from: "./eas-build-inject-android-credentials.gradle"';
+const APPLY_EAS_BUILD_CONFIGURE_VERSION_GRADLE_LINE = 'apply from: "./eas-build-configure-version.gradle"';
+async function injectCredentialsGradleConfig(logger, workingDir) {
+    logger.info('Injecting signing config into build.gradle');
+    await deleteEasBuildInjectCredentialsGradle(workingDir);
+    await createEasBuildInjectCredentialsGradle(workingDir);
+    await addApplyInjectCredentialsConfigToBuildGradle(workingDir);
+    logger.info('Signing config injected');
+}
+exports.injectCredentialsGradleConfig = injectCredentialsGradleConfig;
+async function injectConfigureVersionGradleConfig(logger, workingDir, { versionCode, versionName }) {
+    logger.info('Injecting version config into build.gradle');
+    logger.info(`Version code: ${versionCode}`);
+    logger.info(`Version name: ${versionName}`);
+    await deleteEasBuildConfigureVersionGradle(workingDir);
+    await createEasBuildConfigureVersionGradle(workingDir, { versionCode, versionName });
+    await addApplyConfigureVersionConfigToBuildGradle(workingDir);
+    logger.info('Version config injected');
+}
+exports.injectConfigureVersionGradleConfig = injectConfigureVersionGradleConfig;
+async function deleteEasBuildInjectCredentialsGradle(workingDir) {
+    const targetPath = getEasBuildInjectCredentialsGradlePath(workingDir);
+    await fs_extra_1.default.remove(targetPath);
+}
+async function deleteEasBuildConfigureVersionGradle(workingDir) {
+    const targetPath = getEasBuildConfigureVersionGradlePath(workingDir);
+    await fs_extra_1.default.remove(targetPath);
+}
+function getEasBuildInjectCredentialsGradlePath(workingDir) {
+    return path_1.default.join(workingDir, 'android/app/eas-build-inject-android-credentials.gradle');
+}
+function getEasBuildConfigureVersionGradlePath(workingDir) {
+    return path_1.default.join(workingDir, 'android/app/eas-build-configure-version.gradle');
+}
+async function createEasBuildInjectCredentialsGradle(workingDir) {
+    const targetPath = getEasBuildInjectCredentialsGradlePath(workingDir);
+    await fs_extra_1.default.copy(EAS_BUILD_INJECT_CREDENTIALS_GRADLE_TEMPLATE_PATH, targetPath);
+}
+async function createEasBuildConfigureVersionGradle(workingDir, { versionCode, versionName }) {
+    const targetPath = getEasBuildConfigureVersionGradlePath(workingDir);
+    await (0, template_file_1.default)(EAS_BUILD_CONFIGURE_VERSION_GRADLE_TEMPLATE_PATH, {
+        VERSION_CODE: versionCode,
+        VERSION_NAME: versionName,
+    }, targetPath, {
+        mustache: false,
+    });
+}
+async function addApplyInjectCredentialsConfigToBuildGradle(projectRoot) {
+    const buildGradlePath = config_plugins_1.AndroidConfig.Paths.getAppBuildGradleFilePath(projectRoot);
+    const buildGradleContents = await fs_extra_1.default.readFile(path_1.default.join(buildGradlePath), 'utf8');
+    if (hasLine(buildGradleContents, APPLY_EAS_BUILD_INJECT_CREDENTIALS_GRADLE_LINE)) {
+        return;
+    }
+    await fs_extra_1.default.writeFile(buildGradlePath, `${buildGradleContents.trim()}\n${APPLY_EAS_BUILD_INJECT_CREDENTIALS_GRADLE_LINE}\n`);
+}
+async function addApplyConfigureVersionConfigToBuildGradle(projectRoot) {
+    const buildGradlePath = config_plugins_1.AndroidConfig.Paths.getAppBuildGradleFilePath(projectRoot);
+    const buildGradleContents = await fs_extra_1.default.readFile(path_1.default.join(buildGradlePath), 'utf8');
+    if (hasLine(buildGradleContents, APPLY_EAS_BUILD_CONFIGURE_VERSION_GRADLE_LINE)) {
+        return;
+    }
+    await fs_extra_1.default.writeFile(buildGradlePath, `${buildGradleContents.trim()}\n${APPLY_EAS_BUILD_CONFIGURE_VERSION_GRADLE_LINE}\n`);
+}
+function hasLine(haystack, needle) {
+    return (haystack
+        .replace(/\r\n/g, '\n')
+        .split('\n')
+        // Check for both single and double quotes
+        .some((line) => line === needle || line === needle.replace(/"/g, "'")));
+}
+//# sourceMappingURL=gradleConfig.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"gradleConfig.js","sourceRoot":"","sources":["../../../../src/steps/utils/android/gradleConfig.ts"],"names":[],"mappings":"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","sourcesContent":["import path from 'path';\n\nimport { AndroidConfig } from '@expo/config-plugins';\nimport { bunyan } from '@expo/logger';\nimport fs from 'fs-extra';\nimport templateFile from '@expo/template-file';\n\nconst EAS_BUILD_INJECT_CREDENTIALS_GRADLE_TEMPLATE_PATH = path.join(\n  __dirname,\n  '../../../../templates/eas-build-inject-android-credentials.gradle'\n);\nconst EAS_BUILD_CONFIGURE_VERSION_GRADLE_TEMPLATE_PATH = path.join(\n  __dirname,\n  '../../../../templates/eas-build-configure-version.gradle.template'\n);\n\nconst APPLY_EAS_BUILD_INJECT_CREDENTIALS_GRADLE_LINE =\n  'apply from: \"./eas-build-inject-android-credentials.gradle\"';\nconst APPLY_EAS_BUILD_CONFIGURE_VERSION_GRADLE_LINE =\n  'apply from: \"./eas-build-configure-version.gradle\"';\n\nexport async function injectCredentialsGradleConfig(\n  logger: bunyan,\n  workingDir: string\n): Promise<void> {\n  logger.info('Injecting signing config into build.gradle');\n  await deleteEasBuildInjectCredentialsGradle(workingDir);\n  await createEasBuildInjectCredentialsGradle(workingDir);\n  await addApplyInjectCredentialsConfigToBuildGradle(workingDir);\n  logger.info('Signing config injected');\n}\n\nexport async function injectConfigureVersionGradleConfig(\n  logger: bunyan,\n  workingDir: string,\n  { versionCode, versionName }: { versionCode: number; versionName: string }\n): Promise<void> {\n  logger.info('Injecting version config into build.gradle');\n  logger.info(`Version code: ${versionCode}`);\n  logger.info(`Version name: ${versionName}`);\n  await deleteEasBuildConfigureVersionGradle(workingDir);\n  await createEasBuildConfigureVersionGradle(workingDir, { versionCode, versionName });\n  await addApplyConfigureVersionConfigToBuildGradle(workingDir);\n  logger.info('Version config injected');\n}\n\nasync function deleteEasBuildInjectCredentialsGradle(workingDir: string): Promise<void> {\n  const targetPath = getEasBuildInjectCredentialsGradlePath(workingDir);\n  await fs.remove(targetPath);\n}\n\nasync function deleteEasBuildConfigureVersionGradle(workingDir: string): Promise<void> {\n  const targetPath = getEasBuildConfigureVersionGradlePath(workingDir);\n  await fs.remove(targetPath);\n}\n\nfunction getEasBuildInjectCredentialsGradlePath(workingDir: string): string {\n  return path.join(workingDir, 'android/app/eas-build-inject-android-credentials.gradle');\n}\n\nfunction getEasBuildConfigureVersionGradlePath(workingDir: string): string {\n  return path.join(workingDir, 'android/app/eas-build-configure-version.gradle');\n}\n\nasync function createEasBuildInjectCredentialsGradle(workingDir: string): Promise<void> {\n  const targetPath = getEasBuildInjectCredentialsGradlePath(workingDir);\n  await fs.copy(EAS_BUILD_INJECT_CREDENTIALS_GRADLE_TEMPLATE_PATH, targetPath);\n}\n\nasync function createEasBuildConfigureVersionGradle(\n  workingDir: string,\n  { versionCode, versionName }: { versionCode: number; versionName: string }\n): Promise<void> {\n  const targetPath = getEasBuildConfigureVersionGradlePath(workingDir);\n  await templateFile(\n    EAS_BUILD_CONFIGURE_VERSION_GRADLE_TEMPLATE_PATH,\n    {\n      VERSION_CODE: versionCode,\n      VERSION_NAME: versionName,\n    },\n    targetPath,\n    {\n      mustache: false,\n    }\n  );\n}\n\nasync function addApplyInjectCredentialsConfigToBuildGradle(projectRoot: string): Promise<void> {\n  const buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectRoot);\n  const buildGradleContents = await fs.readFile(path.join(buildGradlePath), 'utf8');\n\n  if (hasLine(buildGradleContents, APPLY_EAS_BUILD_INJECT_CREDENTIALS_GRADLE_LINE)) {\n    return;\n  }\n\n  await fs.writeFile(\n    buildGradlePath,\n    `${buildGradleContents.trim()}\\n${APPLY_EAS_BUILD_INJECT_CREDENTIALS_GRADLE_LINE}\\n`\n  );\n}\n\nasync function addApplyConfigureVersionConfigToBuildGradle(projectRoot: string): Promise<void> {\n  const buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectRoot);\n  const buildGradleContents = await fs.readFile(path.join(buildGradlePath), 'utf8');\n\n  if (hasLine(buildGradleContents, APPLY_EAS_BUILD_CONFIGURE_VERSION_GRADLE_LINE)) {\n    return;\n  }\n\n  await fs.writeFile(\n    buildGradlePath,\n    `${buildGradleContents.trim()}\\n${APPLY_EAS_BUILD_CONFIGURE_VERSION_GRADLE_LINE}\\n`\n  );\n}\n\nfunction hasLine(haystack: string, needle: string): boolean {\n  return (\n    haystack\n      .replace(/\\r\\n/g, '\\n')\n      .split('\\n')\n      // Check for both single and double quotes\n      .some((line) => line === needle || line === needle.replace(/\"/g, \"'\"))\n  );\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/build-tools",
-  "version": "1.0.30",
+  "version": "1.0.32",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -28,7 +28,7 @@
     "@expo/logger": "1.0.30",
     "@expo/package-manager": "^1.0.2",
     "@expo/plist": "^0.0.20",
-    "@expo/steps": "1.0.30",
+    "@expo/steps": "1.0.32",
     "@expo/template-file": "1.0.30",
     "@expo/turtle-spawn": "1.0.30",
     "@expo/xcpretty": "^4.2.2",
@@ -65,5 +65,5 @@
     "node": "18.13.0",
     "yarn": "1.22.19"
   },
-  "gitHead": "21dfc7673402b263d1a0af8df91cad411603d21d"
+  "gitHead": "8c5a3b94a25d25af83fd3edd26f0aa0f92899455"
 }

package/templates/eas-build-configure-version.gradle.template

@@ -0,0 +1,27 @@
+// Build integration with EAS
+
+import java.nio.file.Paths
+
+def versionCodeVal = "<%- VERSION_CODE %>"
+def versionNameVal = "<%- VERSION_NAME %>"
+
+android {
+  defaultConfig {
+    if (versionCodeVal) {
+      versionCode = Integer.parseInt(versionCodeVal)
+    }
+    if (versionNameVal) {
+      versionName = versionNameVal
+    }
+  }
+  applicationVariants.all { variant ->
+    variant.outputs.each { output ->
+      if (versionCodeVal) {
+        output.versionCodeOverride = Integer.parseInt(versionCodeVal)
+      }
+      if (versionNameVal) {
+        output.versionNameOverride = versionNameVal
+      }
+    }
+  }
+}

package/templates/eas-build-inject-android-credentials.gradle

@@ -0,0 +1,34 @@
+// Build integration with EAS
+
+import java.nio.file.Paths
+
+
+android {
+  signingConfigs {
+    release {
+      def credentialsJson = Paths.get(System.getenv("EAS_BUILD_WORKINGDIR")).resolve("credentials.json").toFile();
+      def credentials = new groovy.json.JsonSlurper().parse(credentialsJson)
+      def keystorePath = Paths.get(credentials.android.keystore.keystorePath);
+
+      storeFile keystorePath.toFile()
+      storePassword credentials.android.keystore.keystorePassword
+      keyAlias credentials.android.keystore.keyAlias
+      if (credentials.android.keystore.containsKey("keyPassword")) {
+        keyPassword credentials.android.keystore.keyPassword
+      } else {
+        // key password is required by Gradle, but PKCS keystores don't have one
+        // using the keystore password seems to satisfy the requirement
+        keyPassword credentials.android.keystore.keystorePassword
+      }
+    }
+  }
+
+  buildTypes {
+    release {
+      signingConfig android.signingConfigs.release
+    }
+    debug {
+      signingConfig android.signingConfigs.release
+    }
+  }
+}

package/dist/steps/functions/utils/runGradle.d.ts

@@ -1,4 +0,0 @@
-import { Job } from '@expo/eas-build-job';
-import { BuildFunction } from '@expo/steps';
-import { BuildContext } from '../../../context';
-export declare function createRunGradleBuildFunction<T extends Job>(ctx: BuildContext<T>): BuildFunction;

package/dist/steps/functions/utils/runGradle.js

@@ -1,33 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRunGradleBuildFunction = void 0;
-const steps_1 = require("@expo/steps");
-const nullthrows_1 = __importDefault(require("nullthrows"));
-const gradle_1 = require("../../../android/gradle");
-function createRunGradleBuildFunction(ctx) {
-    return new steps_1.BuildFunction({
-        namespace: 'utils',
-        id: 'run_gradle',
-        name: 'Run Gradle',
-        inputProviders: [
-            steps_1.BuildStepInput.createProvider({
-                id: 'gradle_command',
-                defaultValue: ':app:bundleRelease',
-                required: true,
-                allowedValueTypeName: steps_1.BuildStepInputValueTypeName.STRING,
-            }),
-        ],
-        fn: async (stepsCtx, { inputs }) => {
-            await (0, gradle_1.runGradleCommand)(ctx, {
-                logger: stepsCtx.logger,
-                gradleCommand: (0, nullthrows_1.default)(inputs.gradle_command.value).toString(),
-                androidDir: stepsCtx.workingDirectory,
-            });
-        },
-    });
-}
-exports.createRunGradleBuildFunction = createRunGradleBuildFunction;
-//# sourceMappingURL=runGradle.js.map

package/dist/steps/functions/utils/runGradle.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"runGradle.js","sourceRoot":"","sources":["../../../../src/steps/functions/utils/runGradle.ts"],"names":[],"mappings":";;;;;;AACA,uCAAyF;AACzF,4DAAoC;AAGpC,oDAA2D;AAE3D,SAAgB,4BAA4B,CAAgB,GAAoB;IAC9E,OAAO,IAAI,qBAAa,CAAC;QACvB,SAAS,EAAE,OAAO;QAClB,EAAE,EAAE,YAAY;QAChB,IAAI,EAAE,YAAY;QAClB,cAAc,EAAE;YACd,sBAAc,CAAC,cAAc,CAAC;gBAC5B,EAAE,EAAE,gBAAgB;gBACpB,YAAY,EAAE,oBAAoB;gBAClC,QAAQ,EAAE,IAAI;gBACd,oBAAoB,EAAE,mCAA2B,CAAC,MAAM;aACzD,CAAC;SACH;QACD,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;YACjC,MAAM,IAAA,yBAAgB,EAAC,GAAgC,EAAE;gBACvD,MAAM,EAAE,QAAQ,CAAC,MAAM;gBACvB,aAAa,EAAE,IAAA,oBAAU,EAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE;gBACjE,UAAU,EAAE,QAAQ,CAAC,gBAAgB;aACtC,CAAC,CAAC;QACL,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AArBD,oEAqBC","sourcesContent":["import { Android, Job } from '@expo/eas-build-job';\nimport { BuildFunction, BuildStepInput, BuildStepInputValueTypeName } from '@expo/steps';\nimport nullthrows from 'nullthrows';\n\nimport { BuildContext } from '../../../context';\nimport { runGradleCommand } from '../../../android/gradle';\n\nexport function createRunGradleBuildFunction<T extends Job>(ctx: BuildContext<T>): BuildFunction {\n  return new BuildFunction({\n    namespace: 'utils',\n    id: 'run_gradle',\n    name: 'Run Gradle',\n    inputProviders: [\n      BuildStepInput.createProvider({\n        id: 'gradle_command',\n        defaultValue: ':app:bundleRelease',\n        required: true,\n        allowedValueTypeName: BuildStepInputValueTypeName.STRING,\n      }),\n    ],\n    fn: async (stepsCtx, { inputs }) => {\n      await runGradleCommand(ctx as BuildContext<Android.Job>, {\n        logger: stepsCtx.logger,\n        gradleCommand: nullthrows(inputs.gradle_command.value).toString(),\n        androidDir: stepsCtx.workingDirectory,\n      });\n    },\n  });\n}\n"]}