fix: use variant arg in build-android command

Author: adamTrz

docs/commands.md

@@ -323,6 +323,8 @@ Override the root directory for the Android build (which contains the android di
 
 #### `--variant <string>`
 
+> **DEPRECATED** – use "mode" instead
+
 > default: 'debug'
 
 Specify your app's build variant.

packages/cli-platform-android/src/commands/buildAndroid/index.ts

@@ -7,7 +7,7 @@ import {
 import {Config} from '@react-native-community/cli-types';
 import execa from 'execa';
 import {getAndroidProject} from '../../config/getAndroidProject';
-import {getTaskNames, toPascalCase} from '../runAndroid/runOnAllDevices';
+import {getTaskNames} from '../runAndroid/runOnAllDevices';
 import adb from '../runAndroid/adb';
 import getAdbPath from '../runAndroid/getAdbPath';
 import {startServerInNewWindow} from './startServerInNewWindow';
@@ -58,17 +58,13 @@ async function buildAndroid(
     );
   }
 
-  const mode = args.variant || args.mode;
-
   if (args.tasks && args.mode) {
     logger.warn(
       'Both "tasks" and "mode" parameters were passed to "build" command. Using "tasks" for building the app.',
     );
   }
 
-  const tasks = args.tasks || ['assemble' + toPascalCase(mode)];
-
-  let gradleArgs = getTaskNames(androidProject.appName, tasks);
+  let gradleArgs = getTaskNames(androidProject.appName, args, 'assemble');
 
   if (args.extraParams) {
     gradleArgs = [...gradleArgs, ...args.extraParams];
@@ -117,7 +113,6 @@ export const options = [
   {
     name: '--mode <string>',
     description: "Specify your app's build variant",
-    default: 'debug',
   },
   {
     name: '--variant <string>',

packages/cli-platform-android/src/commands/runAndroid/runOnAllDevices.ts

@@ -16,14 +16,17 @@ import tryLaunchAppOnDevice from './tryLaunchAppOnDevice';
 import tryLaunchEmulator from './tryLaunchEmulator';
 import tryInstallAppOnDevice from './tryInstallAppOnDevice';
 import {Flags} from '.';
+import {BuildFlags} from '../buildAndroid';
 
 export function getTaskNames(
   appName: string,
-  commands: Array<string>,
+  args: BuildFlags,
+  taskPrefix: 'assemble' | 'install',
 ): Array<string> {
-  return appName
-    ? commands.map((command) => `${appName}:${command}`)
-    : commands;
+  const mode = args.mode || args.variant || 'debug';
+  const tasks = args.tasks || [taskPrefix + toPascalCase(mode)];
+
+  return appName ? tasks.map((command) => `${appName}:${command}`) : tasks;
 }
 
 export function toPascalCase(value: string) {
@@ -54,13 +57,15 @@ async function runOnAllDevices(
       );
     }
   }
+  if (args.variant) {
+    logger.warn(
+      '"variant" flag is deprecated and will be removed in future release. Please switch to "mode" flag.',
+    );
+  }
 
   try {
     if (!args.binaryPath) {
-      const tasks = args.tasks || [
-        'install' + toPascalCase(args.mode ?? 'debug'),
-      ];
-      let gradleArgs = getTaskNames(androidProject.appName, tasks);
+      let gradleArgs = getTaskNames(androidProject.appName, args, 'install');
 
       if (args.extraParams) {
         gradleArgs = [...gradleArgs, ...args.extraParams];