fix(plugin-build): invalid path argument

partially fixes #5387 This fixes the `ns plugin build` command, however `ns plugin create` will still fail - that's an issue with the plugin-seed - to be addressed separately.
NativeScript · Oct 21, 2020 · 1fc3893 · 1fc3893
1 parent becbe60
commit 1fc3893
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 24 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -52,12 +52,14 @@
     },
     {
       "name": "Attach to Node Debugger",
-      "port": 9229,
+      "type": "node",
       "request": "attach",
+      "port": 9229,
+      "address": "127.0.0.1",
       "skipFiles": [
         "<node_internals>/**"
       ],
-      "type": "pwa-node"
+      "sourceMaps": true
     }
   ]
 }
diff --git a/lib/services/android-plugin-build-service.ts b/lib/services/android-plugin-build-service.ts
@@ -6,7 +6,7 @@ import {
 	RESOURCES_DIR,
 	AndroidBuildDefaults,
 	PLUGIN_BUILD_DATA_FILENAME,
-	PlatformTypes,
+	SCOPED_ANDROID_RUNTIME_NAME,
 } from "../constants";
 import { getShortPluginName, hook } from "../common/helpers";
 import { Builder, parseString } from "xml2js";
@@ -16,7 +16,6 @@ import {
 	IAndroidToolsInfo,
 	IWatchIgnoreListService,
 } from "../declarations";
-import { IBasePluginData } from "../definitions/plugins";
 import { IPlatformsDataService } from "../definitions/platform";
 import { IProjectDataService } from "../definitions/project";
 import {
@@ -440,16 +439,9 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 		}
 
 		if (!runtimeGradleVersions) {
-			const runtimePackage = this.$projectDataService.getRuntimePackage(
-				projectDir,
-				PlatformTypes.android
-			);
-			const latestRuntimeVersion = await this.getLatestRuntimeVersion(
-				runtimePackage
-			);
+			const latestRuntimeVersion = await this.getLatestRuntimeVersion();
 			runtimeGradleVersions = await this.getGradleVersions(
-				latestRuntimeVersion,
-				runtimePackage
+				latestRuntimeVersion
 			);
 			this.$logger.trace(
 				`Got gradle versions ${JSON.stringify(
@@ -461,22 +453,23 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 		return runtimeGradleVersions || {};
 	}
 
-	private async getLatestRuntimeVersion(
-		runtimePackage: IBasePluginData
-	): Promise<string> {
+	private async getLatestRuntimeVersion(): Promise<string> {
 		let runtimeVersion: string = null;
 
 		try {
-			const result = await this.$packageManager.view(runtimePackage.name, {
-				"dist-tags": true,
-			});
+			const result = await this.$packageManager.view(
+				SCOPED_ANDROID_RUNTIME_NAME,
+				{
+					"dist-tags": true,
+				}
+			);
 			runtimeVersion = result.latest;
 		} catch (err) {
 			this.$logger.trace(
 				`Error while getting latest android runtime version from view command: ${err}`
 			);
 			const registryData = await this.$packageManager.getRegistryPackageData(
-				runtimePackage.name
+				SCOPED_ANDROID_RUNTIME_NAME
 			);
 			runtimeVersion = registryData["dist-tags"].latest;
 		}
@@ -485,16 +478,15 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 	}
 
 	private async getGradleVersions(
-		runtimeVersion: string,
-		runtimePackage: IBasePluginData
+		runtimeVersion: string
 	): Promise<IRuntimeGradleVersions> {
 		let runtimeGradleVersions: {
 			gradle: { version: string; android: string };
 		} = null;
 
 		try {
 			const output = await this.$packageManager.view(
-				`${runtimePackage.name}@${runtimeVersion}`,
+				`${SCOPED_ANDROID_RUNTIME_NAME}@${runtimeVersion}`,
 				{ gradle: true }
 			);
 			runtimeGradleVersions = { gradle: output };
@@ -503,7 +495,7 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 				`Error while getting gradle data for android runtime from view command: ${err}`
 			);
 			const registryData = await this.$packageManager.getRegistryPackageData(
-				runtimePackage.name
+				SCOPED_ANDROID_RUNTIME_NAME
 			);
 			runtimeGradleVersions = registryData.versions[runtimeVersion];
 		}