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 {toPascalCase} from '../runAndroid/runOnAllDevices';
 import adb from '../runAndroid/adb';
 import getAdbPath from '../runAndroid/getAdbPath';
 import {startServerInNewWindow} from './startServerInNewWindow';
@@ -23,6 +23,21 @@ export interface BuildFlags {
   extraParams?: Array<string>;
 }
 
+export function getTaskNames(
+  appName: string,
+  mode: BuildFlags['mode'],
+  variant: BuildFlags['variant'],
+  tasks: BuildFlags['tasks'],
+  taskPrefix: 'assemble' | 'install',
+): Array<string> {
+  const appMode = mode || variant || 'debug';
+  const appTasks = tasks || [taskPrefix + toPascalCase(appMode)];
+
+  return appName
+    ? appTasks.map((command) => `${appName}:${command}`)
+    : appTasks;
+}
+
 export async function runPackager(args: BuildFlags, config: Config) {
   if (!args.packager) {
     return;
@@ -58,17 +73,19 @@ 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.mode,
+    args.variant,
+    args.tasks,
+    'assemble',
+  );
 
   if (args.extraParams) {
     gradleArgs = [...gradleArgs, ...args.extraParams];
@@ -117,7 +134,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,15 +16,7 @@ import tryLaunchAppOnDevice from './tryLaunchAppOnDevice';
 import tryLaunchEmulator from './tryLaunchEmulator';
 import tryInstallAppOnDevice from './tryInstallAppOnDevice';
 import {Flags} from '.';
-
-export function getTaskNames(
-  appName: string,
-  commands: Array<string>,
-): Array<string> {
-  return appName
-    ? commands.map((command) => `${appName}:${command}`)
-    : commands;
-}
+import {getTaskNames} from '../buildAndroid';
 
 export function toPascalCase(value: string) {
   return value !== '' ? value[0].toUpperCase() + value.slice(1) : value;
@@ -54,13 +46,21 @@ 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.mode,
+        args.variant,
+        args.tasks,
+        'install',
+      );
 
       if (args.extraParams) {
         gradleArgs = [...gradleArgs, ...args.extraParams];