Updated android home variable + doc (#1772)

src/common/projectVersionHelper.ts

@@ -36,6 +36,18 @@ export const REACT_NATIVE_PACKAGES: Record<string, ParsedPackage> = {
     },
 };
 
+export function RNPackageVersionsToPackageVersion(
+    packageVersions: RNPackageVersions,
+): PackageVersion[] {
+    const res: PackageVersion[] = [];
+    Object.keys(packageVersions).forEach(key => {
+        const item: PackageVersion = {};
+        item[key] = packageVersions[key];
+        res.push(item);
+    });
+    return res;
+}
+
 export class ProjectVersionHelper {
     private static SEMVER_INVALID = "SemverInvalid";
 

src/extension/commands/testDevEnvironment.ts

@@ -3,7 +3,11 @@
 
 import { ErrorHelper } from "../../common/error/errorHelper";
 import { InternalErrorCode } from "../../common/error/internalErrorCode";
-import { ProjectVersionHelper, REACT_NATIVE_PACKAGES } from "../../common/projectVersionHelper";
+import {
+    ProjectVersionHelper,
+    REACT_NATIVE_PACKAGES,
+    RNPackageVersionsToPackageVersion,
+} from "../../common/projectVersionHelper";
 import { AppLauncher } from "../appLauncher";
 import { RNProjectObserver } from "../rnProjectObserver";
 import { runChecks } from "../services/validationService/checker";
@@ -59,7 +63,13 @@ export class TestDevEnvironment extends Command {
             [ValidationCategoryE.macOS]:
                 (projectObserver && projectObserver.isRNMacosProject) || false,
         } as const;
-
-        await runChecks(shouldCheck);
+        if (project && projectObserver) {
+            await runChecks(
+                shouldCheck,
+                RNPackageVersionsToPackageVersion(projectObserver.rnPackageVersions),
+            );
+        } else {
+            await runChecks(shouldCheck);
+        }
     }
 }

src/extension/rnProjectObserver.ts

@@ -14,6 +14,7 @@ export class RNProjectObserver {
     private _isRNAndroidHermesProject: boolean;
     private _isRNIosHermesProject: boolean;
     private _isRNHermesProject: boolean;
+    private _rnPackageVersions: RNPackageVersions;
 
     constructor(projectRoot: string, rnPackageVersions: RNPackageVersions) {
         this._isRNMacosProject = false;
@@ -23,6 +24,7 @@ export class RNProjectObserver {
         this._isRNAndroidHermesProject = false;
         this._isRNIosHermesProject = false;
         this._isRNHermesProject = false;
+        this._rnPackageVersions = rnPackageVersions;
 
         this.initialize(projectRoot, rnPackageVersions);
     }
@@ -72,6 +74,10 @@ export class RNProjectObserver {
         return this._isRNAndroidHermesProject;
     }
 
+    public get rnPackageVersions(): RNPackageVersions {
+        return this._rnPackageVersions;
+    }
+
     public get isRNIosHermesProject(): boolean {
         return this._isRNIosHermesProject;
     }

src/extension/services/validationService/checker.ts

@@ -2,6 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for details.
 
 import * as nls from "vscode-nls";
+import { PackageVersion } from "../../../common/projectVersionHelper";
 import { OutputChannelLogger } from "../../log/OutputChannelLogger";
 import { getChecks } from "./checks";
 import { ValidationCategoryE, IValidation, ValidationResultT } from "./checks/types";
@@ -54,6 +55,7 @@ const statusToSymbol = {
 
 export const runChecks = async (
     options_?: Partial<Record<ValidationCategoryE, boolean>>,
+    versions?: PackageVersion[],
 ): Promise<void> => {
     const options = Object.assign(
         {
@@ -66,8 +68,9 @@ export const runChecks = async (
 
     outputChannel.setFocusOnLogChannel();
     outputChannel.info(toLocale("DevEnvVerificationStart", "Starting Environment check..."));
-
-    const checks = await evaluteChecks(getChecks().filter(it => options?.[it.category] === true));
+    const checks = await evaluteChecks(
+        getChecks(versions).filter(it => options?.[it.category] === true),
+    );
 
     let outStr = `<<< ${toLocale(
         "DevEnvVerificationHeader",

src/extension/services/validationService/checks/env.ts

@@ -17,10 +17,9 @@ const toLocale = nls.loadMessageBundle();
 const convertPathWithVars = (str: string) =>
     str.replace(/%([^%]+)%/g, (_, n) => process.env[n] || _);
 
-async function test(): Promise<ValidationResultT> {
-    const envVars = {
-        ANDROID_HOME: process.env.ANDROID_HOME,
-    };
+async function test(androidHomeVariableName: string = "ANDROID_HOME"): Promise<ValidationResultT> {
+    const envVars: Record<string, string | undefined> = {};
+    envVars[androidHomeVariableName] = process.env[androidHomeVariableName];
 
     const resolvedEnv = fromEntries(
         Object.entries(envVars).map(([key, val]) => [
@@ -43,7 +42,6 @@ async function test(): Promise<ValidationResultT> {
     const notFoundPath = Object.entries(resolvedEnv).find(
         ([, val]) => val.resolved && !fs.existsSync(val.resolved),
     )?.[0];
-
     if (notFoundPath) {
         return {
             status: "failure",
@@ -68,7 +66,7 @@ async function test(): Promise<ValidationResultT> {
 }
 
 const androidHome: IValidation = {
-    label: "ANDROID_HOME Env",
+    label: "Android Env",
     description: toLocale(
         "AndroidHomeEnvCheckDescription",
         "Required for launching React Native apps",

src/extension/services/validationService/checks/index.ts

@@ -5,7 +5,9 @@
 // https://www.npmjs.com/package/envinfo // does not list all required info
 // https://www.npmjs.com/package/command-exists // might find its use later on
 
+import * as semver from "semver";
 import { PromiseUtil } from "../../../../common/node/promise";
+import { PackageVersion } from "../../../../common/projectVersionHelper";
 import { adbAndroid, adbExpo } from "./adb";
 import cocoaPods from "./cocoaPods";
 import emulator from "./emulator";
@@ -28,10 +30,10 @@ import macos from "./macos";
 
 import { IValidation } from "./types";
 
-export const getChecks = (): IValidation[] => {
+export const getChecks = (versions: PackageVersion[] = []): IValidation[] => {
     // if some checks become obsolete (e.g. no need to check both npm and yarn) - write logic here
 
-    const checks = [
+    const checks: IValidation[] = [
         iosDeploy,
         adbAndroid,
         adbExpo,
@@ -53,7 +55,19 @@ export const getChecks = (): IValidation[] => {
         macos,
         xcodeBuild,
         xcodeBuildVersionRNmacOS,
-    ] as const;
+    ];
+
+    const rnVersionContainer = versions.find(it => Object.keys(it).includes("reactNativeVersion"));
+    if (
+        rnVersionContainer &&
+        semver.gte(rnVersionContainer.reactNativeVersion, "0.68.0") &&
+        ["linux", "darwin"].includes(process.platform)
+    ) {
+        const androidEnvCheck = checks.find(it => it.label === "Android Env");
+        if (androidEnvCheck) {
+            androidEnvCheck.exec = androidEnvCheck.exec.bind(null, "ANDROID_SDK_ROOT");
+        }
+    }
 
     checks.forEach(it => {
         it.exec = PromiseUtil.promiseCacheDecorator(it.exec);

test/extension/checkEnvironment.test.ts

@@ -103,6 +103,7 @@ suite("checkEnvironment", function () {
 
         const envVars = {
             ANDROID_HOME: process.env.ANDROID_HOME,
+            ANDROID_SDK_ROOT: process.env.ANDROID_SDK_ROOT,
         };
 
         const setEnv = (arg: string) => {

test/smoke/docs/run-locally.md

@@ -63,6 +63,7 @@ Add these lines to `~/.zshrc` (create one if it doesn't exist):
     export ANDROID_SDK_ROOT=$ANDROID_HOME
     PATH="$PATH:$ANDROID_HOME/emulator:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools/bin"
     ```
+   > Notice: since 0.68 version of React Native ```ANDROID_HOME``` has to be changed to ```ANDROID_SDK_ROOT``` for linux and macOS
    * **Linux**:
 Add these lines to `~/.bash_profile` (create one if it doesn't exist):
     ```bash
@@ -71,7 +72,7 @@ Add these lines to `~/.bash_profile` (create one if it doesn't exist):
     export ANDROID_SDK_ROOT=$ANDROID_HOME
     PATH="$PATH:$ANDROID_HOME/emulator:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools/bin"
     ```
-    > Notice: it's important to add $ANDROID_HOME/emulator before other paths because otherwise emulator will refuse to start from any directory but sdk ones.
+    > Notice: it's important to add $ANDROID_HOME/emulator before other paths because otherwise emulator will refuse to start from any directory but sdk ones
 1. (**Linux** only) Install **KVM** on your system and **reboot** your system.
    ```bash
    sudo apt install qemu-kvm