nativescript 8.9.0-dev.0 → 8.9.0-dev.2

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

@@ -5,6 +5,15 @@ 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");
@@ -51,23 +60,28 @@ class AndroidPluginBuildService {
         const manifest = path.join(platformsDir, constants_1.MANIFEST_FILE_NAME);
         return this.$fs.exists(manifest) ? manifest : null;
     }
-    async updateManifestContent(oldManifestContent, defaultPackageName) {
-        let xml = await this.getXml(oldManifestContent);
-        let packageName = defaultPackageName;
-        if (xml["manifest"]) {
-            if (xml["manifest"]["$"]["package"]) {
-                packageName = xml["manifest"]["$"]["package"];
+    updateManifestContent(oldManifestContent, defaultPackageName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let xml = yield this.getXml(oldManifestContent);
+            let packageName = defaultPackageName;
+            // if the manifest file is full-featured and declares settings inside the manifest scope
+            if (xml["manifest"]) {
+                if (xml["manifest"]["$"]["package"]) {
+                    packageName = xml["manifest"]["$"]["package"];
+                }
+                // set the xml as the value to iterate over its properties
+                xml = xml["manifest"];
             }
-            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;
+            // if the manifest file doesn't have a <manifest> scope, only the first setting will be picked up
+            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 = {
@@ -78,16 +92,18 @@ class AndroidPluginBuildService {
         const newManifestContent = xmlBuilder.buildObject(newManifest);
         return newManifestContent;
     }
-    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;
+    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;
+        });
     }
     getIncludeGradleCompileDependenciesScope(includeGradleFileContent) {
         const indexOfDependenciesScope = includeGradleFileContent.indexOf("dependencies");
@@ -132,41 +148,52 @@ class AndroidPluginBuildService {
         }
         return result;
     }
-    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);
-        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);
-            await this.buildPlugin({
-                gradlePath: options.gradlePath,
-                gradleArgs: options.gradleArgs,
-                pluginDir: pluginTempDir,
-                pluginName: options.pluginName,
-                projectDir: options.projectDir,
+    /**
+     * Returns whether the build has completed or not
+     * @param {Object} options
+     * @param {string} options.pluginName - The name of the plugin. E.g. 'nativescript-barcodescanner'
+     * @param {string} options.platformsAndroidDirPath - The path to the 'plugin/src/platforms/android' directory.
+     * @param {string} options.aarOutputDir - The path where the aar should be copied after a successful build.
+     * @param {string} options.tempPluginDirPath - The path where the android plugin will be built.
+     */
+    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,
             });
-            this.$watchIgnoreListService.addFileToIgnoreList(path.join(options.aarOutputDir, `${shortPluginName}.aar`));
-            this.copyAar(shortPluginName, pluginTempDir, options.aarOutputDir);
-            this.writePluginHashInfo(pluginSourceFileHashesInfo, pluginTempDir);
-        }
-        return shouldBuildAar;
+            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);
+                yield this.buildPlugin({
+                    gradlePath: options.gradlePath,
+                    gradleArgs: options.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) {
+        // In case plugin was already built in the current process, we need to clean the old sources as they may break the new build.
         this.$fs.deleteDirectory(pluginTempDir);
         this.$fs.ensureDirectoryExists(pluginTempDir);
     }
@@ -179,46 +206,50 @@ class AndroidPluginBuildService {
         const buildDataFile = this.getPathToPluginBuildDataFile(pluginTempDir);
         this.$fs.writeJson(buildDataFile, 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);
+    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);
+                }
             }
-        }
-        return shouldBuildAar;
+            return shouldBuildAar;
+        });
     }
     getPathToPluginBuildDataFile(pluginDir) {
         return path.join(pluginDir, constants_1.PLUGIN_BUILD_DATA_FILENAME);
     }
-    async updateManifest(manifestFilePath, pluginTempMainSrcDir, shortPluginName) {
-        let updatedManifestContent;
-        this.$fs.ensureDirectoryExists(pluginTempMainSrcDir);
-        const defaultPackageName = "org.nativescript." + shortPluginName;
-        if (manifestFilePath) {
-            let androidManifestContent;
+    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);
             try {
-                androidManifestContent = this.$fs.readText(manifestFilePath);
+                this.$fs.writeFile(pathToTempAndroidManifest, updatedManifestContent);
             }
-            catch (err) {
-                this.$errors.fail(`Failed to fs.readFileSync the manifest file located at ${manifestFilePath}. Error is: ${err.toString()}`);
+            catch (e) {
+                this.$errors.fail(`Failed to write the updated AndroidManifest in the new location - ${pathToTempAndroidManifest}. Error is: ${e.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) {
@@ -228,64 +259,72 @@ class AndroidPluginBuildService {
             this.$fs.copyFile(path.join(dir, "*"), destination);
         }
     }
-    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);
-        this.addCompileDependencies(platformsAndroidDirPath, buildGradlePath);
-        const runtimeGradleVersions = await this.getRuntimeGradleVersions(projectDir);
-        this.replaceGradleVersion(pluginTempDir, runtimeGradleVersions.gradleVersion);
-        this.replaceGradleAndroidPluginVersion(buildGradlePath, runtimeGradleVersions.gradleAndroidPluginVersion);
-        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"];
+    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);
+            this.addCompileDependencies(platformsAndroidDirPath, buildGradlePath);
+            const runtimeGradleVersions = yield this.getRuntimeGradleVersions(projectDir);
+            this.replaceGradleVersion(pluginTempDir, runtimeGradleVersions.gradleVersion);
+            this.replaceGradleAndroidPluginVersion(buildGradlePath, runtimeGradleVersions.gradleAndroidPluginVersion);
+            this.replaceFileContent(buildGradlePath, "{{pluginName}}", pluginName);
+            this.replaceFileContent(settingsGradlePath, "{{pluginName}}", pluginName);
+            // gets the package from the AndroidManifest to use as the namespace or fallback to the `org.nativescript.${shortPluginName}`
+            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 = yield this.getXml(manifestContent);
+            if (xml["manifest"]) {
+                if (xml["manifest"]["$"]["package"]) {
+                    packageName = xml["manifest"]["$"]["package"];
+                }
             }
-        }
-        this.replaceFileContent(buildGradlePath, "{{pluginNamespace}}", packageName);
-    }
-    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 || {};
+            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 getLatestRuntimeVersion() {
+    getLatestRuntimeVersion() {
         var _a;
-        let runtimeVersion = null;
-        try {
-            let result = await this.$packageManager.view(constants_1.SCOPED_ANDROID_RUNTIME_NAME, {
-                "dist-tags": true,
-            });
-            result = (_a = result === null || result === void 0 ? void 0 : result["dist-tags"]) !== null && _a !== void 0 ? _a : 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(constants_1.SCOPED_ANDROID_RUNTIME_NAME);
-            runtimeVersion = registryData["dist-tags"].latest;
-        }
-        return runtimeVersion;
+        return __awaiter(this, void 0, void 0, function* () {
+            let runtimeVersion = null;
+            try {
+                let result = yield this.$packageManager.view(constants_1.SCOPED_ANDROID_RUNTIME_NAME, {
+                    "dist-tags": true,
+                });
+                result = (_a = result === null || result === void 0 ? void 0 : result["dist-tags"]) !== null && _a !== void 0 ? _a : 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(constants_1.SCOPED_ANDROID_RUNTIME_NAME);
+                runtimeVersion = registryData["dist-tags"].latest;
+            }
+            return runtimeVersion;
+        });
     }
     getLocalGradleVersions() {
+        // try reading from installed runtime first before reading from the npm registry...
         const installedRuntimePackageJSONPath = (0, resolve_package_path_1.resolvePackageJSONPath)(constants_1.SCOPED_ANDROID_RUNTIME_NAME, {
             paths: [this.$projectData.projectDir],
         });
@@ -312,34 +351,46 @@ class AndroidPluginBuildService {
         }
         return null;
     }
-    async getGradleVersions(runtimeVersion) {
+    getGradleVersions(runtimeVersion) {
         var _a, _b;
-        let runtimeGradleVersions = null;
-        const localVersionInfo = this.getLocalGradleVersions();
-        if (localVersionInfo) {
-            return localVersionInfo;
-        }
-        try {
-            let output = await this.$packageManager.view(`${constants_1.SCOPED_ANDROID_RUNTIME_NAME}@${runtimeVersion}`, { version_info: true });
-            output = (_a = output === null || output === void 0 ? void 0 : output["version_info"]) !== null && _a !== void 0 ? _a : output;
-            if (!output) {
-                output = await this.$packageManager.view(`${constants_1.SCOPED_ANDROID_RUNTIME_NAME}@${runtimeVersion}`, { gradle: true });
-                output = (_b = output === null || output === void 0 ? void 0 : output["gradle"]) !== null && _b !== void 0 ? _b : output;
-                const { version, android } = output;
-                output = {
-                    gradle: version,
-                    gradleAndroid: android,
-                };
+        return __awaiter(this, void 0, void 0, function* () {
+            let runtimeGradleVersions = null;
+            const localVersionInfo = this.getLocalGradleVersions();
+            if (localVersionInfo) {
+                return localVersionInfo;
             }
-            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(constants_1.SCOPED_ANDROID_RUNTIME_NAME);
-            runtimeGradleVersions = registryData.versions[runtimeVersion];
-        }
-        const result = this.getGradleVersionsCore(runtimeGradleVersions);
-        return result;
+            // fallback to reading from npm...
+            try {
+                let output = yield this.$packageManager.view(`${constants_1.SCOPED_ANDROID_RUNTIME_NAME}@${runtimeVersion}`, { version_info: true });
+                output = (_a = output === null || output === void 0 ? void 0 : output["version_info"]) !== null && _a !== void 0 ? _a : output;
+                if (!output) {
+                    /**
+                     * fallback to the old 'gradle' key in package.json
+                     *
+                     * format:
+                     *
+                     * gradle: { version: '6.4', android: '3.6.4' }
+                     *
+                     */
+                    output = yield this.$packageManager.view(`${constants_1.SCOPED_ANDROID_RUNTIME_NAME}@${runtimeVersion}`, { gradle: true });
+                    output = (_b = output === null || output === void 0 ? void 0 : output["gradle"]) !== null && _b !== void 0 ? _b : output;
+                    const { version, android } = output;
+                    // covert output to the new format...
+                    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(constants_1.SCOPED_ANDROID_RUNTIME_NAME);
+                runtimeGradleVersions = registryData.versions[runtimeVersion];
+            }
+            const result = this.getGradleVersionsCore(runtimeGradleVersions);
+            return result;
+        });
     }
     getGradleVersionsCore(packageData) {
         const packageJsonGradle = packageData && packageData.versions;
@@ -397,6 +448,10 @@ class AndroidPluginBuildService {
             this.$errors.fail(`No built aar found at ${pathToBuiltAar}`);
         }
     }
+    /**
+     * @param {Object} options
+     * @param {string} options.platformsAndroidDirPath - The path to the 'plugin/src/platforms/android' directory.
+     */
     migrateIncludeGradle(options) {
         this.validatePlatformsAndroidDirPathOption(options);
         const includeGradleFilePath = path.join(options.platformsAndroidDirPath, constants_1.INCLUDE_GRADLE_NAME);
@@ -425,43 +480,42 @@ class AndroidPluginBuildService {
         }
         return false;
     }
-    async buildPlugin(pluginBuildSettings) {
+    buildPlugin(pluginBuildSettings) {
         var _a;
-        const gradlew = (_a = pluginBuildSettings.gradlePath) !== null && _a !== void 0 ? _a : (this.$hostInfo.isWindows ? "gradlew.bat" : "./gradlew");
-        const localArgs = [
-            "-p",
-            pluginBuildSettings.pluginDir,
-            "assembleRelease",
-            `-PtempBuild=true`,
-            `-PappPath=${this.$projectData.getAppDirectoryPath()}`,
-            `-PappResourcesPath=${this.$projectData.getAppResourcesDirectoryPath()}`,
-        ];
-        if (pluginBuildSettings.gradleArgs) {
-            localArgs.push(pluginBuildSettings.gradleArgs);
-        }
-        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,
+        return __awaiter(this, void 0, void 0, function* () {
+            const gradlew = (_a = pluginBuildSettings.gradlePath) !== null && _a !== void 0 ? _a : (this.$hostInfo.isWindows ? "gradlew.bat" : "./gradlew");
+            const localArgs = [
+                "-p",
+                pluginBuildSettings.pluginDir,
+                "assembleRelease",
+                `-PtempBuild=true`,
+                `-PappPath=${this.$projectData.getAppDirectoryPath()}`,
+                `-PappResourcesPath=${this.$projectData.getAppResourcesDirectoryPath()}`,
+            ];
+            if (pluginBuildSettings.gradleArgs) {
+                localArgs.push(pluginBuildSettings.gradleArgs);
+            }
+            if (this.$logger.getLevel() === "INFO") {
+                localArgs.push("--quiet");
+            }
+            const opts = {
+                cwd: pluginBuildSettings.pluginDir,
+                stdio: "inherit",
+                shell: this.$hostInfo.isWindows,
             };
-        }
-        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}`);
-        }
+            if (this.$options.hostProjectPath) {
+                opts.env = Object.assign({ 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;
+                yield this.$childProcess.spawnFromEvent(gradlew, sanitizedArgs, "close", opts);
+            }
+            catch (err) {
+                this.$errors.fail(`Failed to build plugin ${pluginBuildSettings.pluginName} : \n${err}`);
+            }
+        });
     }
     validateOptions(options) {
         if (!options) {
@@ -487,7 +541,6 @@ class AndroidPluginBuildService {
         }
     }
 }
-exports.AndroidPluginBuildService = AndroidPluginBuildService;
 AndroidPluginBuildService.MANIFEST_ROOT = {
     $: {
         "xmlns:android": "http://schemas.android.com/apk/res/android",
@@ -496,4 +549,6 @@ AndroidPluginBuildService.MANIFEST_ROOT = {
 __decorate([
     (0, helpers_1.hook)("buildAndroidPlugin")
 ], AndroidPluginBuildService.prototype, "buildPlugin", null);
+exports.AndroidPluginBuildService = AndroidPluginBuildService;
 yok_1.injector.register("androidPluginBuildService", AndroidPluginBuildService);
+//# sourceMappingURL=android-plugin-build-service.js.map