Set Android versions even if no credentials are being provided

packages/build-tools/src/builders/android.ts

@@ -16,10 +16,13 @@ import {
 import { uploadApplicationArchive } from '../utils/artifacts';
 import { Hook, runHookIfPresent } from '../utils/hooks';
 import { restoreCredentials } from '../android/credentials';
-import { configureBuildGradle } from '../android/gradleConfig';
 import { setupAsync } from '../common/setup';
 import { prebuildAsync } from '../common/prebuild';
 import { prepareExecutableAsync } from '../utils/prepareBuildExecutable';
+import {
+  injectConfigureVersionGradleConfig,
+  injectCredentialsGradleConfig,
+} from '../steps/utils/android/gradleConfig';
 
 import { runBuilderWithHooksAsync } from './common';
 import { runCustomBuildAsync } from './custom';
@@ -88,9 +91,23 @@ async function buildAsync(ctx: BuildContext<Android.Job>): Promise<void> {
   ) {
     await ctx.runBuildPhase(BuildPhase.PREPARE_CREDENTIALS, async () => {
       await restoreCredentials(ctx);
-      await configureBuildGradle(ctx);
+      await injectCredentialsGradleConfig(ctx.logger, ctx.getReactNativeProjectDirectory());
     });
   }
+
+  if (Boolean(ctx.job.version?.versionCode) || Boolean(ctx.job.version?.versionName)) {
+    await ctx.runBuildPhase(
+      BuildPhase.CUSTOM,
+      async () => {
+        await injectConfigureVersionGradleConfig(ctx.logger, ctx.getReactNativeProjectDirectory(), {
+          versionCode: ctx.job.version?.versionCode,
+          versionName: ctx.job.version?.versionName,
+        });
+      },
+      {}
+    );
+  }
+
   await ctx.runBuildPhase(BuildPhase.CONFIGURE_EXPO_UPDATES, async () => {
     await configureExpoUpdatesIfInstalledAsync(ctx, {
       resolvedRuntimeVersion: resolvedExpoUpdatesRuntimeVersion?.runtimeVersion ?? null,

packages/build-tools/src/context.ts

@@ -178,14 +178,16 @@ export class BuildContext<TJob extends Job = Job> {
     {
       doNotMarkStart = false,
       doNotMarkEnd = false,
+      phaseDisplayName,
     }: {
       doNotMarkStart?: boolean;
       doNotMarkEnd?: boolean;
+      phaseDisplayName?: string;
     } = {}
   ): Promise<T> {
     let startTimestamp = Date.now();
     try {
-      this.setBuildPhase(buildPhase, { doNotMarkStart });
+      this.setBuildPhase(buildPhase, { doNotMarkStart, phaseDisplayName });
       startTimestamp = Date.now();
       const result = await phase();
       const durationMs = Date.now() - startTimestamp;
@@ -286,7 +288,13 @@ export class BuildContext<TJob extends Job = Job> {
     return path.join(baseDirectory, this.job.projectRootDirectory ?? '.');
   }
 
-  private setBuildPhase(buildPhase: BuildPhase, { doNotMarkStart = false } = {}): void {
+  private setBuildPhase(
+    buildPhase: BuildPhase,
+    {
+      doNotMarkStart = false,
+      phaseDisplayName,
+    }: { doNotMarkStart?: boolean; phaseDisplayName?: string } = {}
+  ): void {
     if (this.buildPhase) {
       if (this.buildPhase === buildPhase) {
         return;
@@ -299,7 +307,9 @@ export class BuildContext<TJob extends Job = Job> {
       }
     }
     this.buildPhase = buildPhase;
-    this.logger = this.defaultLogger.child({ phase: buildPhase });
+    this.logger = this.defaultLogger.child({
+      phase: phaseDisplayName ?? buildPhase,
+    });
     if (!doNotMarkStart) {
       this.logger.info({ marker: LogMarker.START_PHASE }, `Start phase: ${this.buildPhase}`);
     }