nativescript 8.7.2 → 8.8.0-alpha.1

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

@@ -44,7 +44,7 @@ class AnalyticsService {
         return __awaiter(this, void 0, void 0, function* () {
             if (yield this.$analyticsSettingsService.canDoRequest()) {
                 const initialTrackFeatureUsageStatus = yield this.getStatus(this.$staticConfig.TRACK_FEATURE_USAGE_SETTING_NAME);
-                let trackFeatureUsage = initialTrackFeatureUsageStatus === "enabled" /* AnalyticsStatus.enabled */;
+                let trackFeatureUsage = initialTrackFeatureUsageStatus === "enabled";
                 if ((yield this.isNotConfirmed(this.$staticConfig.TRACK_FEATURE_USAGE_SETTING_NAME)) &&
                     (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.`;
@@ -65,15 +65,15 @@ class AnalyticsService {
     setStatus(settingName, enabled) {
         return __awaiter(this, void 0, void 0, function* () {
             this.analyticsStatuses[settingName] = enabled
-                ? "enabled" /* AnalyticsStatus.enabled */
-                : "disabled" /* AnalyticsStatus.disabled */;
+                ? "enabled"
+                : "disabled";
             yield this.$userSettingsService.saveSetting(settingName, enabled.toString());
         });
     }
     isEnabled(settingName) {
         return __awaiter(this, void 0, void 0, function* () {
             const analyticsStatus = yield this.getStatus(settingName);
-            return analyticsStatus === "enabled" /* AnalyticsStatus.enabled */;
+            return analyticsStatus === "enabled";
         });
     }
     getStatusMessage(settingName, jsonFormat, readableSettingName) {
@@ -86,8 +86,8 @@ class AnalyticsService {
         return __awaiter(this, void 0, void 0, function* () {
             const acceptTracking = !!(settings && settings.acceptTrackFeatureUsage);
             const googleAnalyticsEventData = {
-                googleAnalyticsDataType: "event" /* GoogleAnalyticsDataType.Event */,
-                action: "Accept Tracking" /* TrackActionNames.AcceptTracking */,
+                googleAnalyticsDataType: "event",
+                action: "Accept Tracking",
                 label: acceptTracking.toString(),
             };
             yield this.forcefullyTrackInGoogleAnalytics(googleAnalyticsEventData);
@@ -97,7 +97,7 @@ class AnalyticsService {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.initAnalyticsStatuses();
             if (!this.$staticConfig.disableAnalytics &&
-                this.analyticsStatuses[this.$staticConfig.TRACK_FEATURE_USAGE_SETTING_NAME] === "enabled" /* AnalyticsStatus.enabled */) {
+                this.analyticsStatuses[this.$staticConfig.TRACK_FEATURE_USAGE_SETTING_NAME] === "enabled") {
                 return this.forcefullyTrackInGoogleAnalytics(gaSettings);
             }
         });
@@ -112,8 +112,6 @@ class AnalyticsService {
             const isForDevice = device ? !device.isEmulator : data.isForDevice;
             let label = "";
             label = this.addDataToLabel(label, normalizedPlatform);
-            // In some cases (like in case action is Build and platform is Android), we do not know if the deviceType is emulator or device.
-            // Just exclude the device_type in this case.
             if (isForDevice !== null && isForDevice !== undefined) {
                 const deviceType = isForDevice
                     ? constants_1.DeviceTypes.Device
@@ -131,7 +129,7 @@ class AnalyticsService {
             const customDimensions = {};
             this.setProjectRelatedCustomDimensions(customDimensions, data.projectDir);
             const googleAnalyticsEventData = {
-                googleAnalyticsDataType: "event" /* GoogleAnalyticsDataType.Event */,
+                googleAnalyticsDataType: "event",
                 action: data.action,
                 label,
                 customDimensions,
@@ -146,7 +144,7 @@ class AnalyticsService {
                 if (this.brokerProcess && this.brokerProcess.connected) {
                     let timer;
                     const handler = (data) => {
-                        if (data === "ProcessFinishedTasks" /* DetachedProcessMessages.ProcessFinishedTasks */) {
+                        if (data === "ProcessFinishedTasks") {
                             this.brokerProcess.removeListener("message", handler);
                             clearTimeout(timer);
                             resolve();
@@ -157,7 +155,7 @@ class AnalyticsService {
                         resolve();
                     }, 3000);
                     this.brokerProcess.on("message", handler);
-                    const msg = { type: "FinishTracking" /* TrackingTypes.FinishTracking */ };
+                    const msg = { type: "FinishTracking" };
                     this.brokerProcess.send(msg, (err) => this.$logger.trace(`Error while sending ${JSON.stringify(msg)}`));
                 }
                 else {
@@ -168,13 +166,13 @@ class AnalyticsService {
     }
     forcefullyTrackInGoogleAnalytics(gaSettings) {
         gaSettings.customDimensions = gaSettings.customDimensions || {};
-        gaSettings.customDimensions["cd5" /* GoogleAnalyticsCustomDimensions.client */] =
+        gaSettings.customDimensions["cd5"] =
             this.$options.analyticsClient ||
-                ((0, helpers_1.isInteractive)() ? "CLI" /* AnalyticsClients.Cli */ : "Unknown" /* AnalyticsClients.Unknown */);
+                ((0, helpers_1.isInteractive)() ? "CLI" : "Unknown");
         this.setProjectRelatedCustomDimensions(gaSettings.customDimensions);
         const googleAnalyticsData = _.merge({
-            type: "googleAnalyticsData" /* TrackingTypes.GoogleAnalyticsData */,
-            category: "CLI" /* AnalyticsClients.Cli */,
+            type: "googleAnalyticsData",
+            category: "CLI",
         }, gaSettings);
         this.$logger.trace("Will send the following information to Google Analytics:", googleAnalyticsData);
         return this.sendMessageToBroker(googleAnalyticsData);
@@ -185,15 +183,14 @@ class AnalyticsService {
                 projectDir = this.$projectHelper.projectDir;
             }
             catch (err) {
-                // In case there's no project dir here, the above getter will fail.
                 this.$logger.trace("Unable to get the projectDir from projectHelper", err);
             }
         }
         if (projectDir) {
             const projectData = this.$projectDataService.getProjectData(projectDir);
-            customDimensions["cd2" /* GoogleAnalyticsCustomDimensions.projectType */] =
+            customDimensions["cd2"] =
                 projectData.projectType;
-            customDimensions["cd9" /* GoogleAnalyticsCustomDimensions.isShared */] = projectData.isShared.toString();
+            customDimensions["cd9"] = projectData.isShared.toString();
         }
         return customDimensions;
     }
@@ -230,7 +227,7 @@ class AnalyticsService {
                 }
             });
             broker.on("message", (data) => {
-                if (data === "ProcessReadyToReceive" /* DetachedProcessMessages.ProcessReadyToReceive */) {
+                if (data === "ProcessReadyToReceive") {
                     clearTimeout(timeoutId);
                     if (!isSettled) {
                         isSettled = true;
@@ -255,7 +252,7 @@ class AnalyticsService {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.initAnalyticsStatuses();
             if (!this.$staticConfig.disableAnalytics &&
-                this.analyticsStatuses[settingName] === "enabled" /* AnalyticsStatus.enabled */) {
+                this.analyticsStatuses[settingName] === "enabled") {
                 return this.sendMessageToBroker(trackingInfo);
             }
         });
@@ -309,14 +306,14 @@ class AnalyticsService {
                 if (settingValue) {
                     const isEnabled = (0, helpers_1.toBoolean)(settingValue);
                     if (isEnabled) {
-                        this.analyticsStatuses[settingName] = "enabled" /* AnalyticsStatus.enabled */;
+                        this.analyticsStatuses[settingName] = "enabled";
                     }
                     else {
-                        this.analyticsStatuses[settingName] = "disabled" /* AnalyticsStatus.disabled */;
+                        this.analyticsStatuses[settingName] = "disabled";
                     }
                 }
                 else {
-                    this.analyticsStatuses[settingName] = "not confirmed" /* AnalyticsStatus.notConfirmed */;
+                    this.analyticsStatuses[settingName] = "not confirmed";
                 }
             }
             return this.analyticsStatuses[settingName];
@@ -325,7 +322,7 @@ class AnalyticsService {
     isNotConfirmed(settingName) {
         return __awaiter(this, void 0, void 0, function* () {
             const analyticsStatus = yield this.getStatus(settingName);
-            return analyticsStatus === "not confirmed" /* AnalyticsStatus.notConfirmed */;
+            return analyticsStatus === "not confirmed";
         });
     }
     getHumanReadableStatusMessage(settingName, readableSettingName) {
@@ -343,15 +340,15 @@ class AnalyticsService {
     getJsonStatusMessage(settingName) {
         return __awaiter(this, void 0, void 0, function* () {
             const status = yield this.getStatus(settingName);
-            const enabled = status === "not confirmed" /* AnalyticsStatus.notConfirmed */
+            const enabled = status === "not confirmed"
                 ? null
-                : status === "enabled" /* AnalyticsStatus.enabled */;
+                : status === "enabled";
             return JSON.stringify({ enabled });
         });
     }
     trackException(exception, message) {
         const data = {
-            type: "exception" /* TrackingTypes.Exception */,
+            type: "exception",
             exception,
             message,
         };
@@ -367,4 +364,3 @@ __decorate([
 ], AnalyticsService.prototype, "initAnalyticsStatuses", null);
 exports.AnalyticsService = AnalyticsService;
 yok_1.injector.register("analyticsService", AnalyticsService);
-//# sourceMappingURL=analytics-service.js.map

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

@@ -39,7 +39,7 @@ class GoogleAnalyticsProvider {
             }
             catch (e) {
                 this.analyticsLoggingService.logData({
-                    type: "Error" /* FileLogMessageType.Error */,
+                    type: "Error",
                     message: `Unable to track information ${JSON.stringify(trackInfo)}. Error is: ${e}`,
                 });
                 this.$logger.trace("Analytics exception: ", e);
@@ -73,10 +73,10 @@ class GoogleAnalyticsProvider {
             const visitor = this.getVisitor(gaTrackingId, proxy);
             yield this.setCustomDimensions(visitor, trackInfo.customDimensions, sessionId);
             switch (trackInfo.googleAnalyticsDataType) {
-                case "pageview" /* GoogleAnalyticsDataType.Page */:
+                case "pageview":
                     yield this.trackPageView(visitor, trackInfo);
                     break;
-                case "event" /* GoogleAnalyticsDataType.Event */:
+                case "event":
                     yield this.trackEvent(visitor, trackInfo);
                     break;
             }
@@ -85,13 +85,13 @@ class GoogleAnalyticsProvider {
     setCustomDimensions(visitor, customDimensions, sessionId) {
         return __awaiter(this, void 0, void 0, function* () {
             const defaultValues = {
-                ["cd1" /* GoogleAnalyticsCustomDimensions.cliVersion */]: this.$staticConfig.version,
-                ["cd6" /* GoogleAnalyticsCustomDimensions.nodeVersion */]: process.version,
-                ["cd3" /* GoogleAnalyticsCustomDimensions.clientID */]: this.clientId,
-                ["cd2" /* GoogleAnalyticsCustomDimensions.projectType */]: null,
-                ["cd9" /* GoogleAnalyticsCustomDimensions.isShared */]: null,
-                ["cd4" /* GoogleAnalyticsCustomDimensions.sessionID */]: sessionId,
-                ["cd5" /* GoogleAnalyticsCustomDimensions.client */]: "Unknown" /* AnalyticsClients.Unknown */,
+                ["cd1"]: this.$staticConfig.version,
+                ["cd6"]: process.version,
+                ["cd3"]: this.clientId,
+                ["cd2"]: null,
+                ["cd9"]: null,
+                ["cd4"]: sessionId,
+                ["cd5"]: "Unknown",
             };
             customDimensions = _.merge(defaultValues, customDimensions);
             _.each(customDimensions, (value, key) => {
@@ -109,7 +109,7 @@ class GoogleAnalyticsProvider {
                     this.analyticsLoggingService.logData({
                         message: `Unable to track event with category: '${trackInfo.category}', action: '${trackInfo.action}', label: '${trackInfo.label}', ` +
                             `value: '${trackInfo.value}' attached page: ${this.currentPage}. Error is: ${err}.`,
-                        type: "Error" /* FileLogMessageType.Error */,
+                        type: "Error",
                     });
                     reject(err);
                     return;
@@ -132,7 +132,7 @@ class GoogleAnalyticsProvider {
                 if (err) {
                     this.analyticsLoggingService.logData({
                         message: `Unable to track pageview with path '${trackInfo.path}' and title: '${trackInfo.title}' Error is: ${err}.`,
-                        type: "Error" /* FileLogMessageType.Error */,
+                        type: "Error",
                     });
                     reject(err);
                     return;
@@ -150,4 +150,3 @@ __decorate([
 ], GoogleAnalyticsProvider.prototype, "getVisitor", null);
 exports.GoogleAnalyticsProvider = GoogleAnalyticsProvider;
 yok_1.injector.register("googleAnalyticsProvider", GoogleAnalyticsProvider);
-//# sourceMappingURL=google-analytics-provider.js.map

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

@@ -76,10 +76,6 @@ class AnalyticsSettingsService {
         return userAgent;
     }
     getMacOSReleaseVersion(osRelease) {
-        // https://en.wikipedia.org/wiki/Darwin_(operating_system)#Release_history
-        // Each macOS version is labeled 10.<version>, where it looks like <versions> is taken from the major version returned by os.release() (16.x.x for example) and subtracting 4 from it.
-        // So the version becomes "10.12" in this case.
-        // Could be improved by spawning `system_profiler SPSoftwareDataType` and getting the System Version line from the result.
         const majorVersion = osRelease && _.first(osRelease.split("."));
         return majorVersion && `10.${+majorVersion - 4}`;
     }
@@ -106,4 +102,3 @@ __decorate([
     (0, decorators_1.exported)("analyticsSettingsService")
 ], AnalyticsSettingsService.prototype, "getUserAgentString", null);
 yok_1.injector.register("analyticsSettingsService", AnalyticsSettingsService);
-//# sourceMappingURL=analytics-settings-service.js.map

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

@@ -79,4 +79,3 @@ class AndroidBundleToolService {
 }
 exports.AndroidBundleToolService = AndroidBundleToolService;
 yok_1.injector.register("androidBundleToolService", AndroidBundleToolService);
-//# sourceMappingURL=android-bundle-tool-service.js.map

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

@@ -14,8 +14,7 @@ const path = require("path");
 const constants_1 = require("../../common/constants");
 const yok_1 = require("../../common/yok");
 class GradleBuildArgsService {
-    constructor($androidToolsInfo, $hooksService, $analyticsService, $staticConfig, $projectData, $logger) {
-        this.$androidToolsInfo = $androidToolsInfo;
+    constructor($hooksService, $analyticsService, $staticConfig, $projectData, $logger) {
         this.$hooksService = $hooksService;
         this.$analyticsService = $analyticsService;
         this.$staticConfig = $staticConfig;
@@ -29,7 +28,6 @@ class GradleBuildArgsService {
             if (yield this.$analyticsService.isEnabled(this.$staticConfig.TRACK_FEATURE_USAGE_SETTING_NAME)) {
                 args.push("-PgatherAnalyticsData=true");
             }
-            // allow modifying gradle args from a `before-build-task-args` hook
             yield this.$hooksService.executeBeforeHooks("build-task-args", {
                 hookArgs: { args },
             });
@@ -43,12 +41,8 @@ class GradleBuildArgsService {
     }
     getBaseTaskArgs(buildData) {
         const args = this.getBuildLoggingArgs();
-        const toolsInfo = this.$androidToolsInfo.getToolsInfo({
-            projectDir: buildData.projectDir,
-        });
-        // ensure we initialize project data
         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()}`);
+        args.push(`-PappPath=${this.$projectData.getAppDirectoryPath()}`, `-PappResourcesPath=${this.$projectData.getAppResourcesDirectoryPath()}`);
         if (buildData.gradleArgs) {
             args.push(buildData.gradleArgs);
         }
@@ -78,4 +72,3 @@ class GradleBuildArgsService {
 }
 exports.GradleBuildArgsService = GradleBuildArgsService;
 yok_1.injector.register("gradleBuildArgsService", GradleBuildArgsService);
-//# sourceMappingURL=gradle-build-args-service.js.map

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

@@ -52,4 +52,3 @@ class GradleBuildService extends events_1.EventEmitter {
 }
 exports.GradleBuildService = GradleBuildService;
 yok_1.injector.register("gradleBuildService", GradleBuildService);
-//# sourceMappingURL=gradle-build-service.js.map

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

@@ -47,4 +47,3 @@ class GradleCommandService {
 }
 exports.GradleCommandService = GradleCommandService;
 yok_1.injector.register("gradleCommandService", GradleCommandService);
-//# sourceMappingURL=gradle-command-service.js.map

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

@@ -43,7 +43,6 @@ class AndroidDeviceDebugService extends debug_service_base_1.DebugServiceBase {
         return __awaiter(this, void 0, void 0, function* () {
             this._packageName = debugData.applicationIdentifier;
             const result = yield this.debugCore(debugData.applicationIdentifier, debugOptions);
-            // TODO: extract this logic outside the debug service
             if (debugOptions.start && !debugOptions.justlaunch) {
                 const pid = yield this.$androidProcessService.getAppProcessId(this.deviceIdentifier, debugData.applicationIdentifier);
                 if (pid) {
@@ -69,7 +68,6 @@ class AndroidDeviceDebugService extends debug_service_base_1.DebugServiceBase {
             ]);
         });
     }
-    // TODO: Remove this method and reuse logic from androidProcessService
     getForwardedDebugPort(deviceId, packageName) {
         return __awaiter(this, void 0, void 0, function* () {
             let port = -1;
@@ -78,7 +76,6 @@ class AndroidDeviceDebugService extends debug_service_base_1.DebugServiceBase {
                 "--list",
             ]);
             const unixSocketName = `${packageName}-inspectorServer`;
-            //matches 123a188909e6czzc tcp:40001 localabstract:org.nativescript.testUnixSockets-debug
             const regexp = new RegExp(`(?:${deviceId} tcp:)([\\d]+)(?= localabstract:${unixSocketName})`, "g");
             const match = regexp.exec(forwardsResult);
             if (match) {
@@ -95,7 +92,6 @@ class AndroidDeviceDebugService extends debug_service_base_1.DebugServiceBase {
             return port;
         });
     }
-    // TODO: Remove this method and reuse logic from androidProcessService
     unixSocketForward(local, remote) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.device.adb.executeCommand([
@@ -127,7 +123,6 @@ class AndroidDeviceDebugService extends debug_service_base_1.DebugServiceBase {
             this.$logger.info("device: " + deviceId + " debug port: " + port + "\n");
         });
     }
-    // TODO: extract this logic outside the debug service
     validateRunningApp(deviceId, packageName) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!(yield this.isAppRunning(packageName, deviceId))) {
@@ -176,4 +171,3 @@ __decorate([
 ], AndroidDeviceDebugService.prototype, "debugCore", null);
 exports.AndroidDeviceDebugService = AndroidDeviceDebugService;
 yok_1.injector.register("androidDeviceDebugService", AndroidDeviceDebugService, false);
-//# sourceMappingURL=android-device-debug-service.js.map

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

@@ -27,11 +27,10 @@ class AndroidPluginBuildService {
     get $platformsDataService() {
         return this.$injector.resolve("platformsDataService");
     }
-    constructor($fs, $childProcess, $hostInfo, $androidToolsInfo, $logger, $packageManager, $projectData, $projectDataService, $devicePlatformsConstants, $errors, $filesHashService, $hooksService, $injector, $watchIgnoreListService) {
+    constructor($fs, $childProcess, $hostInfo, $logger, $packageManager, $projectData, $projectDataService, $devicePlatformsConstants, $errors, $filesHashService, $hooksService, $injector, $watchIgnoreListService) {
         this.$fs = $fs;
         this.$childProcess = $childProcess;
         this.$hostInfo = $hostInfo;
-        this.$androidToolsInfo = $androidToolsInfo;
         this.$logger = $logger;
         this.$packageManager = $packageManager;
         this.$projectData = $projectData;
@@ -63,15 +62,12 @@ class AndroidPluginBuildService {
         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"];
             }
-            // 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];
@@ -147,14 +143,6 @@ class AndroidPluginBuildService {
         }
         return result;
     }
-    /**
-     * 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);
@@ -192,7 +180,6 @@ class AndroidPluginBuildService {
         });
     }
     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);
     }
@@ -271,6 +258,17 @@ class AndroidPluginBuildService {
             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 = yield this.getXml(manifestContent);
+            if (xml["manifest"]) {
+                if (xml["manifest"]["$"]["package"]) {
+                    packageName = xml["manifest"]["$"]["package"];
+                }
+            }
+            this.replaceFileContent(buildGradlePath, "{{pluginNamespace}}", packageName);
         });
     }
     getRuntimeGradleVersions(projectDir) {
@@ -311,7 +309,6 @@ class AndroidPluginBuildService {
         });
     }
     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],
         });
@@ -346,23 +343,13 @@ class AndroidPluginBuildService {
             if (localVersionInfo) {
                 return localVersionInfo;
             }
-            // 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,
@@ -435,10 +422,6 @@ 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);
@@ -470,25 +453,12 @@ class AndroidPluginBuildService {
     buildPlugin(pluginBuildSettings) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            if (!pluginBuildSettings.androidToolsInfo) {
-                this.$androidToolsInfo.validateInfo({
-                    showWarningsAsErrors: true,
-                    validateTargetSdk: true,
-                    projectDir: pluginBuildSettings.projectDir,
-                });
-                pluginBuildSettings.androidToolsInfo =
-                    this.$androidToolsInfo.getToolsInfo({
-                        projectDir: pluginBuildSettings.projectDir,
-                    });
-            }
             const gradlew = (_a = pluginBuildSettings.gradlePath) !== null && _a !== void 0 ? _a : (this.$hostInfo.isWindows ? "gradlew.bat" : "./gradlew");
             const localArgs = [
                 "-p",
                 pluginBuildSettings.pluginDir,
                 "assembleRelease",
                 `-PtempBuild=true`,
-                `-PcompileSdk=android-${pluginBuildSettings.androidToolsInfo.compileSdkVersion}`,
-                `-PbuildToolsVersion=${pluginBuildSettings.androidToolsInfo.buildToolsVersion}`,
                 `-PappPath=${this.$projectData.getAppDirectoryPath()}`,
                 `-PappResourcesPath=${this.$projectData.getAppResourcesDirectoryPath()}`,
             ];
@@ -544,4 +514,3 @@ __decorate([
 ], AndroidPluginBuildService.prototype, "buildPlugin", null);
 exports.AndroidPluginBuildService = AndroidPluginBuildService;
 yok_1.injector.register("androidPluginBuildService", AndroidPluginBuildService);
-//# sourceMappingURL=android-plugin-build-service.js.map