nativescript 8.2.1 → 8.2.2

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

@@ -22,6 +22,7 @@ const helpers_1 = require("../common/helpers");
 const xml2js_1 = require("xml2js");
 const yok_1 = require("../common/yok");
 const _ = require("lodash");
+const resolve_package_path_1 = require("@rigor789/resolve-package-path");
 class AndroidPluginBuildService {
     constructor($fs, $childProcess, $hostInfo, $androidToolsInfo, $logger, $packageManager, $projectData, $projectDataService, $devicePlatformsConstants, $errors, $filesHashService, $hooksService, $injector, $watchIgnoreListService) {
         this.$fs = $fs;
@@ -293,9 +294,40 @@ class AndroidPluginBuildService {
             return runtimeVersion;
         });
     }
+    getLocalGradleVersions() {
+        const installedRuntimePackageJSONPath = (0, resolve_package_path_1.resolvePackageJSONPath)(constants_1.SCOPED_ANDROID_RUNTIME_NAME, {
+            paths: [this.$projectData.projectDir],
+        });
+        if (!installedRuntimePackageJSONPath) {
+            return null;
+        }
+        const installedRuntimePackageJSON = this.$fs.readJson(installedRuntimePackageJSONPath);
+        if (!installedRuntimePackageJSON) {
+            return null;
+        }
+        if (installedRuntimePackageJSON.version_info) {
+            const { gradle, gradleAndroid, } = installedRuntimePackageJSON.version_info;
+            return {
+                gradleVersion: gradle,
+                gradleAndroidPluginVersion: gradleAndroid,
+            };
+        }
+        if (installedRuntimePackageJSON.gradle) {
+            const { version, android } = installedRuntimePackageJSON.gradle;
+            return {
+                gradleVersion: version,
+                gradleAndroidPluginVersion: android,
+            };
+        }
+        return null;
+    }
     getGradleVersions(runtimeVersion) {
         return __awaiter(this, void 0, void 0, function* () {
             let runtimeGradleVersions = null;
+            const localVersionInfo = this.getLocalGradleVersions();
+            if (localVersionInfo) {
+                return localVersionInfo;
+            }
             try {
                 let output = yield this.$packageManager.view(`${constants_1.SCOPED_ANDROID_RUNTIME_NAME}@${runtimeVersion}`, { version_info: true });
                 if (!output) {

package/lib/services/android-project-service.js

@@ -27,18 +27,24 @@ const constants_1 = require("../common/constants");
 const helpers_1 = require("../common/helpers");
 const decorators_1 = require(".././common/decorators");
 const yok_1 = require("../common/yok");
-function topologicalSortNativeDependencies(nativeDeps, start = [], depth = 0) {
-    const processedDeps = nativeDeps.reduce((accumulator, nativeDep) => {
-        if (nativeDep.dependencies.every(Array.prototype.includes, accumulator.map((n) => n.name))) {
-            accumulator.push(nativeDep);
+function topologicalSortNativeDependencies(dependencies, start = [], depth = 0, total = 0) {
+    if (total === 0) {
+        total = dependencies.length;
+    }
+    const sortedDeps = dependencies.reduce((sortedDeps, currentDependency) => {
+        const allSubDependenciesProcessed = currentDependency.dependencies.every((subDependency) => {
+            return sortedDeps.some((dep) => dep.name === subDependency);
+        });
+        if (allSubDependenciesProcessed) {
+            sortedDeps.push(currentDependency);
         }
-        return accumulator;
+        return sortedDeps;
     }, start);
-    const remainingDeps = nativeDeps.filter((nativeDep) => !processedDeps.includes(nativeDep));
-    if (remainingDeps.length && depth <= nativeDeps.length) {
-        return topologicalSortNativeDependencies(remainingDeps, processedDeps, depth + 1);
+    const remainingDeps = dependencies.filter((nativeDep) => !sortedDeps.includes(nativeDep));
+    if (remainingDeps.length && sortedDeps.length < total) {
+        return topologicalSortNativeDependencies(remainingDeps, sortedDeps, depth + 1, total);
     }
-    return processedDeps;
+    return sortedDeps;
 }
 class AndroidProjectService extends projectServiceBaseLib.PlatformProjectServiceBase {
     constructor($androidToolsInfo, $errors, $fs, $logger, $projectDataService, $options, $injector, $devicePlatformsConstants, $androidPluginBuildService, $platformEnvironmentRequirements, $androidResourcesMigrationService, $filesHashService, $gradleCommandService, $gradleBuildService, $analyticsService) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "preferGlobal": true,
-  "version": "8.2.1",
+  "version": "8.2.2",
   "author": "NativeScript <support@nativescript.org>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {