nativescript 8.1.5 → 8.2.1

package/lib/controllers/run-controller.js

@@ -367,7 +367,8 @@ class RunController extends events_1.EventEmitter {
                     }, watch: !liveSyncInfo.skipWatcher }));
                 try {
                     const platformLiveSyncService = this.$liveSyncServiceResolver.resolveLiveSyncService(device.deviceInfo.platform);
-                    const allAppFiles = ((_b = (_a = data.hmrData) === null || _a === void 0 ? void 0 : _a.fallbackFiles) === null || _b === void 0 ? void 0 : _b.length) ? data.hmrData.fallbackFiles
+                    const allAppFiles = ((_b = (_a = data.hmrData) === null || _a === void 0 ? void 0 : _a.fallbackFiles) === null || _b === void 0 ? void 0 : _b.length)
+                        ? data.hmrData.fallbackFiles
                         : data.files;
                     const filesToSync = data.hasOnlyHotUpdateFiles
                         ? data.files
@@ -495,10 +496,10 @@ class RunController extends events_1.EventEmitter {
     }
 }
 __decorate([
-    decorators_1.performanceLog()
+    (0, decorators_1.performanceLog)()
 ], RunController.prototype, "refreshApplicationWithoutDebug", null);
 __decorate([
-    decorators_1.cache()
+    (0, decorators_1.cache)()
 ], RunController.prototype, "attachDeviceLostHandler", null);
 exports.RunController = RunController;
 yok_1.injector.register("runController", RunController);

package/lib/data/build-data.js

@@ -34,6 +34,8 @@ class AndroidBuildData extends BuildData {
         this.keyStoreAliasPassword = data.keyStoreAliasPassword;
         this.keyStorePassword = data.keyStorePassword;
         this.androidBundle = data.androidBundle || data.aab;
+        this.gradlePath = data.gradlePath;
+        this.gradleArgs = data.gradleArgs;
     }
 }
 exports.AndroidBuildData = AndroidBuildData;

package/lib/declarations.d.ts

@@ -579,6 +579,11 @@ interface IAndroidBundleOptions {
 	aab: boolean;
 }
 
+interface IAndroidOptions {
+	gradlePath: string;
+	gradleArgs: string;
+}
+
 interface ITypingsOptions {
 	jar: string;
 	aar: string;
@@ -598,6 +603,7 @@ interface IOptions
 		IClean,
 		IProvision,
 		ITeamIdentifier,
+		IAndroidOptions,
 		IAndroidReleaseOptions,
 		IAndroidBundleOptions,
 		INpmInstallConfigurationOptions,

package/lib/definitions/android-plugin-migrator.d.ts

@@ -10,6 +10,8 @@ interface IAndroidBuildOptions {
 	pluginName: string;
 	aarOutputDir: string;
 	tempPluginDirPath: string;
+	gradlePath?: string;
+	gradleArgs?: string;
 }
 
 interface IAndroidPluginBuildService {
@@ -37,4 +39,14 @@ interface IBuildAndroidPluginData extends Partial<IProjectDir> {
 	 * Information about tools that will be used to build the plugin, for example compile SDK version, build tools version, etc.
 	 */
 	androidToolsInfo?: IAndroidToolsInfoData;
+
+	/**
+	 * Optional custom Gradle path.
+	 */
+	gradlePath?: string;
+
+	/**
+	 * Optional custom Gradle arguments.
+	 */
+	gradleArgs?: string;
 }

package/lib/definitions/build.d.ts

@@ -29,7 +29,10 @@ interface IiOSBuildData extends IBuildData {
 interface IAndroidBuildData
 	extends IBuildData,
 		IAndroidSigningData,
-		IHasAndroidBundle {}
+		IHasAndroidBundle {
+	gradlePath?: string;
+	gradleArgs?: string;
+}
 
 interface IAndroidSigningData {
 	keyStoreAlias: string;

package/lib/definitions/gradle.d.ts

@@ -13,6 +13,7 @@ interface IGradleCommandOptions {
 	message?: string;
 	stdio?: string;
 	spawnOptions?: ISpawnFromEventOptions;
+	gradlePath?: string;
 }
 
 interface IGradleBuildService {

package/lib/definitions/platform.d.ts

@@ -78,7 +78,10 @@ interface IPrepareNodeModulesData {
 }
 
 interface INodeModulesDependenciesBuilder {
-	getProductionDependencies(projectPath: string, ignore?: string[]): IDependencyData[];
+	getProductionDependencies(
+		projectPath: string,
+		ignore?: string[]
+	): IDependencyData[];
 }
 
 interface IBuildInfo {
@@ -118,8 +121,14 @@ interface IAddPlatformData extends IControllerDataBase {
 }
 
 interface IPlatformController {
-	addPlatform(addPlatformData: IAddPlatformData): Promise<void>;
-	addPlatformIfNeeded(addPlatformData: IAddPlatformData): Promise<void>;
+	addPlatform(
+		addPlatformData: IAddPlatformData,
+		projectData?: IProjectData
+	): Promise<void>;
+	addPlatformIfNeeded(
+		addPlatformData: IAddPlatformData,
+		projectData?: IProjectData
+	): Promise<void>;
 }
 
 interface IAddPlatformService {

package/lib/detached-processes/cleanup-js-subprocess.js

@@ -24,7 +24,7 @@ const jsFilePath = process.argv[4];
 const fileLogService = yok_1.injector.resolve(file_log_service_1.FileLogService, {
     logFile,
 });
-const uniqueId = uuid_1.v4();
+const uniqueId = (0, uuid_1.v4)();
 fileLogService.logData({
     message: `Initializing Cleanup process for path: ${jsFilePath} Unique id: ${uniqueId}`,
 });

package/lib/detached-processes/file-log-service.js

@@ -12,7 +12,7 @@ class FileLogService {
         if (this.logFile && fileLoggingMessage && fileLoggingMessage.message) {
             fileLoggingMessage.type =
                 fileLoggingMessage.type || "Info";
-            const formattedDate = helpers_1.getFixedLengthDateString();
+            const formattedDate = (0, helpers_1.getFixedLengthDateString)();
             this.$fs.appendFile(this.logFile, `[${formattedDate}] [${fileLoggingMessage.type}] ${fileLoggingMessage.message}${os_1.EOL}`);
         }
     }

package/lib/device-path-provider.js

@@ -46,7 +46,7 @@ class DevicePathProvider {
                     projectRoot = path.join(projectRoot, syncFolderName);
                 }
             }
-            return helpers_1.fromWindowsRelativePathToUnix(projectRoot);
+            return (0, helpers_1.fromWindowsRelativePathToUnix)(projectRoot);
         });
     }
     getDeviceSyncZipPath(device) {

package/lib/nativescript-cli.js

@@ -16,7 +16,7 @@ shelljs.config.fatal = true;
 const errors_1 = require("./common/errors");
 const helpers_1 = require("./common/helpers");
 const yok_1 = require("./common/yok");
-errors_1.installUncaughtExceptionListener(process.exit.bind(process, 120));
+(0, errors_1.installUncaughtExceptionListener)(process.exit.bind(process, 120));
 const logger = yok_1.injector.resolve("logger");
 const originalProcessOn = process.on;
 process.on = (event, listener) => {
@@ -38,7 +38,7 @@ process.on = (event, listener) => {
     yield $initializeService.initialize();
     const extensibilityService = yok_1.injector.resolve("extensibilityService");
     try {
-        yield helpers_1.settlePromises(extensibilityService.loadExtensions());
+        yield (0, helpers_1.settlePromises)(extensibilityService.loadExtensions());
     }
     catch (err) {
         logger.trace("Unable to load extensions. Error is: ", err);

package/lib/node-package-manager.js

@@ -37,7 +37,7 @@ class NodePackageManager extends base_package_manager_1.BasePackageManager {
             if (config.ignoreScripts) {
                 config["ignore-scripts"] = true;
             }
-            const packageJsonPath = path_1.join(pathToSave, "package.json");
+            const packageJsonPath = (0, path_1.join)(pathToSave, "package.json");
             const jsonContentBefore = this.$fs.readJson(packageJsonPath);
             const flags = this.getFlagsString(config, true);
             let params = ["install", "--legacy-peer-deps"];
@@ -47,12 +47,12 @@ class NodePackageManager extends base_package_manager_1.BasePackageManager {
             }
             params = params.concat(flags);
             const cwd = pathToSave;
-            const etcDirectoryLocation = path_1.join(cwd, "etc");
+            const etcDirectoryLocation = (0, path_1.join)(cwd, "etc");
             const etcExistsPriorToInstallation = this.$fs.exists(etcDirectoryLocation);
             if (config.path) {
                 let relativePathFromCwdToSource = "";
                 if (config.frameworkPath) {
-                    relativePathFromCwdToSource = path_1.relative(config.frameworkPath, pathToSave);
+                    relativePathFromCwdToSource = (0, path_1.relative)(config.frameworkPath, pathToSave);
                     if (this.$fs.exists(relativePathFromCwdToSource)) {
                         packageName = relativePathFromCwdToSource;
                     }
@@ -103,7 +103,12 @@ class NodePackageManager extends base_package_manager_1.BasePackageManager {
             catch (e) {
                 this.$errors.fail(e.message);
             }
-            return JSON.parse(viewResult);
+            try {
+                return JSON.parse(viewResult);
+            }
+            catch (err) {
+                return null;
+            }
         });
     }
     searchNpms(keyword) {
@@ -128,24 +133,24 @@ class NodePackageManager extends base_package_manager_1.BasePackageManager {
     getCachePath() {
         return __awaiter(this, void 0, void 0, function* () {
             const cachePath = yield this.$childProcess.exec(`npm config get cache`);
-            return path_1.join(cachePath.trim(), constants_1.CACACHE_DIRECTORY_NAME);
+            return (0, path_1.join)(cachePath.trim(), constants_1.CACACHE_DIRECTORY_NAME);
         });
     }
 }
 __decorate([
-    decorators_1.exported("npm")
+    (0, decorators_1.exported)("npm")
 ], NodePackageManager.prototype, "install", null);
 __decorate([
-    decorators_1.exported("npm")
+    (0, decorators_1.exported)("npm")
 ], NodePackageManager.prototype, "uninstall", null);
 __decorate([
-    decorators_1.exported("npm")
+    (0, decorators_1.exported)("npm")
 ], NodePackageManager.prototype, "search", null);
 __decorate([
-    decorators_1.exported("npm")
+    (0, decorators_1.exported)("npm")
 ], NodePackageManager.prototype, "view", null);
 __decorate([
-    decorators_1.cache()
+    (0, decorators_1.cache)()
 ], NodePackageManager.prototype, "getCachePath", null);
 exports.NodePackageManager = NodePackageManager;
 yok_1.injector.register("npm", NodePackageManager);

package/lib/options.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Options = void 0;
 const helpers = require("./common/helpers");
 const yargs = require("yargs");
+const helpers_1 = require("yargs/helpers");
 const _ = require("lodash");
 const yok_1 = require("./common/yok");
 class Options {
@@ -185,6 +186,8 @@ class Options {
                 default: false,
                 hasSensitiveValue: false,
             },
+            gradlePath: { type: "string", hasSensitiveValue: false },
+            gradleArgs: { type: "string", hasSensitiveValue: false },
             aab: { type: "boolean", hasSensitiveValue: false },
             performance: { type: "object", hasSensitiveValue: true },
             appleApplicationSpecificPassword: {
@@ -284,7 +287,7 @@ class Options {
         _.each(this.options, (value, key) => {
             opts[this.getDashedOptionName(key)] = value;
         });
-        const parsed = yargs(process.argv.slice(2)).version(false).help(false);
+        const parsed = yargs((0, helpers_1.hideBin)(process.argv)).version(false).help(false);
         this.initialArgv = parsed.argv;
         this.argv = parsed.options(opts).argv;
         this.$settingsService.setSettings({

package/lib/package-manager.js

@@ -130,45 +130,45 @@ class PackageManager {
     }
 }
 __decorate([
-    decorators_1.cache()
+    (0, decorators_1.cache)()
 ], PackageManager.prototype, "init", null);
 __decorate([
-    decorators_1.invokeInit()
+    (0, decorators_1.invokeInit)()
 ], PackageManager.prototype, "getPackageManagerName", null);
 __decorate([
-    decorators_1.exported("packageManager"),
-    decorators_2.performanceLog(),
-    decorators_1.invokeInit()
+    (0, decorators_1.exported)("packageManager"),
+    (0, decorators_2.performanceLog)(),
+    (0, decorators_1.invokeInit)()
 ], PackageManager.prototype, "install", null);
 __decorate([
-    decorators_1.exported("packageManager"),
-    decorators_1.invokeInit()
+    (0, decorators_1.exported)("packageManager"),
+    (0, decorators_1.invokeInit)()
 ], PackageManager.prototype, "uninstall", null);
 __decorate([
-    decorators_1.exported("packageManager"),
-    decorators_1.invokeInit()
+    (0, decorators_1.exported)("packageManager"),
+    (0, decorators_1.invokeInit)()
 ], PackageManager.prototype, "view", null);
 __decorate([
-    decorators_1.exported("packageManager"),
-    decorators_1.invokeInit()
+    (0, decorators_1.exported)("packageManager"),
+    (0, decorators_1.invokeInit)()
 ], PackageManager.prototype, "search", null);
 __decorate([
-    decorators_1.invokeInit()
+    (0, decorators_1.invokeInit)()
 ], PackageManager.prototype, "searchNpms", null);
 __decorate([
-    decorators_1.invokeInit()
+    (0, decorators_1.invokeInit)()
 ], PackageManager.prototype, "isRegistered", null);
 __decorate([
-    decorators_1.invokeInit()
+    (0, decorators_1.invokeInit)()
 ], PackageManager.prototype, "getPackageFullName", null);
 __decorate([
-    decorators_1.invokeInit()
+    (0, decorators_1.invokeInit)()
 ], PackageManager.prototype, "getPackageNameParts", null);
 __decorate([
-    decorators_1.invokeInit()
+    (0, decorators_1.invokeInit)()
 ], PackageManager.prototype, "getRegistryPackageData", null);
 __decorate([
-    decorators_1.invokeInit()
+    (0, decorators_1.invokeInit)()
 ], PackageManager.prototype, "getCachePath", null);
 exports.PackageManager = PackageManager;
 yok_1.injector.register("packageManager", PackageManager);

package/lib/pnpm-package-manager.js

@@ -76,8 +76,12 @@ class PnpmPackageManager extends base_package_manager_1.BasePackageManager {
             catch (e) {
                 this.$errors.fail(e.message);
             }
-            const result = JSON.parse(viewResult);
-            return result;
+            try {
+                return JSON.parse(viewResult);
+            }
+            catch (err) {
+                return null;
+            }
         });
     }
     search(filter, config) {
@@ -111,22 +115,22 @@ class PnpmPackageManager extends base_package_manager_1.BasePackageManager {
     }
 }
 __decorate([
-    decorators_1.exported("pnpm")
+    (0, decorators_1.exported)("pnpm")
 ], PnpmPackageManager.prototype, "install", null);
 __decorate([
-    decorators_1.exported("pnpm")
+    (0, decorators_1.exported)("pnpm")
 ], PnpmPackageManager.prototype, "uninstall", null);
 __decorate([
-    decorators_1.exported("pnpm")
+    (0, decorators_1.exported)("pnpm")
 ], PnpmPackageManager.prototype, "view", null);
 __decorate([
-    decorators_1.exported("pnpm")
+    (0, decorators_1.exported)("pnpm")
 ], PnpmPackageManager.prototype, "search", null);
 __decorate([
-    decorators_1.exported("pnpm")
+    (0, decorators_1.exported)("pnpm")
 ], PnpmPackageManager.prototype, "getRegistryPackageData", null);
 __decorate([
-    decorators_1.exported("pnpm")
+    (0, decorators_1.exported)("pnpm")
 ], PnpmPackageManager.prototype, "getCachePath", null);
 exports.PnpmPackageManager = PnpmPackageManager;
 yok_1.injector.register("pnpm", PnpmPackageManager);

package/lib/project-data.js

@@ -61,7 +61,7 @@ class ProjectData {
         const nsConfig = this.projectConfig.readConfig(projectDir);
         let packageJsonData = null;
         try {
-            packageJsonData = helpers_1.parseJson(packageJsonContent);
+            packageJsonData = (0, helpers_1.parseJson)(packageJsonContent);
         }
         catch (err) {
             this.$errors.fail(`The project file ${this.projectFilePath} is corrupted. ${os_1.EOL}` +
@@ -217,10 +217,10 @@ ProjectData.PROJECT_TYPES = [
     },
 ];
 __decorate([
-    decorators_1.cache()
+    (0, decorators_1.cache)()
 ], ProjectData.prototype, "initializeProjectIdentifiers", null);
 __decorate([
-    decorators_1.cache()
+    (0, decorators_1.cache)()
 ], ProjectData.prototype, "warnProjectId", null);
 exports.ProjectData = ProjectData;
 yok_1.injector.register("projectData", ProjectData, true);

package/lib/services/analytics/analytics-broker.js

@@ -48,6 +48,6 @@ class AnalyticsBroker {
     }
 }
 __decorate([
-    decorators_1.cache()
+    (0, decorators_1.cache)()
 ], AnalyticsBroker.prototype, "getGoogleAnalyticsProvider", null);
 exports.AnalyticsBroker = AnalyticsBroker;

package/lib/services/analytics/analytics-service.js

@@ -46,7 +46,7 @@ class AnalyticsService {
                 const initialTrackFeatureUsageStatus = yield this.getStatus(this.$staticConfig.TRACK_FEATURE_USAGE_SETTING_NAME);
                 let trackFeatureUsage = initialTrackFeatureUsageStatus === "enabled";
                 if ((yield this.isNotConfirmed(this.$staticConfig.TRACK_FEATURE_USAGE_SETTING_NAME)) &&
-                    helpers_1.isInteractive()) {
+                    (0, helpers_1.isInteractive)()) {
                     const message = `Do you want to help us improve ${this.$analyticsSettingsService.getClientName()} by automatically sending anonymous usage statistics? We will not use this information to identify or contact you.`;
                     trackFeatureUsage = yield this.$prompter.confirm(message, () => true);
                     yield this.setStatus(this.$staticConfig.TRACK_FEATURE_USAGE_SETTING_NAME, trackFeatureUsage);
@@ -172,7 +172,7 @@ class AnalyticsService {
         gaSettings.customDimensions = gaSettings.customDimensions || {};
         gaSettings.customDimensions["cd5"] =
             this.$options.analyticsClient ||
-                (helpers_1.isInteractive() ? "CLI" : "Unknown");
+                ((0, helpers_1.isInteractive)() ? "CLI" : "Unknown");
         this.setProjectRelatedCustomDimensions(gaSettings.customDimensions);
         const googleAnalyticsData = _.merge({
             type: "googleAnalyticsData",
@@ -308,7 +308,7 @@ class AnalyticsService {
             if (!_.has(this.analyticsStatuses, settingName)) {
                 const settingValue = yield this.$userSettingsService.getSettingValue(settingName);
                 if (settingValue) {
-                    const isEnabled = helpers_1.toBoolean(settingValue);
+                    const isEnabled = (0, helpers_1.toBoolean)(settingValue);
                     if (isEnabled) {
                         this.analyticsStatuses[settingName] = "enabled";
                     }
@@ -361,10 +361,10 @@ class AnalyticsService {
 }
 AnalyticsService.ANALYTICS_BROKER_START_TIMEOUT = 10 * 1000;
 __decorate([
-    decorators_1.cache()
+    (0, decorators_1.cache)()
 ], AnalyticsService.prototype, "getAnalyticsBroker", null);
 __decorate([
-    decorators_1.cache()
+    (0, decorators_1.cache)()
 ], AnalyticsService.prototype, "initAnalyticsStatuses", null);
 exports.AnalyticsService = AnalyticsService;
 yok_1.injector.register("analyticsService", AnalyticsService);

package/lib/services/analytics/google-analytics-provider.js

@@ -34,7 +34,7 @@ class GoogleAnalyticsProvider {
     }
     trackHit(trackInfo) {
         return __awaiter(this, void 0, void 0, function* () {
-            const sessionId = uuid_1.v4();
+            const sessionId = (0, uuid_1.v4)();
             try {
                 yield this.track(this.$config.GA_TRACKING_ID, trackInfo, sessionId);
             }
@@ -166,7 +166,7 @@ class GoogleAnalyticsProvider {
     }
 }
 __decorate([
-    decorators_1.cache()
+    (0, decorators_1.cache)()
 ], GoogleAnalyticsProvider.prototype, "getVisitor", null);
 exports.GoogleAnalyticsProvider = GoogleAnalyticsProvider;
 yok_1.injector.register("googleAnalyticsProvider", GoogleAnalyticsProvider);

package/lib/services/analytics-settings-service.js

@@ -91,7 +91,7 @@ class AnalyticsSettingsService {
         return __awaiter(this, void 0, void 0, function* () {
             let guid = yield this.$userSettingsService.getSettingValue(settingName);
             if (!guid) {
-                guid = helpers_1.createGUID(false);
+                guid = (0, helpers_1.createGUID)(false);
                 this.$logger.trace(`Setting new ${settingName}: ${guid}.`);
                 yield this.$userSettingsService.saveSetting(settingName, guid);
             }
@@ -101,12 +101,12 @@ class AnalyticsSettingsService {
 }
 AnalyticsSettingsService.SESSIONS_STARTED_KEY_PREFIX = "SESSIONS_STARTED_";
 __decorate([
-    decorators_1.exported("analyticsSettingsService")
+    (0, decorators_1.exported)("analyticsSettingsService")
 ], AnalyticsSettingsService.prototype, "getClientId", null);
 __decorate([
-    decorators_1.exported("analyticsSettingsService")
+    (0, decorators_1.exported)("analyticsSettingsService")
 ], AnalyticsSettingsService.prototype, "getPlaygroundInfo", null);
 __decorate([
-    decorators_1.exported("analyticsSettingsService")
+    (0, decorators_1.exported)("analyticsSettingsService")
 ], AnalyticsSettingsService.prototype, "getUserAgentString", null);
 yok_1.injector.register("analyticsSettingsService", AnalyticsSettingsService);

package/lib/services/android/android-bundle-tool-service.js

@@ -19,11 +19,11 @@ class AndroidBundleToolService {
         this.$childProcess = $childProcess;
         this.$sysInfo = $sysInfo;
         this.$errors = $errors;
-        this.aabToolPath = path_1.resolve(path_1.join(__dirname, "../../../vendor/aab-tool/bundletool.jar"));
+        this.aabToolPath = (0, path_1.resolve)((0, path_1.join)(__dirname, "../../../vendor/aab-tool/bundletool.jar"));
     }
     buildApks(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!helpers_1.hasValidAndroidSigning(options.signingData)) {
+            if (!(0, helpers_1.hasValidAndroidSigning)(options.signingData)) {
                 this.$errors.fail(`Unable to build "apks" without a full signing information.`);
             }
             const aabToolResult = yield this.execBundleTool([

package/lib/services/android/gradle-build-args-service.js

@@ -47,6 +47,9 @@ class GradleBuildArgsService {
         });
         this.$projectData.initializeProjectData(buildData.projectDir);
         args.push(`-PcompileSdk=android-${toolsInfo.compileSdkVersion}`, `-PtargetSdk=${toolsInfo.targetSdkVersion}`, `-PbuildToolsVersion=${toolsInfo.buildToolsVersion}`, `-PgenerateTypings=${toolsInfo.generateTypings}`, `-PappPath=${this.$projectData.getAppDirectoryPath()}`, `-PappResourcesPath=${this.$projectData.getAppResourcesDirectoryPath()}`);
+        if (buildData.gradleArgs) {
+            args.push(buildData.gradleArgs);
+        }
         if (buildData.release) {
             args.push("-Prelease", `-PksPath=${path.resolve(buildData.keyStorePath)}`, `-Palias=${buildData.keyStoreAlias}`, `-Ppassword=${buildData.keyStoreAliasPassword}`, `-PksPassword=${buildData.keyStorePassword}`);
         }

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

@@ -32,9 +32,10 @@ class GradleBuildService extends events_1.EventEmitter {
                 cwd: projectRoot,
                 message: "Gradle build...",
                 stdio: buildData.buildOutputStdio,
+                gradlePath: buildData.gradlePath,
                 spawnOptions,
             };
-            yield helpers_1.attachAwaitDetach(constants.BUILD_OUTPUT_EVENT_NAME, this.$childProcess, (data) => this.emit(constants.BUILD_OUTPUT_EVENT_NAME, data), this.$gradleCommandService.executeCommand(buildTaskArgs, gradleCommandOptions));
+            yield (0, helpers_1.attachAwaitDetach)(constants.BUILD_OUTPUT_EVENT_NAME, this.$childProcess, (data) => this.emit(constants.BUILD_OUTPUT_EVENT_NAME, data), this.$gradleCommandService.executeCommand(buildTaskArgs, gradleCommandOptions));
         });
     }
     cleanProject(projectRoot, buildData) {
@@ -43,6 +44,7 @@ class GradleBuildService extends events_1.EventEmitter {
             const gradleCommandOptions = {
                 cwd: projectRoot,
                 message: "Gradle clean...",
+                gradlePath: buildData.gradlePath,
             };
             yield this.$gradleCommandService.executeCommand(cleanTaskArgs, gradleCommandOptions);
         });

package/lib/services/android/gradle-command-service.js

@@ -19,13 +19,12 @@ class GradleCommandService {
         this.$logger = $logger;
     }
     executeCommand(gradleArgs, options) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const { message, cwd, stdio, spawnOptions } = options;
             this.$logger.info(message);
             const childProcessOptions = { cwd, stdio: stdio || "inherit" };
-            const gradleExecutable = this.$hostInfo.isWindows
-                ? "gradlew.bat"
-                : "./gradlew";
+            const gradleExecutable = (_a = options.gradlePath) !== null && _a !== void 0 ? _a : (this.$hostInfo.isWindows ? "gradlew.bat" : "./gradlew");
             const result = yield this.executeCommandSafe(gradleExecutable, gradleArgs, childProcessOptions, spawnOptions);
             return result;
         });

package/lib/services/android-device-debug-service.js

@@ -145,7 +145,7 @@ class AndroidDeviceDebugService extends debug_service_base_1.DebugServiceBase {
                 maxWait--;
                 debuggerStarted = forwardsResult.indexOf(waitText) === -1;
                 if (!debuggerStarted) {
-                    yield helpers_1.sleep(500);
+                    yield (0, helpers_1.sleep)(500);
                 }
             }
             if (debuggerStarted) {
@@ -164,10 +164,10 @@ class AndroidDeviceDebugService extends debug_service_base_1.DebugServiceBase {
     }
 }
 __decorate([
-    decorators_1.performanceLog()
+    (0, decorators_1.performanceLog)()
 ], AndroidDeviceDebugService.prototype, "debug", null);
 __decorate([
-    decorators_1.performanceLog()
+    (0, decorators_1.performanceLog)()
 ], AndroidDeviceDebugService.prototype, "debugCore", null);
 exports.AndroidDeviceDebugService = AndroidDeviceDebugService;
 yok_1.injector.register("androidDeviceDebugService", AndroidDeviceDebugService, false);