@akylas/nativescript-cli 8.7.2 → 8.8.3

package/lib/services/android-project-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.AndroidProjectService = void 0;
 const path = require("path");
@@ -71,24 +62,26 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
             throw new Error("First call of getPlatformData without providing projectData.");
         }
         if (projectData && projectData.platformsDir) {
-            const projectRoot = path.join(projectData.platformsDir, AndroidProjectService.ANDROID_PLATFORM_NAME);
+            const projectRoot = this.$options.hostProjectPath
+                ? this.$options.hostProjectPath
+                : path.join(projectData.platformsDir, AndroidProjectService.ANDROID_PLATFORM_NAME);
             const appDestinationDirectoryArr = [
                 projectRoot,
-                constants.APP_FOLDER_NAME,
+                this.$options.hostProjectModuleName,
                 constants.SRC_DIR,
                 constants.MAIN_DIR,
                 constants.ASSETS_DIR,
             ];
             const configurationsDirectoryArr = [
                 projectRoot,
-                constants.APP_FOLDER_NAME,
+                this.$options.hostProjectModuleName,
                 constants.SRC_DIR,
                 constants.MAIN_DIR,
                 constants.MANIFEST_FILE_NAME,
             ];
             const deviceBuildOutputArr = [
                 projectRoot,
-                constants.APP_FOLDER_NAME,
+                this.$options.hostProjectModuleName,
                 constants.BUILD_DIR,
                 constants.OUTPUTS_DIR,
                 constants.APK_DIR,
@@ -104,7 +97,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
                 projectRoot: projectRoot,
                 getBuildOutputPath: (buildOptions) => {
                     if (buildOptions.androidBundle) {
-                        return path.join(projectRoot, constants.APP_FOLDER_NAME, constants.BUILD_DIR, constants.OUTPUTS_DIR, constants.BUNDLE_DIR);
+                        return path.join(projectRoot, this.$options.hostProjectModuleName, constants.BUILD_DIR, constants.OUTPUTS_DIR, constants.BUNDLE_DIR);
                     }
                     return path.join(...deviceBuildOutputArr);
                 },
@@ -115,8 +108,8 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
                     if (buildOptions.androidBundle) {
                         return {
                             packageNames: [
-                                `${constants.APP_FOLDER_NAME}${constants.AAB_EXTENSION_NAME}`,
-                                `${constants.APP_FOLDER_NAME}-${buildMode}${constants.AAB_EXTENSION_NAME}`,
+                                `${this.$options.hostProjectModuleName}${constants.AAB_EXTENSION_NAME}`,
+                                `${this.$options.hostProjectModuleName}-${buildMode}${constants.AAB_EXTENSION_NAME}`,
                             ],
                         };
                     }
@@ -125,10 +118,10 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
                             `${packageName}-${buildMode}${constants.APK_EXTENSION_NAME}`,
                             `${projectData.projectName}-${buildMode}${constants.APK_EXTENSION_NAME}`,
                             `${projectData.projectName}${constants.APK_EXTENSION_NAME}`,
-                            `${constants.APP_FOLDER_NAME}-${buildMode}${constants.APK_EXTENSION_NAME}`,
+                            `${this.$options.hostProjectModuleName}-${buildMode}${constants.APK_EXTENSION_NAME}`,
                         ],
                         regexes: [
-                            new RegExp(`(${packageName}|${constants.APP_FOLDER_NAME})-.*-(${constants_1.Configurations.Debug}|${constants_1.Configurations.Release})(-unsigned)?${constants.APK_EXTENSION_NAME}`, "i"),
+                            new RegExp(`(${packageName}|${this.$options.hostProjectModuleName})-.*-(${constants_1.Configurations.Debug}|${constants_1.Configurations.Release})(-unsigned)?${constants.APK_EXTENSION_NAME}`, "i"),
                         ],
                     };
                 },
@@ -144,10 +137,8 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
         const currentPlatformData = this.$projectDataService.getRuntimePackage(projectData.projectDir, platformData.platformNameLowerCase);
         return currentPlatformData && currentPlatformData[constants.VERSION_STRING];
     }
-    validateOptions() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return true;
-        });
+    async validateOptions() {
+        return true;
     }
     getAppResourcesDestinationDirectoryPath(projectData) {
         const appResourcesDirStructureHasMigrated = this.$androidResourcesMigrationService.hasMigrated(projectData.getAppResourcesDirectoryPath());
@@ -158,45 +149,41 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
             return this.getLegacyAppResourcesDestinationDirPath(projectData);
         }
     }
-    validate(projectData, options, notConfiguredEnvOptions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.validatePackageName(projectData.projectIdentifiers.android);
-            this.validateProjectName(projectData.projectName);
-            const checkEnvironmentRequirementsOutput = yield this.$platformEnvironmentRequirements.checkEnvironmentRequirements({
-                platform: this.getPlatformData(projectData).normalizedPlatformName,
-                projectDir: projectData.projectDir,
-                options,
-                notConfiguredEnvOptions,
-            });
-            this.$androidToolsInfo.validateInfo({
-                showWarningsAsErrors: true,
-                projectDir: projectData.projectDir,
-                validateTargetSdk: true,
-            });
-            return {
-                checkEnvironmentRequirementsOutput,
-            };
+    async validate(projectData, options, notConfiguredEnvOptions) {
+        this.validatePackageName(projectData.projectIdentifiers.android);
+        this.validateProjectName(projectData.projectName);
+        const checkEnvironmentRequirementsOutput = await this.$platformEnvironmentRequirements.checkEnvironmentRequirements({
+            platform: this.getPlatformData(projectData).normalizedPlatformName,
+            projectDir: projectData.projectDir,
+            options,
+            notConfiguredEnvOptions,
         });
+        this.$androidToolsInfo.validateInfo({
+            showWarningsAsErrors: true,
+            projectDir: projectData.projectDir,
+            validateTargetSdk: true,
+        });
+        return {
+            checkEnvironmentRequirementsOutput,
+        };
     }
-    createProject(frameworkDir, frameworkVersion, projectData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (semver.lt(frameworkVersion, AndroidProjectService.MIN_RUNTIME_VERSION_WITH_GRADLE)) {
-                this.$errors.fail(`The NativeScript CLI requires Android runtime ${AndroidProjectService.MIN_RUNTIME_VERSION_WITH_GRADLE} or later to work properly.`);
-            }
-            this.$fs.ensureDirectoryExists(this.getPlatformData(projectData).projectRoot);
-            const androidToolsInfo = this.$androidToolsInfo.getToolsInfo({
-                projectDir: projectData.projectDir,
-            });
-            const targetSdkVersion = androidToolsInfo && androidToolsInfo.targetSdkVersion;
-            this.$logger.trace(`Using Android SDK '${targetSdkVersion}'.`);
-            this.copy(this.getPlatformData(projectData).projectRoot, frameworkDir, "*", "-R");
-            if (this.$options.overrideRuntimeGradleFiles !== false) {
-                const gradleTemplatePath = path.resolve(path.join(__dirname, "../../vendor/gradle-app"));
-                const allGradleTemplateFiles = path.join(gradleTemplatePath, "*");
-                this.$fs.copyFile(allGradleTemplateFiles, path.join(this.getPlatformData(projectData).projectRoot));
-            }
-            this.cleanResValues(targetSdkVersion, projectData);
+    async createProject(frameworkDir, frameworkVersion, projectData) {
+        if (semver.lt(frameworkVersion, AndroidProjectService.MIN_RUNTIME_VERSION_WITH_GRADLE)) {
+            this.$errors.fail(`The NativeScript CLI requires Android runtime ${AndroidProjectService.MIN_RUNTIME_VERSION_WITH_GRADLE} or later to work properly.`);
+        }
+        this.$fs.ensureDirectoryExists(this.getPlatformData(projectData).projectRoot);
+        const androidToolsInfo = this.$androidToolsInfo.getToolsInfo({
+            projectDir: projectData.projectDir,
         });
+        const targetSdkVersion = androidToolsInfo && androidToolsInfo.targetSdkVersion;
+        this.$logger.trace(`Using Android SDK '${targetSdkVersion}'.`);
+        this.copy(this.getPlatformData(projectData).projectRoot, frameworkDir, "*", "-R");
+        if (this.$options.overrideRuntimeGradleFiles !== false) {
+            const gradleTemplatePath = path.resolve(path.join(__dirname, "../../vendor/gradle-app"));
+            const allGradleTemplateFiles = path.join(gradleTemplatePath, "*");
+            this.$fs.copyFile(allGradleTemplateFiles, path.join(this.getPlatformData(projectData).projectRoot));
+        }
+        this.cleanResValues(targetSdkVersion, projectData);
     }
     getResDestinationDir(projectData) {
         const appResourcesDirStructureHasMigrated = this.$androidResourcesMigrationService.hasMigrated(projectData.getAppResourcesDirectoryPath());
@@ -226,39 +213,37 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
         this.$logger.trace(directoriesToClean);
         _.map(directoriesToClean, (dir) => this.$fs.deleteDirectory(dir));
     }
-    interpolateData(projectData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.interpolateConfigurationFile(projectData);
-            const appResourcesDirectoryPath = projectData.getAppResourcesDirectoryPath();
-            let stringsFilePath;
-            const appResourcesDestinationDirectoryPath = this.getAppResourcesDestinationDirectoryPath(projectData);
-            if (this.$androidResourcesMigrationService.hasMigrated(appResourcesDirectoryPath)) {
-                stringsFilePath = path.join(appResourcesDestinationDirectoryPath, constants.MAIN_DIR, constants.RESOURCES_DIR, "values", "strings.xml");
-            }
-            else {
-                stringsFilePath = path.join(appResourcesDestinationDirectoryPath, "values", "strings.xml");
-            }
-            shell.sed("-i", /__NAME__/, projectData.projectName, stringsFilePath);
-            shell.sed("-i", /__TITLE_ACTIVITY__/, projectData.projectName, stringsFilePath);
-            const gradleSettingsFilePath = path.join(this.getPlatformData(projectData).projectRoot, "settings.gradle");
-            const relativePath = path.relative(this.getPlatformData(projectData).projectRoot, projectData.projectDir);
-            shell.sed("-i", /def USER_PROJECT_ROOT = \"\$rootDir\/..\/..\/\"/, `def USER_PROJECT_ROOT = "$rootDir/${relativePath}"`, gradleSettingsFilePath);
-            shell.sed("-i", /__PROJECT_NAME__/, this.getProjectNameFromId(projectData), gradleSettingsFilePath);
-            const gradleVersion = projectData.nsConfig.android.gradleVersion;
-            if (gradleVersion) {
-                const gradleWrapperFilePath = path.join(this.getPlatformData(projectData).projectRoot, "gradle", "wrapper", "gradle-wrapper.properties");
-                shell.sed("-i", /gradle-([0-9.]+)-bin.zip/, `gradle-${gradleVersion}-bin.zip`, gradleWrapperFilePath);
-            }
-            try {
-                const appGradleContent = this.$fs.readText(projectData.appGradlePath);
-                if (appGradleContent.indexOf(constants.PACKAGE_PLACEHOLDER_NAME) !== -1) {
-                    shell.sed("-i", new RegExp(constants.PACKAGE_PLACEHOLDER_NAME), projectData.projectIdentifiers.android, projectData.appGradlePath);
-                }
-            }
-            catch (e) {
-                this.$logger.trace(`Templates updated and no need for replace in app.gradle.`);
+    async interpolateData(projectData) {
+        this.interpolateConfigurationFile(projectData);
+        const appResourcesDirectoryPath = projectData.getAppResourcesDirectoryPath();
+        let stringsFilePath;
+        const appResourcesDestinationDirectoryPath = this.getAppResourcesDestinationDirectoryPath(projectData);
+        if (this.$androidResourcesMigrationService.hasMigrated(appResourcesDirectoryPath)) {
+            stringsFilePath = path.join(appResourcesDestinationDirectoryPath, constants.MAIN_DIR, constants.RESOURCES_DIR, "values", "strings.xml");
+        }
+        else {
+            stringsFilePath = path.join(appResourcesDestinationDirectoryPath, "values", "strings.xml");
+        }
+        shell.sed("-i", /__NAME__/, projectData.projectName, stringsFilePath);
+        shell.sed("-i", /__TITLE_ACTIVITY__/, projectData.projectName, stringsFilePath);
+        const gradleSettingsFilePath = path.join(this.getPlatformData(projectData).projectRoot, "settings.gradle");
+        const relativePath = path.relative(this.getPlatformData(projectData).projectRoot, projectData.projectDir);
+        shell.sed("-i", /def USER_PROJECT_ROOT = \"\$rootDir\/..\/..\/\"/, `def USER_PROJECT_ROOT = "$rootDir/${relativePath}"`, gradleSettingsFilePath);
+        shell.sed("-i", /__PROJECT_NAME__/, this.getProjectNameFromId(projectData), gradleSettingsFilePath);
+        const gradleVersion = projectData.nsConfig.android.gradleVersion;
+        if (gradleVersion) {
+            const gradleWrapperFilePath = path.join(this.getPlatformData(projectData).projectRoot, "gradle", "wrapper", "gradle-wrapper.properties");
+            shell.sed("-i", /gradle-([0-9.]+)-bin.zip/, `gradle-${gradleVersion}-bin.zip`, gradleWrapperFilePath);
+        }
+        try {
+            const appGradleContent = this.$fs.readText(projectData.appGradlePath);
+            if (appGradleContent.indexOf(constants.PACKAGE_PLACEHOLDER_NAME) !== -1) {
+                shell.sed("-i", new RegExp(constants.PACKAGE_PLACEHOLDER_NAME), projectData.projectIdentifiers.android, projectData.appGradlePath);
             }
-        });
+        }
+        catch (e) {
+            this.$logger.trace(`Templates updated and no need for replace in app.gradle.`);
+        }
     }
     interpolateConfigurationFile(projectData) {
         const manifestPath = this.getPlatformData(projectData).configurationFilePath;
@@ -282,40 +267,32 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
     afterCreateProject(projectRoot) {
         return null;
     }
-    updatePlatform(currentVersion, newVersion, canUpdate, projectData, addPlatform, removePlatforms) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (semver.eq(newVersion, AndroidProjectService.MIN_RUNTIME_VERSION_WITH_GRADLE)) {
-                const platformLowercase = this.getPlatformData(projectData).normalizedPlatformName.toLowerCase();
-                yield removePlatforms([platformLowercase.split("@")[0]]);
-                yield addPlatform(platformLowercase);
-                return false;
-            }
-            return true;
-        });
+    async updatePlatform(currentVersion, newVersion, canUpdate, projectData, addPlatform, removePlatforms) {
+        if (semver.eq(newVersion, AndroidProjectService.MIN_RUNTIME_VERSION_WITH_GRADLE)) {
+            const platformLowercase = this.getPlatformData(projectData).normalizedPlatformName.toLowerCase();
+            await removePlatforms([platformLowercase.split("@")[0]]);
+            await addPlatform(platformLowercase);
+            return false;
+        }
+        return true;
     }
-    buildProject(projectRoot, projectData, buildData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const platformData = this.getPlatformData(projectData);
-            yield this.$gradleBuildService.buildProject(platformData.projectRoot, buildData);
-            const outputPath = platformData.getBuildOutputPath(buildData);
-            yield this.$filesHashService.saveHashesForProject(this._platformData, outputPath);
-            yield this.trackKotlinUsage(projectRoot);
-        });
+    async buildProject(projectRoot, projectData, buildData) {
+        const platformData = this.getPlatformData(projectData);
+        await this.$gradleBuildService.buildProject(platformData.projectRoot, buildData);
+        const outputPath = platformData.getBuildOutputPath(buildData);
+        await this.$filesHashService.saveHashesForProject(this._platformData, outputPath);
+        await this.trackKotlinUsage(projectRoot);
     }
-    buildForDeploy(projectRoot, projectData, buildData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.buildProject(projectRoot, projectData, buildData);
-        });
+    async buildForDeploy(projectRoot, projectData, buildData) {
+        return this.buildProject(projectRoot, projectData, buildData);
     }
     isPlatformPrepared(projectRoot, projectData) {
-        return this.$fs.exists(path.join(this.getPlatformData(projectData).appDestinationDirectoryPath, constants.APP_FOLDER_NAME));
+        return this.$fs.exists(path.join(this.getPlatformData(projectData).appDestinationDirectoryPath, this.$options.hostProjectModuleName));
     }
     getFrameworkFilesExtensions() {
         return [".jar", ".dat"];
     }
-    prepareProject() {
-        return __awaiter(this, void 0, void 0, function* () {
-        });
+    async prepareProject() {
     }
     ensureConfigurationFileInAppResources(projectData) {
         const appResourcesDirectoryPath = projectData.appResourcesDirectoryPath;
@@ -367,48 +344,40 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
         const compileSdkVersion = androidToolsInfo && androidToolsInfo.compileSdkVersion;
         this.cleanResValues(compileSdkVersion, projectData);
     }
-    preparePluginNativeCode(pluginData, projectData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const pluginPlatformsFolderPath = this.getPluginPlatformsFolderPath(pluginData, AndroidProjectService.ANDROID_PLATFORM_NAME);
-            if (this.$fs.exists(pluginPlatformsFolderPath)) {
-                const gradleArgs = (projectData.nsConfig.android.gradleArgs || [].concat(this.$options.gradleArgs || []));
-                const options = {
-                    gradlePath: this.$options.gradlePath,
-                    gradleArgs,
-                    projectDir: projectData.projectDir,
-                    pluginName: pluginData.name,
-                    platformsAndroidDirPath: pluginPlatformsFolderPath,
-                    aarOutputDir: pluginPlatformsFolderPath,
-                    tempPluginDirPath: path.join(projectData.platformsDir, "tempPlugin"),
-                };
-                if (yield this.$androidPluginBuildService.buildAar(options)) {
-                    this.$logger.info(`Built aar for ${options.pluginName}`);
-                }
-                this.$androidPluginBuildService.migrateIncludeGradle(options);
+    async preparePluginNativeCode(pluginData, projectData) {
+        const pluginPlatformsFolderPath = this.getPluginPlatformsFolderPath(pluginData, AndroidProjectService.ANDROID_PLATFORM_NAME);
+        if (this.$fs.exists(pluginPlatformsFolderPath)) {
+            const gradleArgs = (projectData.nsConfig.android.gradleArgs || []).concat(this.$options.gradleArgs || []);
+            const pluginOptions = (projectData.nsConfig.android.plugins || {})[pluginData.name] || {};
+            const options = {
+                gradlePath: this.$options.gradlePath,
+                gradleArgs,
+                projectDir: projectData.projectDir,
+                pluginName: pluginData.name,
+                platformsAndroidDirPath: pluginPlatformsFolderPath,
+                aarOutputDir: pluginPlatformsFolderPath,
+                tempPluginDirPath: path.join(projectData.platformsDir, "tempPlugin"),
+                ...pluginOptions
+            };
+            if (await this.$androidPluginBuildService.buildAar(options)) {
+                this.$logger.info(`Built aar for ${options.pluginName}`);
             }
-        });
+            this.$androidPluginBuildService.migrateIncludeGradle(options);
+        }
     }
-    processConfigurationFilesFromAppResources() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return;
-        });
+    async processConfigurationFilesFromAppResources() {
+        return;
     }
-    removePluginNativeCode(pluginData, projectData) {
-        return __awaiter(this, void 0, void 0, function* () {
-        });
+    async removePluginNativeCode(pluginData, projectData) {
     }
-    beforePrepareAllPlugins(projectData, dependencies) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (dependencies) {
-                dependencies = this.filterUniqueDependencies(dependencies);
-                return this.provideDependenciesJson(projectData, dependencies);
-            }
-        });
+    async beforePrepareAllPlugins(projectData, dependencies) {
+        if (dependencies) {
+            dependencies = this.filterUniqueDependencies(dependencies);
+            return this.provideDependenciesJson(projectData, dependencies);
+        }
     }
-    handleNativeDependenciesChange(projectData, opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return;
-        });
+    async handleNativeDependenciesChange(projectData, opts) {
+        return;
     }
     filterUniqueDependencies(dependencies) {
         const depsDictionary = dependencies.reduce((dict, dep) => {
@@ -421,7 +390,9 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
         return _.values(depsDictionary);
     }
     provideDependenciesJson(projectData, dependencies) {
-        const platformDir = path.join(projectData.platformsDir, AndroidProjectService.ANDROID_PLATFORM_NAME);
+        const platformDir = this.$options.hostProjectPath
+            ? this.$options.hostProjectPath
+            : path.join(projectData.platformsDir, AndroidProjectService.ANDROID_PLATFORM_NAME);
         const dependenciesJsonPath = path.join(platformDir, constants.DEPENDENCIES_JSON_NAME);
         let nativeDependencyData = dependencies.filter(AndroidProjectService.isNativeAndroidDependency);
         let nativeDependencies = nativeDependencyData.map(({ name, directory, dependencies }) => {
@@ -446,58 +417,50 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
             (nativescript.android ||
                 (nativescript.platforms && nativescript.platforms.android)));
     }
-    stopServices(projectRoot) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const result = yield this.$gradleCommandService.executeCommand(["--stop", "--quiet"], {
-                cwd: projectRoot,
-                message: "Gradle stop services...",
-                stdio: "pipe",
-            });
-            return result;
+    async stopServices(projectRoot) {
+        const result = await this.$gradleCommandService.executeCommand(["--stop", "--quiet"], {
+            cwd: projectRoot,
+            message: "Gradle stop services...",
+            stdio: "pipe",
         });
+        return result;
     }
-    cleanProject(projectRoot) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.$gradleBuildService.cleanProject(projectRoot, {
-                release: false,
-            });
+    async cleanProject(projectRoot) {
+        await this.$gradleBuildService.cleanProject(projectRoot, {
+            release: false,
         });
     }
-    cleanDeviceTempFolder(deviceIdentifier, projectData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const adb = this.$injector.resolve(device_android_debug_bridge_1.DeviceAndroidDebugBridge, {
-                identifier: deviceIdentifier,
-            });
-            const deviceRootPath = `${constants_1.LiveSyncPaths.ANDROID_TMP_DIR_NAME}/${projectData.projectIdentifiers.android}`;
-            yield adb.executeShellCommand(["rm", "-rf", deviceRootPath]);
+    async cleanDeviceTempFolder(deviceIdentifier, projectData) {
+        const adb = this.$injector.resolve(device_android_debug_bridge_1.DeviceAndroidDebugBridge, {
+            identifier: deviceIdentifier,
         });
+        const deviceRootPath = `${constants_1.LiveSyncPaths.ANDROID_TMP_DIR_NAME}/${projectData.projectIdentifiers.android}`;
+        await adb.executeShellCommand(["rm", "-rf", deviceRootPath]);
     }
-    checkForChanges(changesInfo, prepareData, projectData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const deviceDescriptors = this.$liveSyncProcessDataService.getDeviceDescriptors(projectData.projectDir);
-            const platformData = this.getPlatformData(projectData);
-            deviceDescriptors.forEach((deviceDescriptor) => {
-                const buildData = deviceDescriptor.buildData;
-                if (buildData.buildFilterDevicesArch) {
-                    const outputPath = platformData.getBuildOutputPath(deviceDescriptor.buildData);
-                    const apkOutputPath = path.join(outputPath, prepareData.release ? "release" : "debug");
-                    if (!this.$fs.exists(apkOutputPath)) {
-                        return;
-                    }
-                    const device = this.$devicesService
-                        .getDevicesForPlatform(deviceDescriptor.buildData.platform)
-                        .filter((d) => d.deviceInfo.identifier === deviceDescriptor.identifier)[0];
-                    const abis = device.deviceInfo.abis.filter((a) => !!a && a.length)[0];
-                    const directoryContent = this.$fs.readDirectory(apkOutputPath);
-                    const regexp = new RegExp(`${abis}.*\.apk`);
-                    const files = _.filter(directoryContent, (entry) => {
-                        return regexp.test(entry);
-                    });
-                    if (files.length === 0) {
-                        changesInfo.nativeChanged = true;
-                    }
+    async checkForChanges(changesInfo, prepareData, projectData) {
+        const deviceDescriptors = this.$liveSyncProcessDataService.getDeviceDescriptors(projectData.projectDir);
+        const platformData = this.getPlatformData(projectData);
+        deviceDescriptors.forEach((deviceDescriptor) => {
+            const buildData = deviceDescriptor.buildData;
+            if (buildData.buildFilterDevicesArch) {
+                const outputPath = platformData.getBuildOutputPath(deviceDescriptor.buildData);
+                const apkOutputPath = path.join(outputPath, prepareData.release ? "release" : "debug");
+                if (!this.$fs.exists(apkOutputPath)) {
+                    return;
                 }
-            });
+                const device = this.$devicesService
+                    .getDevicesForPlatform(deviceDescriptor.buildData.platform)
+                    .filter((d) => d.deviceInfo.identifier === deviceDescriptor.identifier)[0];
+                const abis = device.deviceInfo.abis.filter((a) => !!a && a.length)[0];
+                const directoryContent = this.$fs.readDirectory(apkOutputPath);
+                const regexp = new RegExp(`${abis}.*\.apk`);
+                const files = _.filter(directoryContent, (entry) => {
+                    return regexp.test(entry);
+                });
+                if (files.length === 0) {
+                    changesInfo.nativeChanged = true;
+                }
+            }
         });
     }
     getDeploymentTarget(projectData) {
@@ -525,7 +488,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
     }
     getLegacyAppResourcesDestinationDirPath(projectData) {
         const resourcePath = [
-            constants.APP_FOLDER_NAME,
+            this.$options.hostProjectModuleName,
             constants.SRC_DIR,
             constants.MAIN_DIR,
             constants.RESOURCES_DIR,
@@ -534,7 +497,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
     }
     getUpdatedAppResourcesDestinationDirPath(projectData) {
         const resourcePath = [
-            constants.APP_FOLDER_NAME,
+            this.$options.hostProjectModuleName,
             constants.SRC_DIR,
         ];
         return path.join(this.getPlatformData(projectData).projectRoot, ...resourcePath);
@@ -555,24 +518,22 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
             });
         }
     }
-    trackKotlinUsage(projectRoot) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const buildStatistics = this.tryGetAndroidBuildStatistics(projectRoot);
-            try {
-                if (buildStatistics && buildStatistics.kotlinUsage) {
-                    const analyticsDelimiter = constants.AnalyticsEventLabelDelimiter;
-                    const hasUseKotlinPropertyInAppData = `hasUseKotlinPropertyInApp${analyticsDelimiter}${buildStatistics.kotlinUsage.hasUseKotlinPropertyInApp}`;
-                    const hasKotlinRuntimeClassesData = `hasKotlinRuntimeClasses${analyticsDelimiter}${buildStatistics.kotlinUsage.hasKotlinRuntimeClasses}`;
-                    yield this.$analyticsService.trackEventActionInGoogleAnalytics({
-                        action: "Using Kotlin",
-                        additionalData: `${hasUseKotlinPropertyInAppData}${analyticsDelimiter}${hasKotlinRuntimeClassesData}`,
-                    });
-                }
+    async trackKotlinUsage(projectRoot) {
+        const buildStatistics = this.tryGetAndroidBuildStatistics(projectRoot);
+        try {
+            if (buildStatistics && buildStatistics.kotlinUsage) {
+                const analyticsDelimiter = constants.AnalyticsEventLabelDelimiter;
+                const hasUseKotlinPropertyInAppData = `hasUseKotlinPropertyInApp${analyticsDelimiter}${buildStatistics.kotlinUsage.hasUseKotlinPropertyInApp}`;
+                const hasKotlinRuntimeClassesData = `hasKotlinRuntimeClasses${analyticsDelimiter}${buildStatistics.kotlinUsage.hasKotlinRuntimeClasses}`;
+                await this.$analyticsService.trackEventActionInGoogleAnalytics({
+                    action: "Using Kotlin",
+                    additionalData: `${hasUseKotlinPropertyInAppData}${analyticsDelimiter}${hasKotlinRuntimeClassesData}`,
+                });
             }
-            catch (e) {
-                this.$logger.trace(`Failed to track android build statistics. Error is: ${e.message}`);
-            }
-        });
+        }
+        catch (e) {
+            this.$logger.trace(`Failed to track android build statistics. Error is: ${e.message}`);
+        }
     }
     tryGetAndroidBuildStatistics(projectRoot) {
         const staticsFilePath = path.join(projectRoot, constants.ANDROID_ANALYTICS_DATA_DIR, constants.ANDROID_ANALYTICS_DATA_FILE);
@@ -588,6 +549,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
         return buildStatistics;
     }
 }
+exports.AndroidProjectService = AndroidProjectService;
 AndroidProjectService.VALUES_DIRNAME = "values";
 AndroidProjectService.VALUES_VERSION_DIRNAME_PREFIX = AndroidProjectService.VALUES_DIRNAME + "-v";
 AndroidProjectService.ANDROID_PLATFORM_NAME = "android";
@@ -596,5 +558,4 @@ __decorate([
     (0, decorators_1.performanceLog)(),
     (0, helpers_1.hook)("buildAndroid")
 ], AndroidProjectService.prototype, "buildProject", null);
-exports.AndroidProjectService = AndroidProjectService;
 yok_1.injector.register("androidProjectService", AndroidProjectService);