@akylas/nativescript-cli 8.7.2 → 8.8.3

package/lib/services/android-plugin-build-service.js

@@ -5,15 +5,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AndroidPluginBuildService = void 0;
 const path = require("path");
@@ -23,15 +14,17 @@ const xml2js_1 = require("xml2js");
 const yok_1 = require("../common/yok");
 const _ = require("lodash");
 const resolve_package_path_1 = require("@rigor789/resolve-package-path");
+const process_1 = require("process");
 class AndroidPluginBuildService {
     get $platformsDataService() {
         return this.$injector.resolve("platformsDataService");
     }
-    constructor($fs, $childProcess, $hostInfo, $androidToolsInfo, $logger, $packageManager, $projectData, $projectDataService, $devicePlatformsConstants, $errors, $filesHashService, $hooksService, $injector, $watchIgnoreListService) {
+    constructor($fs, $childProcess, $androidToolsInfo, $hostInfo, $options, $logger, $packageManager, $projectData, $projectDataService, $devicePlatformsConstants, $errors, $filesHashService, $hooksService, $injector, $watchIgnoreListService) {
         this.$fs = $fs;
         this.$childProcess = $childProcess;
-        this.$hostInfo = $hostInfo;
         this.$androidToolsInfo = $androidToolsInfo;
+        this.$hostInfo = $hostInfo;
+        this.$options = $options;
         this.$logger = $logger;
         this.$packageManager = $packageManager;
         this.$projectData = $projectData;
@@ -59,25 +52,23 @@ class AndroidPluginBuildService {
         const manifest = path.join(platformsDir, constants_1.MANIFEST_FILE_NAME);
         return this.$fs.exists(manifest) ? manifest : null;
     }
-    updateManifestContent(oldManifestContent, defaultPackageName) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let xml = yield this.getXml(oldManifestContent);
-            let packageName = defaultPackageName;
-            if (xml["manifest"]) {
-                if (xml["manifest"]["$"]["package"]) {
-                    packageName = xml["manifest"]["$"]["package"];
-                }
-                xml = xml["manifest"];
-            }
-            const newManifest = { manifest: {} };
-            for (const prop in xml) {
-                newManifest.manifest[prop] = xml[prop];
+    async updateManifestContent(oldManifestContent, defaultPackageName) {
+        let xml = await this.getXml(oldManifestContent);
+        let packageName = defaultPackageName;
+        if (xml["manifest"]) {
+            if (xml["manifest"]["$"]["package"]) {
+                packageName = xml["manifest"]["$"]["package"];
             }
-            newManifest.manifest["$"]["package"] = packageName;
-            const xmlBuilder = new xml2js_1.Builder();
-            const newManifestContent = xmlBuilder.buildObject(newManifest);
-            return newManifestContent;
-        });
+            xml = xml["manifest"];
+        }
+        const newManifest = { manifest: {} };
+        for (const prop in xml) {
+            newManifest.manifest[prop] = xml[prop];
+        }
+        newManifest.manifest["$"]["package"] = packageName;
+        const xmlBuilder = new xml2js_1.Builder();
+        const newManifestContent = xmlBuilder.buildObject(newManifest);
+        return newManifestContent;
     }
     createManifestContent(packageName) {
         const newManifest = {
@@ -88,18 +79,16 @@ class AndroidPluginBuildService {
         const newManifestContent = xmlBuilder.buildObject(newManifest);
         return newManifestContent;
     }
-    getXml(stringContent) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const promise = new Promise((resolve, reject) => (0, xml2js_1.parseString)(stringContent, (err, result) => {
-                if (err) {
-                    reject(err);
-                }
-                else {
-                    resolve(result);
-                }
-            }));
-            return promise;
-        });
+    async getXml(stringContent) {
+        const promise = new Promise((resolve, reject) => (0, xml2js_1.parseString)(stringContent, (err, result) => {
+            if (err) {
+                reject(err);
+            }
+            else {
+                resolve(result);
+            }
+        }));
+        return promise;
     }
     getScope(scopeName, content) {
         const indexOfScopeName = content.indexOf(scopeName);
@@ -128,42 +117,40 @@ class AndroidPluginBuildService {
         }
         return result;
     }
-    buildAar(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.validateOptions(options);
-            const manifestFilePath = this.getManifest(options.platformsAndroidDirPath);
-            const androidSourceDirectories = this.getAndroidSourceDirectories(options.platformsAndroidDirPath);
-            const shortPluginName = (0, helpers_1.getShortPluginName)(options.pluginName);
-            const pluginTempDir = path.join(options.tempPluginDirPath, shortPluginName);
-            const pluginSourceFileHashesInfo = yield this.getSourceFilesHashes(options.platformsAndroidDirPath, shortPluginName);
-            const shouldBuildAar = yield this.shouldBuildAar({
-                manifestFilePath,
-                androidSourceDirectories,
-                pluginTempDir,
-                pluginSourceDir: options.platformsAndroidDirPath,
-                shortPluginName,
-                fileHashesInfo: pluginSourceFileHashesInfo,
-            });
-            if (shouldBuildAar) {
-                this.cleanPluginDir(pluginTempDir);
-                const pluginTempMainSrcDir = path.join(pluginTempDir, "src", "main");
-                yield this.updateManifest(manifestFilePath, pluginTempMainSrcDir, shortPluginName);
-                this.copySourceSetDirectories(androidSourceDirectories, pluginTempMainSrcDir);
-                yield this.setupGradle(pluginTempDir, options.platformsAndroidDirPath, options.projectDir, options.pluginName);
-                const gradleArgs = (this.$projectData.nsConfig.android.gradleArgs || [].concat(options.gradleArgs || []));
-                yield this.buildPlugin({
-                    gradlePath: options.gradlePath,
-                    gradleArgs,
-                    pluginDir: pluginTempDir,
-                    pluginName: options.pluginName,
-                    projectDir: options.projectDir,
-                });
-                this.$watchIgnoreListService.addFileToIgnoreList(path.join(options.aarOutputDir, `${shortPluginName}.aar`));
-                this.copyAar(shortPluginName, pluginTempDir, options.aarOutputDir);
-                this.writePluginHashInfo(pluginSourceFileHashesInfo, pluginTempDir);
-            }
-            return shouldBuildAar;
+    async buildAar(options) {
+        this.validateOptions(options);
+        const manifestFilePath = this.getManifest(options.platformsAndroidDirPath);
+        const androidSourceDirectories = this.getAndroidSourceDirectories(options.platformsAndroidDirPath);
+        const shortPluginName = (0, helpers_1.getShortPluginName)(options.pluginName + (options.aarSuffix || ''));
+        const pluginTempDir = path.join(options.tempPluginDirPath, shortPluginName);
+        const pluginSourceFileHashesInfo = await this.getSourceFilesHashes(options.platformsAndroidDirPath, shortPluginName);
+        const shouldBuildAar = await this.shouldBuildAar({
+            manifestFilePath,
+            androidSourceDirectories,
+            pluginTempDir,
+            pluginSourceDir: options.platformsAndroidDirPath,
+            shortPluginName,
+            fileHashesInfo: pluginSourceFileHashesInfo,
         });
+        if (shouldBuildAar) {
+            this.cleanPluginDir(pluginTempDir);
+            const pluginTempMainSrcDir = path.join(pluginTempDir, "src", "main");
+            await this.updateManifest(manifestFilePath, pluginTempMainSrcDir, shortPluginName);
+            this.copySourceSetDirectories(androidSourceDirectories, pluginTempMainSrcDir);
+            await this.setupGradle(pluginTempDir, options.platformsAndroidDirPath, options.projectDir, options.pluginName);
+            const gradleArgs = (this.$projectData.nsConfig.android.gradleArgs || []).concat(options.gradleArgs || []);
+            await this.buildPlugin({
+                gradlePath: options.gradlePath,
+                gradleArgs,
+                pluginDir: pluginTempDir,
+                pluginName: options.pluginName,
+                projectDir: options.projectDir,
+            });
+            this.$watchIgnoreListService.addFileToIgnoreList(path.join(options.aarOutputDir, `${shortPluginName}.aar`));
+            this.copyAar(shortPluginName, pluginTempDir, options.aarOutputDir);
+            this.writePluginHashInfo(pluginSourceFileHashesInfo, pluginTempDir);
+        }
+        return shouldBuildAar;
     }
     cleanPluginDir(pluginTempDir) {
         this.$fs.deleteDirectory(pluginTempDir);
@@ -178,50 +165,46 @@ class AndroidPluginBuildService {
         const buildDataFile = this.getPathToPluginBuildDataFile(pluginTempDir);
         this.$fs.writeJson(buildDataFile, fileHashesInfo);
     }
-    shouldBuildAar(opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let shouldBuildAar = !!opts.manifestFilePath || !!opts.androidSourceDirectories.length;
-            if (shouldBuildAar &&
-                this.$fs.exists(opts.pluginTempDir) &&
-                this.$fs.exists(path.join(opts.pluginSourceDir, `${opts.shortPluginName}.aar`))) {
-                const buildDataFile = this.getPathToPluginBuildDataFile(opts.pluginTempDir);
-                if (this.$fs.exists(buildDataFile)) {
-                    const oldHashes = this.$fs.readJson(buildDataFile);
-                    shouldBuildAar = this.$filesHashService.hasChangesInShasums(oldHashes, opts.fileHashesInfo);
-                }
+    async shouldBuildAar(opts) {
+        let shouldBuildAar = !!opts.manifestFilePath || !!opts.androidSourceDirectories.length;
+        if (shouldBuildAar &&
+            this.$fs.exists(opts.pluginTempDir) &&
+            this.$fs.exists(path.join(opts.pluginSourceDir, `${opts.shortPluginName}.aar`))) {
+            const buildDataFile = this.getPathToPluginBuildDataFile(opts.pluginTempDir);
+            if (this.$fs.exists(buildDataFile)) {
+                const oldHashes = this.$fs.readJson(buildDataFile);
+                shouldBuildAar = this.$filesHashService.hasChangesInShasums(oldHashes, opts.fileHashesInfo);
             }
-            return shouldBuildAar;
-        });
+        }
+        return shouldBuildAar;
     }
     getPathToPluginBuildDataFile(pluginDir) {
         return path.join(pluginDir, constants_1.PLUGIN_BUILD_DATA_FILENAME);
     }
-    updateManifest(manifestFilePath, pluginTempMainSrcDir, shortPluginName) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let updatedManifestContent;
-            this.$fs.ensureDirectoryExists(pluginTempMainSrcDir);
-            const defaultPackageName = "org.nativescript." + shortPluginName;
-            if (manifestFilePath) {
-                let androidManifestContent;
-                try {
-                    androidManifestContent = this.$fs.readText(manifestFilePath);
-                }
-                catch (err) {
-                    this.$errors.fail(`Failed to fs.readFileSync the manifest file located at ${manifestFilePath}. Error is: ${err.toString()}`);
-                }
-                updatedManifestContent = yield this.updateManifestContent(androidManifestContent, defaultPackageName);
-            }
-            else {
-                updatedManifestContent = this.createManifestContent(defaultPackageName);
-            }
-            const pathToTempAndroidManifest = path.join(pluginTempMainSrcDir, constants_1.MANIFEST_FILE_NAME);
+    async updateManifest(manifestFilePath, pluginTempMainSrcDir, shortPluginName) {
+        let updatedManifestContent;
+        this.$fs.ensureDirectoryExists(pluginTempMainSrcDir);
+        const defaultPackageName = "org.nativescript." + shortPluginName;
+        if (manifestFilePath) {
+            let androidManifestContent;
             try {
-                this.$fs.writeFile(pathToTempAndroidManifest, updatedManifestContent);
+                androidManifestContent = this.$fs.readText(manifestFilePath);
             }
-            catch (e) {
-                this.$errors.fail(`Failed to write the updated AndroidManifest in the new location - ${pathToTempAndroidManifest}. Error is: ${e.toString()}`);
+            catch (err) {
+                this.$errors.fail(`Failed to fs.readFileSync the manifest file located at ${manifestFilePath}. Error is: ${err.toString()}`);
             }
-        });
+            updatedManifestContent = await this.updateManifestContent(androidManifestContent, defaultPackageName);
+        }
+        else {
+            updatedManifestContent = this.createManifestContent(defaultPackageName);
+        }
+        const pathToTempAndroidManifest = path.join(pluginTempMainSrcDir, constants_1.MANIFEST_FILE_NAME);
+        try {
+            this.$fs.writeFile(pathToTempAndroidManifest, updatedManifestContent);
+        }
+        catch (e) {
+            this.$errors.fail(`Failed to write the updated AndroidManifest in the new location - ${pathToTempAndroidManifest}. Error is: ${e.toString()}`);
+        }
     }
     copySourceSetDirectories(androidSourceSetDirectories, pluginTempMainSrcDir) {
         for (const dir of androidSourceSetDirectories) {
@@ -243,67 +226,72 @@ class AndroidPluginBuildService {
         }
         return namespace;
     }
-    setupGradle(pluginTempDir, platformsAndroidDirPath, projectDir, pluginName) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const gradleTemplatePath = path.resolve(path.join(__dirname, "../../vendor/gradle-plugin"));
-            const allGradleTemplateFiles = path.join(gradleTemplatePath, "*");
-            const buildGradlePath = path.join(pluginTempDir, "build.gradle");
-            const settingsGradlePath = path.join(pluginTempDir, "settings.gradle");
-            this.$fs.copyFile(allGradleTemplateFiles, pluginTempDir);
-            const runtimeGradleVersions = yield this.getRuntimeGradleVersions(projectDir);
-            let gradleVersion = runtimeGradleVersions.gradleVersion;
-            if (this.$projectData.nsConfig.android.gradleVersion) {
-                gradleVersion = this.$projectData.nsConfig.android.gradleVersion;
-            }
-            this.replaceGradleVersion(pluginTempDir, gradleVersion);
-            this.replaceGradleAndroidPluginVersion(buildGradlePath, runtimeGradleVersions.gradleAndroidPluginVersion);
-            const manifestFilePath = this.getManifest(path.join(pluginTempDir, "src", "main"));
-            let pluginNamespace = this.extractNamespaceFromManifest(manifestFilePath);
-            if (!pluginNamespace) {
-                pluginNamespace = pluginName.replace(/@/g, "").replace(/[/-]/g, ".");
+    async setupGradle(pluginTempDir, platformsAndroidDirPath, projectDir, pluginName) {
+        const gradleTemplatePath = path.resolve(path.join(__dirname, "../../vendor/gradle-plugin"));
+        const allGradleTemplateFiles = path.join(gradleTemplatePath, "*");
+        const buildGradlePath = path.join(pluginTempDir, "build.gradle");
+        const settingsGradlePath = path.join(pluginTempDir, "settings.gradle");
+        this.$fs.copyFile(allGradleTemplateFiles, pluginTempDir);
+        const runtimeGradleVersions = await this.getRuntimeGradleVersions(projectDir);
+        let gradleVersion = runtimeGradleVersions.gradleVersion;
+        if (this.$projectData.nsConfig.android.gradleVersion) {
+            gradleVersion = this.$projectData.nsConfig.android.gradleVersion;
+        }
+        this.replaceGradleVersion(pluginTempDir, gradleVersion);
+        this.replaceGradleAndroidPluginVersion(buildGradlePath, runtimeGradleVersions.gradleAndroidPluginVersion);
+        const manifestFilePath = this.getManifest(path.join(pluginTempDir, "src", "main"));
+        let pluginNamespace = this.extractNamespaceFromManifest(manifestFilePath);
+        if (!pluginNamespace) {
+            pluginNamespace = pluginName.replace(/@/g, "").replace(/[/-]/g, ".");
+        }
+        this.replaceFileContent(buildGradlePath, "{{pluginNamespace}}", pluginNamespace);
+        this.replaceFileContent(buildGradlePath, "{{pluginName}}", pluginName);
+        this.replaceFileContent(settingsGradlePath, "{{pluginName}}", pluginName);
+        const shortPluginName = (0, helpers_1.getShortPluginName)(pluginName);
+        const manifestPath = path.join(pluginTempDir, "src", "main", "AndroidManifest.xml");
+        const manifestContent = this.$fs.readText(manifestPath);
+        let packageName = `org.nativescript.${shortPluginName}`;
+        const xml = await this.getXml(manifestContent);
+        if (xml["manifest"]) {
+            if (xml["manifest"]["$"]["package"]) {
+                packageName = xml["manifest"]["$"]["package"];
             }
-            this.replaceFileContent(buildGradlePath, "{{pluginNamespace}}", pluginNamespace);
-            this.replaceFileContent(buildGradlePath, "{{pluginName}}", pluginName);
-            this.replaceFileContent(settingsGradlePath, "{{pluginName}}", pluginName);
-        });
+        }
+        this.replaceFileContent(buildGradlePath, "{{pluginNamespace}}", packageName);
     }
-    getRuntimeGradleVersions(projectDir) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let runtimeGradleVersions = null;
-            if (projectDir) {
-                const projectData = this.$projectDataService.getProjectData(projectDir);
-                const platformData = this.$platformsDataService.getPlatformData(this.$devicePlatformsConstants.Android, projectData);
-                const projectRuntimeVersion = platformData.platformProjectService.getFrameworkVersion(projectData);
-                runtimeGradleVersions = yield this.getGradleVersions(projectRuntimeVersion);
-                this.$logger.trace(`Got gradle versions ${JSON.stringify(runtimeGradleVersions)} from runtime v${projectRuntimeVersion}`);
-            }
-            if (!runtimeGradleVersions) {
-                const latestRuntimeVersion = yield this.getLatestRuntimeVersion();
-                runtimeGradleVersions = yield this.getGradleVersions(latestRuntimeVersion);
-                this.$logger.trace(`Got gradle versions ${JSON.stringify(runtimeGradleVersions)} from the latest runtime v${latestRuntimeVersion}`);
-            }
-            return runtimeGradleVersions || {};
-        });
+    async getRuntimeGradleVersions(projectDir) {
+        let runtimeGradleVersions = null;
+        if (projectDir) {
+            const projectData = this.$projectDataService.getProjectData(projectDir);
+            const platformData = this.$platformsDataService.getPlatformData(this.$devicePlatformsConstants.Android, projectData);
+            const projectRuntimeVersion = platformData.platformProjectService.getFrameworkVersion(projectData);
+            runtimeGradleVersions = await this.getGradleVersions(projectRuntimeVersion);
+            this.$logger.trace(`Got gradle versions ${JSON.stringify(runtimeGradleVersions)} from runtime v${projectRuntimeVersion}`);
+        }
+        if (!runtimeGradleVersions) {
+            const latestRuntimeVersion = await this.getLatestRuntimeVersion();
+            runtimeGradleVersions = await this.getGradleVersions(latestRuntimeVersion);
+            this.$logger.trace(`Got gradle versions ${JSON.stringify(runtimeGradleVersions)} from the latest runtime v${latestRuntimeVersion}`);
+        }
+        return runtimeGradleVersions || {};
     }
-    getLatestRuntimeVersion() {
+    async getLatestRuntimeVersion() {
         var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            let runtimeVersion = null;
-            const packageName = ((_a = this.$projectData.nsConfig.android) === null || _a === void 0 ? void 0 : _a.runtimePackageName) || constants_1.SCOPED_ANDROID_RUNTIME_NAME;
-            try {
-                let result = yield this.$packageManager.view(packageName, {
-                    "dist-tags": true,
-                });
-                result = (_b = result === null || result === void 0 ? void 0 : result["dist-tags"]) !== null && _b !== void 0 ? _b : result;
-                runtimeVersion = result.latest;
-            }
-            catch (err) {
-                this.$logger.trace(`Error while getting latest android runtime version from view command: ${err}`);
-                const registryData = yield this.$packageManager.getRegistryPackageData(packageName);
-                runtimeVersion = registryData["dist-tags"].latest;
-            }
-            return runtimeVersion;
-        });
+        let runtimeVersion = null;
+        const packageName = ((_a = this.$projectData.nsConfig.android) === null || _a === void 0 ? void 0 : _a.runtimePackageName) || constants_1.SCOPED_ANDROID_RUNTIME_NAME;
+        try {
+            let result = await this.$packageManager.view(packageName, {
+                "dist-tags": true,
+            });
+            result = (_b = result === null || result === void 0 ? void 0 : result["dist-tags"]) !== null && _b !== void 0 ? _b : result;
+            runtimeVersion = result.latest;
+        }
+        catch (err) {
+            this.$logger.trace(`Error while getting latest android runtime version from view command: ${err}`);
+            const registryData = await this.$packageManager.getRegistryPackageData(packageName);
+            runtimeVersion = registryData["dist-tags"].latest;
+        }
+        return runtimeVersion;
     }
     getLocalGradleVersions() {
         var _a;
@@ -334,37 +322,35 @@ class AndroidPluginBuildService {
         }
         return null;
     }
-    getGradleVersions(runtimeVersion) {
+    async getGradleVersions(runtimeVersion) {
         var _a, _b, _c;
-        return __awaiter(this, void 0, void 0, function* () {
-            let runtimeGradleVersions = null;
-            const localVersionInfo = this.getLocalGradleVersions();
-            if (localVersionInfo) {
-                return localVersionInfo;
-            }
-            const packageName = ((_a = this.$projectData.nsConfig.android) === null || _a === void 0 ? void 0 : _a.runtimePackageName) || constants_1.SCOPED_ANDROID_RUNTIME_NAME;
-            try {
-                let output = yield this.$packageManager.view(`${packageName}@${runtimeVersion}`, { version_info: true });
-                output = (_b = output === null || output === void 0 ? void 0 : output["version_info"]) !== null && _b !== void 0 ? _b : output;
-                if (!output) {
-                    output = yield this.$packageManager.view(`${packageName}@${runtimeVersion}`, { gradle: true });
-                    output = (_c = output === null || output === void 0 ? void 0 : output["gradle"]) !== null && _c !== void 0 ? _c : output;
-                    const { version, android } = output;
-                    output = {
-                        gradle: version,
-                        gradleAndroid: android,
-                    };
-                }
-                runtimeGradleVersions = { versions: output };
-            }
-            catch (err) {
-                this.$logger.trace(`Error while getting gradle data for android runtime from view command: ${err}`);
-                const registryData = yield this.$packageManager.getRegistryPackageData(packageName);
-                runtimeGradleVersions = registryData.versions[runtimeVersion];
+        let runtimeGradleVersions = null;
+        const localVersionInfo = this.getLocalGradleVersions();
+        if (localVersionInfo) {
+            return localVersionInfo;
+        }
+        const packageName = ((_a = this.$projectData.nsConfig.android) === null || _a === void 0 ? void 0 : _a.runtimePackageName) || constants_1.SCOPED_ANDROID_RUNTIME_NAME;
+        try {
+            let output = await this.$packageManager.view(`${packageName}@${runtimeVersion}`, { version_info: true });
+            output = (_b = output === null || output === void 0 ? void 0 : output["version_info"]) !== null && _b !== void 0 ? _b : output;
+            if (!output) {
+                output = await this.$packageManager.view(`${packageName}@${runtimeVersion}`, { gradle: true });
+                output = (_c = output === null || output === void 0 ? void 0 : output["gradle"]) !== null && _c !== void 0 ? _c : output;
+                const { version, android } = output;
+                output = {
+                    gradle: version,
+                    gradleAndroid: android,
+                };
             }
-            const result = this.getGradleVersionsCore(runtimeGradleVersions);
-            return result;
-        });
+            runtimeGradleVersions = { versions: output };
+        }
+        catch (err) {
+            this.$logger.trace(`Error while getting gradle data for android runtime from view command: ${err}`);
+            const registryData = await this.$packageManager.getRegistryPackageData(packageName);
+            runtimeGradleVersions = registryData.versions[runtimeVersion];
+        }
+        const result = this.getGradleVersionsCore(runtimeGradleVersions);
+        return result;
     }
     getGradleVersionsCore(packageData) {
         const packageJsonGradle = packageData && packageData.versions;
@@ -440,56 +426,56 @@ class AndroidPluginBuildService {
         }
         return false;
     }
-    buildPlugin(pluginBuildSettings) {
+    async buildPlugin(pluginBuildSettings) {
         var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!pluginBuildSettings.androidToolsInfo) {
-                this.$androidToolsInfo.validateInfo({
-                    showWarningsAsErrors: true,
-                    validateTargetSdk: true,
-                    projectDir: pluginBuildSettings.projectDir,
-                });
-                pluginBuildSettings.androidToolsInfo =
-                    this.$androidToolsInfo.getToolsInfo({
-                        projectDir: pluginBuildSettings.projectDir,
-                    });
-            }
-            const gradlew = (_a = pluginBuildSettings.gradlePath) !== null && _a !== void 0 ? _a : (this.$hostInfo.isWindows ? "gradlew.bat" : "./gradlew");
-            const localArgs = [
-                "-p",
-                pluginBuildSettings.pluginDir,
-                "assembleRelease",
-                `-PtempBuild=true`,
-                `-PcompileSdk=android-${pluginBuildSettings.androidToolsInfo.compileSdkVersion}`,
-                `-PbuildToolsVersion=${pluginBuildSettings.androidToolsInfo.buildToolsVersion}`,
-                `-PprojectRoot=${this.$projectData.projectDir}`,
-                `-DprojectRoot=${this.$projectData.projectDir}`,
-                `-PappPath=${this.$projectData.getAppDirectoryPath()}`,
-                `-PappBuildPath=${this.$projectData.getBuildRelativeDirectoryPath()}`,
-                `-DappBuildPath=${this.$projectData.getBuildRelativeDirectoryPath()}`,
-                `-PappResourcesPath=${this.$projectData.getAppResourcesDirectoryPath()}`,
-            ];
-            if (pluginBuildSettings.gradleArgs) {
-                const additionalArgs = [];
-                pluginBuildSettings.gradleArgs.forEach((arg) => {
-                    additionalArgs.push(...arg.split(" -P").map((a, i) => (i === 0 ? a : `-P${a}`)));
-                });
-                localArgs.push(...additionalArgs);
-            }
-            if (this.$logger.getLevel() === "INFO") {
-                localArgs.push("--quiet");
-            }
-            try {
-                yield this.$childProcess.spawnFromEvent(gradlew, localArgs, "close", {
-                    cwd: pluginBuildSettings.pluginDir,
-                    stdio: "inherit",
-                    shell: this.$hostInfo.isWindows,
-                });
-            }
-            catch (err) {
-                this.$errors.fail(`Failed to build plugin ${pluginBuildSettings.pluginName} : \n${err}`);
-            }
+        const gradlew = (_a = pluginBuildSettings.gradlePath) !== null && _a !== void 0 ? _a : (this.$hostInfo.isWindows ? "gradlew.bat" : "./gradlew");
+        const toolsInfo = this.$androidToolsInfo.getToolsInfo({
+            projectDir: this.$projectData.projectDir,
         });
+        const localArgs = [
+            "-p",
+            pluginBuildSettings.pluginDir,
+            "assembleRelease",
+            `-PtempBuild=true`,
+            `-PcompileSdk=${toolsInfo.compileSdkVersion}`,
+            `-PbuildToolsVersion=${toolsInfo.buildToolsVersion}`,
+            `-PprojectRoot=${this.$projectData.projectDir}`,
+            `-DprojectRoot=${this.$projectData.projectDir}`,
+            `-PappPath=${this.$projectData.getAppDirectoryPath()}`,
+            `-PappBuildPath=${this.$projectData.getBuildRelativeDirectoryPath()}`,
+            `-DappBuildPath=${this.$projectData.getBuildRelativeDirectoryPath()}`,
+            `-PappResourcesPath=${this.$projectData.getAppResourcesDirectoryPath()}`,
+        ];
+        if (pluginBuildSettings.gradleArgs) {
+            const additionalArgs = [];
+            pluginBuildSettings.gradleArgs.forEach((arg) => {
+                additionalArgs.push(...arg.split(" -P").map((a, i) => (i === 0 ? a : `-P${a}`)));
+            });
+            localArgs.push(...additionalArgs);
+        }
+        if (this.$logger.getLevel() === "INFO") {
+            localArgs.push("--quiet");
+        }
+        const opts = {
+            cwd: pluginBuildSettings.pluginDir,
+            stdio: "inherit",
+            shell: this.$hostInfo.isWindows,
+        };
+        if (this.$options.hostProjectPath) {
+            opts.env = {
+                USER_PROJECT_PLATFORMS_ANDROID: path.resolve((0, process_1.cwd)(), this.$options.hostProjectPath),
+                ...process.env,
+            };
+        }
+        try {
+            const sanitizedArgs = this.$hostInfo.isWindows
+                ? localArgs.map((arg) => (0, helpers_1.quoteString)(arg))
+                : localArgs;
+            await this.$childProcess.spawnFromEvent(gradlew, sanitizedArgs, "close", opts);
+        }
+        catch (err) {
+            this.$errors.fail(`Failed to build plugin ${pluginBuildSettings.pluginName} : \n${err}`);
+        }
     }
     validateOptions(options) {
         if (!options) {
@@ -515,6 +501,7 @@ class AndroidPluginBuildService {
         }
     }
 }
+exports.AndroidPluginBuildService = AndroidPluginBuildService;
 AndroidPluginBuildService.MANIFEST_ROOT = {
     $: {
         "xmlns:android": "http://schemas.android.com/apk/res/android",
@@ -523,5 +510,4 @@ AndroidPluginBuildService.MANIFEST_ROOT = {
 __decorate([
     (0, helpers_1.hook)("buildAndroidPlugin")
 ], AndroidPluginBuildService.prototype, "buildPlugin", null);
-exports.AndroidPluginBuildService = AndroidPluginBuildService;
 yok_1.injector.register("androidPluginBuildService", AndroidPluginBuildService);