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

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");
@@ -144,10 +135,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,40 +147,36 @@ 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");
-            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");
+        this.cleanResValues(targetSdkVersion, projectData);
     }
     getResDestinationDir(projectData) {
         const appResourcesDirStructureHasMigrated = this.$androidResourcesMigrationService.hasMigrated(projectData.getAppResourcesDirectoryPath());
@@ -221,32 +206,30 @@ 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");
-            shell.sed("-i", /__PROJECT_NAME__/, this.getProjectNameFromId(projectData), gradleSettingsFilePath);
-            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");
+        shell.sed("-i", /__PROJECT_NAME__/, this.getProjectNameFromId(projectData), gradleSettingsFilePath);
+        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;
@@ -265,30 +248,24 @@ 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, this.$options.hostProjectModuleName));
@@ -296,9 +273,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
     getFrameworkFilesExtensions() {
         return [".jar", ".dat"];
     }
-    prepareProject() {
-        return __awaiter(this, void 0, void 0, function* () {
-        });
+    async prepareProject() {
     }
     ensureConfigurationFileInAppResources(projectData) {
         const appResourcesDirectoryPath = projectData.appResourcesDirectoryPath;
@@ -339,47 +314,37 @@ 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 options = {
-                    gradlePath: this.$options.gradlePath,
-                    gradleArgs: this.$options.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 options = {
+                gradlePath: this.$options.gradlePath,
+                gradleArgs: this.$options.gradleArgs,
+                projectDir: projectData.projectDir,
+                pluginName: pluginData.name,
+                platformsAndroidDirPath: pluginPlatformsFolderPath,
+                aarOutputDir: pluginPlatformsFolderPath,
+                tempPluginDirPath: path.join(projectData.platformsDir, "tempPlugin"),
+            };
+            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) => {
@@ -419,35 +384,27 @@ 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() {
-        return __awaiter(this, void 0, void 0, function* () {
-        });
+    async checkForChanges() {
     }
     getDeploymentTarget(projectData) {
         return;
@@ -504,24 +461,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);
@@ -537,6 +492,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";
@@ -545,5 +501,4 @@ __decorate([
     (0, decorators_1.performanceLog)(),
     (0, helpers_1.hook)("buildAndroid")
 ], AndroidProjectService.prototype, "buildProject", null);
-exports.AndroidProjectService = AndroidProjectService;
 yok_1.injector.register("androidProjectService", AndroidProjectService);

package/lib/services/android-resources-migration-service.js

@@ -1,13 +1,4 @@
 "use strict";
-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.AndroidResourcesMigrationService = void 0;
 const path = require("path");
@@ -28,65 +19,61 @@ class AndroidResourcesMigrationService {
     hasMigrated(appResourcesDir) {
         return this.$fs.exists(path.join(appResourcesDir, AndroidResourcesMigrationService.ANDROID_DIR, constants.SRC_DIR, constants.MAIN_DIR));
     }
-    migrate(appResourcesDir, backupLocation) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const originalAppResources = path.join(appResourcesDir, AndroidResourcesMigrationService.ANDROID_DIR);
-            const appResourcesDestination = path.join(appResourcesDir, AndroidResourcesMigrationService.ANDROID_DIR_TEMP);
-            const appResourcesBackup = path.join(backupLocation || appResourcesDir, AndroidResourcesMigrationService.ANDROID_DIR_OLD);
+    async migrate(appResourcesDir, backupLocation) {
+        const originalAppResources = path.join(appResourcesDir, AndroidResourcesMigrationService.ANDROID_DIR);
+        const appResourcesDestination = path.join(appResourcesDir, AndroidResourcesMigrationService.ANDROID_DIR_TEMP);
+        const appResourcesBackup = path.join(backupLocation || appResourcesDir, AndroidResourcesMigrationService.ANDROID_DIR_OLD);
+        try {
+            await this.tryMigrate(originalAppResources, appResourcesDestination, appResourcesBackup);
+            this.$logger.info(`Successfully updated your project's application resources '/Android' directory structure.${os_1.EOL}The previous version of your Android application resources has been renamed to '/${AndroidResourcesMigrationService.ANDROID_DIR_OLD}'`);
+        }
+        catch (error) {
             try {
-                yield this.tryMigrate(originalAppResources, appResourcesDestination, appResourcesBackup);
-                this.$logger.info(`Successfully updated your project's application resources '/Android' directory structure.${os_1.EOL}The previous version of your Android application resources has been renamed to '/${AndroidResourcesMigrationService.ANDROID_DIR_OLD}'`);
+                this.recover(originalAppResources, appResourcesDestination, appResourcesBackup);
+                this.$logger.info("Failed to update resources. They should be in their initial state.");
             }
-            catch (error) {
-                try {
-                    this.recover(originalAppResources, appResourcesDestination, appResourcesBackup);
-                    this.$logger.info("Failed to update resources. They should be in their initial state.");
-                }
-                catch (err) {
-                    this.$logger.trace(err);
-                    this.$logger.info(`Failed to update resources.${os_1.EOL} Backup of original content is inside "${appResourcesBackup}".${os_1.EOL}If "${originalAppResources} is missing copy from backup folder."`);
-                }
-                finally {
-                    this.$errors.fail(error.message);
-                }
+            catch (err) {
+                this.$logger.trace(err);
+                this.$logger.info(`Failed to update resources.${os_1.EOL} Backup of original content is inside "${appResourcesBackup}".${os_1.EOL}If "${originalAppResources} is missing copy from backup folder."`);
             }
-        });
+            finally {
+                this.$errors.fail(error.message);
+            }
+        }
     }
-    tryMigrate(originalAppResources, appResourcesDestination, appResourcesBackup) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const appMainSourceSet = path.join(appResourcesDestination, constants.SRC_DIR, constants.MAIN_DIR);
-            const appResourcesMainSourceSetResourcesDestination = path.join(appMainSourceSet, constants.RESOURCES_DIR);
-            this.$fs.ensureDirectoryExists(appResourcesDestination);
-            this.$fs.ensureDirectoryExists(appMainSourceSet);
-            this.$fs.ensureDirectoryExists(appResourcesMainSourceSetResourcesDestination);
-            this.$fs.ensureDirectoryExists(path.join(appMainSourceSet, "java"));
-            this.$fs.ensureDirectoryExists(path.join(appMainSourceSet, constants.ASSETS_DIR));
-            const isDirectory = (source) => this.$fs.getLsStats(source).isDirectory();
-            const getAllFiles = (source) => this.$fs.readDirectory(source).map((name) => path.join(source, name));
-            const getDirectories = (files) => files.filter(isDirectory);
-            const getFiles = (files) => files.filter((file) => !isDirectory(file));
-            this.$fs.copyFile(path.join(originalAppResources, constants.APP_GRADLE_FILE_NAME), path.join(appResourcesDestination, constants.APP_GRADLE_FILE_NAME));
-            const appResourcesFiles = getAllFiles(originalAppResources);
-            const resourceDirectories = getDirectories(appResourcesFiles);
-            const resourceFiles = getFiles(appResourcesFiles);
-            resourceDirectories.forEach((dir) => {
-                if (path.basename(dir) !== "libs") {
-                    this.$fs.copyFile(dir, appResourcesMainSourceSetResourcesDestination);
-                }
-                else {
-                    this.$fs.copyFile(dir, path.join(appResourcesDestination));
-                }
-            });
-            resourceFiles.forEach((file) => {
-                const fileName = path.basename(file);
-                if (fileName !== constants.MANIFEST_FILE_NAME) {
-                    this.$fs.copyFile(file, path.join(appResourcesDestination, fileName));
-                }
-            });
-            this.$fs.copyFile(path.join(originalAppResources, constants.MANIFEST_FILE_NAME), path.join(appMainSourceSet, constants.MANIFEST_FILE_NAME));
-            this.$fs.rename(originalAppResources, appResourcesBackup);
-            this.$fs.rename(appResourcesDestination, originalAppResources);
+    async tryMigrate(originalAppResources, appResourcesDestination, appResourcesBackup) {
+        const appMainSourceSet = path.join(appResourcesDestination, constants.SRC_DIR, constants.MAIN_DIR);
+        const appResourcesMainSourceSetResourcesDestination = path.join(appMainSourceSet, constants.RESOURCES_DIR);
+        this.$fs.ensureDirectoryExists(appResourcesDestination);
+        this.$fs.ensureDirectoryExists(appMainSourceSet);
+        this.$fs.ensureDirectoryExists(appResourcesMainSourceSetResourcesDestination);
+        this.$fs.ensureDirectoryExists(path.join(appMainSourceSet, "java"));
+        this.$fs.ensureDirectoryExists(path.join(appMainSourceSet, constants.ASSETS_DIR));
+        const isDirectory = (source) => this.$fs.getLsStats(source).isDirectory();
+        const getAllFiles = (source) => this.$fs.readDirectory(source).map((name) => path.join(source, name));
+        const getDirectories = (files) => files.filter(isDirectory);
+        const getFiles = (files) => files.filter((file) => !isDirectory(file));
+        this.$fs.copyFile(path.join(originalAppResources, constants.APP_GRADLE_FILE_NAME), path.join(appResourcesDestination, constants.APP_GRADLE_FILE_NAME));
+        const appResourcesFiles = getAllFiles(originalAppResources);
+        const resourceDirectories = getDirectories(appResourcesFiles);
+        const resourceFiles = getFiles(appResourcesFiles);
+        resourceDirectories.forEach((dir) => {
+            if (path.basename(dir) !== "libs") {
+                this.$fs.copyFile(dir, appResourcesMainSourceSetResourcesDestination);
+            }
+            else {
+                this.$fs.copyFile(dir, path.join(appResourcesDestination));
+            }
+        });
+        resourceFiles.forEach((file) => {
+            const fileName = path.basename(file);
+            if (fileName !== constants.MANIFEST_FILE_NAME) {
+                this.$fs.copyFile(file, path.join(appResourcesDestination, fileName));
+            }
         });
+        this.$fs.copyFile(path.join(originalAppResources, constants.MANIFEST_FILE_NAME), path.join(appMainSourceSet, constants.MANIFEST_FILE_NAME));
+        this.$fs.rename(originalAppResources, appResourcesBackup);
+        this.$fs.rename(appResourcesDestination, originalAppResources);
     }
     recover(originalAppResources, appResourcesDestination, appResourcesBackup) {
         if (!this.$fs.exists(originalAppResources)) {
@@ -97,8 +84,8 @@ class AndroidResourcesMigrationService {
         }
     }
 }
+exports.AndroidResourcesMigrationService = AndroidResourcesMigrationService;
 AndroidResourcesMigrationService.ANDROID_DIR = "Android";
 AndroidResourcesMigrationService.ANDROID_DIR_TEMP = "Android-Updated";
 AndroidResourcesMigrationService.ANDROID_DIR_OLD = "Android-Pre-v4";
-exports.AndroidResourcesMigrationService = AndroidResourcesMigrationService;
 yok_1.injector.register("androidResourcesMigrationService", AndroidResourcesMigrationService);