nativescript 9.1.0-alpha.0 → 9.1.0-alpha.10

package/lib/declarations.d.ts

@@ -31,7 +31,7 @@ interface INodePackageManager {
 	install(
 		packageName: string,
 		pathToSave: string,
-		config: INodePackageManagerInstallOptions
+		config: INodePackageManagerInstallOptions,
 	): Promise<INpmInstallResultInfo>;
 
 	/**
@@ -44,7 +44,7 @@ interface INodePackageManager {
 	uninstall(
 		packageName: string,
 		config?: IDictionary<string | boolean>,
-		path?: string
+		path?: string,
 	): Promise<string>;
 
 	/**
@@ -84,7 +84,7 @@ interface INodePackageManager {
 	 */
 	search(
 		filter: string[],
-		config: IDictionary<string | boolean>
+		config: IDictionary<string | boolean>,
 	): Promise<string>;
 
 	/**
@@ -130,7 +130,7 @@ interface IPerformanceService {
 		methodInfo: string,
 		startTime: number,
 		endTime: number,
-		args: any[]
+		args: any[],
 	): void;
 
 	// Will return a reference time in milliseconds
@@ -141,39 +141,39 @@ interface IPackageInstallationManager {
 	install(
 		packageName: string,
 		packageDir: string,
-		options?: INpmInstallOptions
+		options?: INpmInstallOptions,
 	): Promise<any>;
 	uninstall(
 		packageName: string,
 		packageDir: string,
-		options?: IDictionary<string | boolean>
+		options?: IDictionary<string | boolean>,
 	): Promise<any>;
 	getLatestVersion(packageName: string): Promise<string>;
 	getNextVersion(packageName: string): Promise<string>;
 	getLatestCompatibleVersion(
 		packageName: string,
-		referenceVersion?: string
+		referenceVersion?: string,
 	): Promise<string>;
 	getMaxSatisfyingVersion(
 		packageName: string,
-		versionRange: string
+		versionRange: string,
 	): Promise<string>;
 	getLatestCompatibleVersionSafe(
 		packageName: string,
-		referenceVersion?: string
+		referenceVersion?: string,
 	): Promise<string>;
 	getInspectorFromCache(
 		inspectorNpmPackageName: string,
-		projectDir: string
+		projectDir: string,
 	): Promise<string>;
 	clearInspectorCache(): void;
 	getInstalledDependencyVersion(
 		packageName: string,
-		projectDir?: string
+		projectDir?: string,
 	): Promise<string>;
 	getMaxSatisfyingVersionSafe(
 		packageName: string,
-		versionIdentifier: string
+		versionIdentifier: string,
 	): Promise<string>;
 }
 
@@ -181,8 +181,7 @@ interface IPackageInstallationManager {
  * Describes options that can be passed to manipulate package installation.
  */
 interface INodePackageManagerInstallOptions
-	extends INpmInstallConfigurationOptions,
-		IDictionary<string | boolean> {
+	extends INpmInstallConfigurationOptions, IDictionary<string | boolean> {
 	/**
 	 * Destination of the installation.
 	 * @type {string}
@@ -266,7 +265,7 @@ interface INpmPeerDependencyInfo {
 				 * @type {string}
 				 */
 				requires: string;
-			}
+			},
 		];
 		/**
 		 * Dependencies of the dependency.
@@ -550,8 +549,7 @@ interface INpmInstallConfigurationOptionsBase {
 	ignoreScripts: boolean; //npm flag
 }
 
-interface INpmInstallConfigurationOptions
-	extends INpmInstallConfigurationOptionsBase {
+interface INpmInstallConfigurationOptions extends INpmInstallConfigurationOptionsBase {
 	disableNpmInstall: boolean;
 }
 
@@ -597,7 +595,8 @@ interface ITypingsOptions {
 }
 
 interface IOptions
-	extends IRelease,
+	extends
+		IRelease,
 		IDeviceIdentifier,
 		IJustLaunch,
 		IAvd,
@@ -622,7 +621,7 @@ interface IOptions
 	argv: IYargArgv;
 	validateOptions(
 		commandSpecificDashedOptions?: IDictionary<IDashedOption>,
-		projectData?: IProjectData
+		projectData?: IProjectData,
 	): void;
 	options: IDictionary<IDashedOption>;
 	shorthands: string[];
@@ -709,6 +708,7 @@ interface IOptions
 	dryRun: boolean;
 
 	platformOverride: string;
+	skipNative: boolean;
 	uniqueBundle: boolean;
 	// allow arbitrary options
 	[optionName: string]: any;
@@ -719,26 +719,22 @@ interface IEnvOptions {
 }
 
 interface IAndroidBuildOptionsSettings
-	extends IAndroidReleaseOptions,
-		IRelease,
-		Partial<IHasAndroidBundle> {}
+	extends IAndroidReleaseOptions, IRelease, Partial<IHasAndroidBundle> {}
 
 interface IHasAndroidBundle {
 	androidBundle: boolean;
 }
 
 interface IPlatformBuildData
-	extends IRelease,
-		IHasUseHotModuleReloadOption,
-		IBuildConfig,
-		IEnvOptions {}
+	extends IRelease, IHasUseHotModuleReloadOption, IBuildConfig, IEnvOptions {}
 
 interface IDeviceEmulator extends IHasEmulatorOption, IDeviceIdentifier {}
 
 interface IRunPlatformOptions extends IJustLaunch, IDeviceEmulator {}
 
 interface IDeployPlatformOptions
-	extends IAndroidReleaseOptions,
+	extends
+		IAndroidReleaseOptions,
 		IRelease,
 		IClean,
 		IDeviceEmulator,
@@ -834,7 +830,7 @@ interface IAndroidToolsInfo {
 	 */
 	validateJavacVersion(
 		installedJavaVersion: string,
-		options?: IAndroidToolsInfoOptions
+		options?: IAndroidToolsInfoOptions,
 	): boolean;
 
 	/**
@@ -913,14 +909,14 @@ interface IAppDebugSocketProxyFactory extends NodeJS.EventEmitter {
 		device: Mobile.IiOSDevice,
 		appId: string,
 		projectName: string,
-		projectDir: string
+		projectDir: string,
 	): Promise<any>;
 
 	ensureWebSocketProxy(
 		device: Mobile.IiOSDevice,
 		appId: string,
 		projectName: string,
-		projectDir: string
+		projectDir: string,
 	): Promise<any>;
 
 	removeAllProxies(): void;
@@ -939,12 +935,12 @@ interface IiOSSocketRequestExecutor {
 	executeAttachRequest(
 		device: Mobile.IiOSDevice,
 		timeout: number,
-		projectId: string
+		projectId: string,
 	): Promise<void>;
 	executeRefreshRequest(
 		device: Mobile.IiOSDevice,
 		timeout: number,
-		appId: string
+		appId: string,
 	): Promise<boolean>;
 }
 
@@ -995,7 +991,7 @@ interface IProjectNameService {
 	 */
 	ensureValidName(
 		projectName: string,
-		validateOptions?: { force: boolean }
+		validateOptions?: { force: boolean },
 	): Promise<string>;
 }
 
@@ -1089,7 +1085,7 @@ interface IBundleValidatorHelper {
 	 */
 	getBundlerDependencyVersion(
 		projectData: IProjectData,
-		bundlerName?: string
+		bundlerName?: string,
 	): string;
 }
 
@@ -1171,7 +1167,7 @@ interface IAssetsGenerationService {
 	 * @returns {Promise<void>}
 	 */
 	generateSplashScreens(
-		splashesGenerationData: IResourceGenerationData
+		splashesGenerationData: IResourceGenerationData,
 	): Promise<void>;
 }
 
@@ -1207,7 +1203,7 @@ interface IPlatformValidationService {
 		provision: true | string,
 		teamId: true | string,
 		projectData: IProjectData,
-		platform?: string
+		platform?: string,
 	): Promise<boolean>;
 
 	validatePlatformInstalled(platform: string, projectData: IProjectData): void;
@@ -1220,7 +1216,7 @@ interface IPlatformValidationService {
 	 */
 	isPlatformSupportedForOS(
 		platform: string,
-		projectData: IProjectData
+		projectData: IProjectData,
 	): boolean;
 }
 
@@ -1228,27 +1224,27 @@ interface IPlatformCommandHelper {
 	addPlatforms(
 		platforms: string[],
 		projectData: IProjectData,
-		frameworkPath?: string
+		frameworkPath?: string,
 	): Promise<void>;
 	cleanPlatforms(
 		platforms: string[],
 		projectData: IProjectData,
-		frameworkPath: string
+		frameworkPath: string,
 	): Promise<void>;
 	removePlatforms(
 		platforms: string[],
-		projectData: IProjectData
+		projectData: IProjectData,
 	): Promise<void>;
 	updatePlatforms(
 		platforms: string[],
-		projectData: IProjectData
+		projectData: IProjectData,
 	): Promise<void>;
 	getInstalledPlatforms(projectData: IProjectData): string[];
 	getAvailablePlatforms(projectData: IProjectData): string[];
 	getPreparedPlatforms(projectData: IProjectData): string[];
 	getCurrentPlatformVersion(
 		platform: string,
-		projectData: IProjectData
+		projectData: IProjectData,
 	): string;
 }
 

package/lib/definitions/nativescript-dev-xcode.d.ts

@@ -8,16 +8,27 @@ declare module "nativescript-dev-xcode" {
 	}
 
 	class project {
+		hash: any;
+		filepath: string;
 		constructor(filename: string);
 
 		parse(callback: () => void): void;
 		parseSync(): void;
 
+		generateUuid(): string;
+
 		writeSync(options: any): string;
 
 		addFramework(filepath: string, options?: Options): void;
 		removeFramework(filePath: string, options?: Options): void;
 
+
+		getProductFile(watchApptarget: target): any;
+		addToPbxFrameworksBuildPhase(file);
+		addToPbxCopyfilesBuildPhase(file, comment: string, targetid: string);
+		pbxFrameworksBuildPhaseObj(targetid: string): any;
+		pbxBuildFileSection(): {[k: string] : any};
+
 		addPbxGroup(
 			filePathsArray: any[],
 			name: string,
@@ -27,17 +38,30 @@ declare module "nativescript-dev-xcode" {
 
 		removePbxGroup(groupName: string, path: string): void;
 
+		addTargetDependency(target: string, dependencyTargets: string[]);
+
+		findTargetKey(name: string);
+		pbxTargetByName(name: string): target;
+		pbxNativeTargetSection(): {[key: string]: any};
+
 		addToHeaderSearchPaths(options?: Options): void;
 		removeFromHeaderSearchPaths(options?: Options): void;
 		updateBuildProperty(key: string, value: any): void;
 
 		pbxXCBuildConfigurationSection(): any;
 
+		buildPhaseObject(
+			buildPhaseType: string,
+			comment: string,
+			target: tstring
+		)
+
 		addTarget(
 			targetName: string,
 			targetType: string,
 			targetPath?: string,
-			parentTarget?: string
+			parentTarget?: string,
+			productTargetType?: string
 		): target;
 		addBuildPhase(
 			filePathsArray: string[],

package/lib/definitions/project.d.ts

@@ -130,10 +130,13 @@ interface INsConfigIOS extends INsConfigPlaform {
 	 * List packages to be included in the iOS build.
 	 */
 	SPMPackages?: Array<IOSSPMPackage>;
+	/**
+	 * Custom runtime package name
+	 */
+	runtimePackageName?: string;
 }
 
 interface INSConfigVisionOS extends INsConfigIOS {}
-interface INSConfigMacOS extends INsConfigIOS {}
 
 interface INsConfigAndroid extends INsConfigPlaform {
 	v8Flags?: string;
@@ -169,6 +172,11 @@ interface INsConfigAndroid extends INsConfigPlaform {
 	enableLineBreakpoints?: boolean;
 
 	enableMultithreadedJavascript?: boolean;
+
+	/**
+	 * Custom runtime package name
+	 */
+	runtimePackageName?: string;
 }
 
 interface INsConfigHooks {
@@ -189,10 +197,16 @@ interface INsConfig {
 	ios?: INsConfigIOS;
 	android?: INsConfigAndroid;
 	visionos?: INSConfigVisionOS;
-	macos?: INSConfigMacOS;
 	ignoredNativeDependencies?: string[];
 	hooks?: INsConfigHooks[];
 	projectName?: string;
+	/**
+	 * Legacy keys still found in user configs. Declared so the
+	 * runtime-package.json generation (PrepareController) can strip them
+	 * via destructuring without losing type safety.
+	 */
+	webpackPackageName?: string;
+	buildPath?: string;
 }
 
 interface IProjectData extends ICreateProjectData {
@@ -603,9 +617,7 @@ interface INativePrepare {
 }
 
 interface IBuildConfig
-	extends IAndroidBuildOptionsSettings,
-		IiOSBuildConfig,
-		IProjectDir {
+	extends IAndroidBuildOptionsSettings, IiOSBuildConfig, IProjectDir {
 	clean?: boolean;
 	architectures?: string[];
 	buildOutputStdio?: string;
@@ -617,7 +629,8 @@ interface IBuildConfig
  * Describes iOS-specific build configuration properties
  */
 interface IiOSBuildConfig
-	extends IBuildForDevice,
+	extends
+		IBuildForDevice,
 		IiCloudContainerEnvironment,
 		IDeviceIdentifier,
 		IProvision,
@@ -867,6 +880,7 @@ interface IAddExtensionsFromPathOptions extends IAddTargetFromPathOptions {
 
 interface IAddWatchAppFromPathOptions extends IAddTargetFromPathOptions {
 	watchAppFolderPath: string;
+	disableStubBinary?: boolean;
 }
 
 interface IRemoveExtensionsOptions {
@@ -875,6 +889,37 @@ interface IRemoveExtensionsOptions {
 
 interface IRemoveWatchAppOptions extends IRemoveExtensionsOptions {}
 
+interface IWatchAppJSONConfigModule {
+	name?: string;
+	path: string;
+	targetType?: string;
+	embed?: boolean;
+	frameworks?: Array<string | Record<string, string>>;
+	dependencies?: string[];
+	headerSearchPaths?: string[];
+	resources?: string[];
+	src?: string[];
+	linkerFlags?: string[];
+	buildConfigurationProperties?: Record<string, string>;
+	SPMPackages?: Array<IOSSPMPackage | string>;
+}
+interface IWatchAppJSONConfig {
+	targetType?: string;
+	forceAddEmbedWatchContent?: boolean;
+	sharedModulesBuildConfigurationProperties?: Record<string, string>;
+	basedir?: string;
+	infoPlistPath?: string;
+	xcprivacyPath?: string;
+	importSourcesFromMainFolder?: boolean;
+	importResourcesFromMainFolder?: boolean;
+	resources?: string[];
+	src?: string[];
+	resourcesExclude?: string[];
+	srcExclude?: string[];
+	modules: IWatchAppConfigModule[];
+	SPMPackages?: Array<IOSSPMPackage>;
+}
+
 interface IRubyFunction {
 	functionName: string;
 	functionParameters?: string;

package/lib/key-commands/bootstrap.js

@@ -19,5 +19,4 @@ yok_1.injector.requireCommand("open|ios", path);
 yok_1.injector.requireCommand("open|android", path);
 yok_1.injector.requireCommand("open|visionos", path);
 yok_1.injector.requireCommand("open|vision", path);
-yok_1.injector.requireCommand("open|macos", path);
 //# sourceMappingURL=bootstrap.js.map

package/lib/key-commands/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QuestionMark = exports.N = exports.C = exports.W = exports.CtrlC = exports.ShiftR = exports.R = exports.OpenMacOSCommand = exports.OpenVisionOSCommand = exports.ShiftV = exports.V = exports.OpenIOSCommand = exports.ShiftI = exports.I = exports.OpenAndroidCommand = exports.ShiftA = exports.A = void 0;
+exports.QuestionMark = exports.N = exports.C = exports.W = exports.CtrlC = exports.ShiftR = exports.R = exports.OpenVisionOSCommand = exports.ShiftV = exports.V = exports.OpenIOSCommand = exports.ShiftI = exports.I = exports.OpenAndroidCommand = exports.ShiftA = exports.A = void 0;
 const fs = require("fs");
 const os_1 = require("os");
 const path = require("path");
@@ -256,57 +256,6 @@ class OpenVisionOSCommand extends ShiftV {
     }
 }
 exports.OpenVisionOSCommand = OpenVisionOSCommand;
-class OpenMacOSCommand {
-    constructor($iOSProjectService, $logger, $childProcess, $projectData, $xcodeSelectService, $xcodebuildArgsService, $options) {
-        this.$iOSProjectService = $iOSProjectService;
-        this.$logger = $logger;
-        this.$childProcess = $childProcess;
-        this.$projectData = $projectData;
-        this.$xcodeSelectService = $xcodeSelectService;
-        this.$xcodebuildArgsService = $xcodebuildArgsService;
-        this.$options = $options;
-        this.key = "M";
-        this.platform = "all";
-        this.description = "Open project in Xcode";
-        this.group = "macOS";
-        this.willBlockKeyCommandExecution = true;
-        this.isInteractive = false;
-    }
-    async execute() {
-        this.$options.watch = false;
-        this.$options.platformOverride = "macOS";
-        const os = (0, os_1.platform)();
-        if (os === "darwin") {
-            this.$projectData.initializeProjectData();
-            const macOSDir = path.resolve(this.$projectData.platformsDir, "macos");
-            if (!fs.existsSync(macOSDir)) {
-                const prepareCommand = yok_1.injector.resolveCommand("prepare");
-                await prepareCommand.execute(["macos"]);
-                if (this.isInteractive) {
-                    process.stdin.resume();
-                }
-            }
-            const platformData = this.$iOSProjectService.getPlatformData(this.$projectData);
-            const xcprojectFile = this.$xcodebuildArgsService.getXcodeProjectArgs(platformData, this.$projectData)[1];
-            if (fs.existsSync(xcprojectFile)) {
-                this.$xcodeSelectService
-                    .getDeveloperDirectoryPath()
-                    .then(() => this.$childProcess.exec(`open ${xcprojectFile}`, {}))
-                    .catch((e) => {
-                    this.$logger.error(e.message);
-                });
-            }
-            else {
-                this.$logger.error(`Unable to open project file: ${xcprojectFile}`);
-            }
-        }
-        else {
-            this.$logger.error("Opening a project in XCode requires macOS.");
-        }
-        this.$options.platformOverride = null;
-    }
-}
-exports.OpenMacOSCommand = OpenMacOSCommand;
 class R {
     constructor($liveSyncCommandHelper) {
         this.$liveSyncCommandHelper = $liveSyncCommandHelper;
@@ -462,5 +411,4 @@ yok_1.injector.registerCommand("open|ios", OpenIOSCommand);
 yok_1.injector.registerCommand("open|visionos", OpenVisionOSCommand);
 yok_1.injector.registerCommand("open|vision", OpenVisionOSCommand);
 yok_1.injector.registerCommand("open|android", OpenAndroidCommand);
-yok_1.injector.registerCommand("open|macos", OpenMacOSCommand);
 //# sourceMappingURL=index.js.map

package/lib/options.js

@@ -225,6 +225,7 @@ class Options {
                 default: true,
             },
             dryRun: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
+            skipNative: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
             uniqueBundle: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
         };
     }

package/lib/project-data.js

@@ -25,7 +25,6 @@ class ProjectData {
         this.projectIdentifiers.ios = identifier;
         this.projectIdentifiers.android = identifier;
         this.projectIdentifiers.visionos = identifier;
-        this.projectIdentifiers.macos = identifier;
     }
     constructor($fs, $errors, $projectHelper, $staticConfig, $options, $logger, $injector, $androidResourcesMigrationService, $devicePlatformsConstants) {
         this.$fs = $fs;
@@ -176,14 +175,12 @@ class ProjectData {
                 ios: "",
                 android: "",
                 visionos: "",
-                macos: "",
             };
         }
         const identifier = {
             ios: config.id,
             android: config.id,
             visionos: config.id,
-            macos: config.id,
         };
         if (config.ios && config.ios.id) {
             identifier.ios = config.ios.id;
@@ -194,9 +191,6 @@ class ProjectData {
         if (config.visionos && config.visionos.id) {
             identifier.visionos = config.visionos.id;
         }
-        if (config.macos && config.macos.id) {
-            identifier.macos = config.macos.id;
-        }
         return identifier;
     }
     getProjectType() {

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

@@ -276,31 +276,37 @@ class AndroidPluginBuildService {
         }
         if (!runtimeGradleVersions) {
             const latestRuntimeVersion = await this.getLatestRuntimeVersion();
-            runtimeGradleVersions = await this.getGradleVersions(latestRuntimeVersion);
+            runtimeGradleVersions =
+                await this.getGradleVersions(latestRuntimeVersion);
             this.$logger.trace(`Got gradle versions ${JSON.stringify(runtimeGradleVersions)} from the latest runtime v${latestRuntimeVersion}`);
         }
         return runtimeGradleVersions || {};
     }
     async getLatestRuntimeVersion() {
-        var _a;
+        var _a, _b, _c;
         let runtimeVersion = null;
+        const packageName = ((_b = (_a = this.$projectData.nsConfig) === null || _a === void 0 ? void 0 : _a.android) === null || _b === void 0 ? void 0 : _b.runtimePackageName) ||
+            constants_1.SCOPED_ANDROID_RUNTIME_NAME;
         try {
-            let result = await this.$packageManager.view(constants_1.SCOPED_ANDROID_RUNTIME_NAME, {
+            let result = await this.$packageManager.view(packageName, {
                 "dist-tags": true,
             });
-            result = (_a = result === null || result === void 0 ? void 0 : result["dist-tags"]) !== null && _a !== void 0 ? _a : result;
+            result = (_c = result === null || result === void 0 ? void 0 : result["dist-tags"]) !== null && _c !== void 0 ? _c : result;
             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(constants_1.SCOPED_ANDROID_RUNTIME_NAME);
+            const registryData = await this.$packageManager.getRegistryPackageData(packageName);
             runtimeVersion = registryData["dist-tags"].latest;
         }
         return runtimeVersion;
     }
     getLocalGradleVersions() {
+        var _a, _b;
+        const packageName = ((_b = (_a = this.$projectData.nsConfig) === null || _a === void 0 ? void 0 : _a.android) === null || _b === void 0 ? void 0 : _b.runtimePackageName) ||
+            constants_1.SCOPED_ANDROID_RUNTIME_NAME;
         // 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, {
+        const installedRuntimePackageJSONPath = (0, resolve_package_path_1.resolvePackageJSONPath)(packageName, {
             paths: [this.$projectData.projectDir],
         });
         if (!installedRuntimePackageJSONPath) {
@@ -327,16 +333,18 @@ class AndroidPluginBuildService {
         return null;
     }
     async getGradleVersions(runtimeVersion) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         let runtimeGradleVersions = null;
         const localVersionInfo = this.getLocalGradleVersions();
         if (localVersionInfo) {
             return localVersionInfo;
         }
+        const packageName = ((_b = (_a = this.$projectData.nsConfig) === null || _a === void 0 ? void 0 : _a.android) === null || _b === void 0 ? void 0 : _b.runtimePackageName) ||
+            constants_1.SCOPED_ANDROID_RUNTIME_NAME;
         // fallback to reading from npm...
         try {
-            let output = await 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;
+            let output = await this.$packageManager.view(`${packageName}@${runtimeVersion}`, { version_info: true });
+            output = (_c = output === null || output === void 0 ? void 0 : output["version_info"]) !== null && _c !== void 0 ? _c : output;
             if (!output) {
                 /**
                  * fallback to the old 'gradle' key in package.json
@@ -346,8 +354,8 @@ class AndroidPluginBuildService {
                  * gradle: { version: '6.4', android: '3.6.4' }
                  *
                  */
-                output = await 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;
+                output = await this.$packageManager.view(`${packageName}@${runtimeVersion}`, { gradle: true });
+                output = (_d = output === null || output === void 0 ? void 0 : output["gradle"]) !== null && _d !== void 0 ? _d : output;
                 const { version, android } = output;
                 // covert output to the new format...
                 output = {
@@ -359,7 +367,7 @@ class AndroidPluginBuildService {
         }
         catch (err) {
             this.$logger.trace(`Error while getting gradle data for android runtime from view command: ${err}`);
-            const registryData = await this.$packageManager.getRegistryPackageData(constants_1.SCOPED_ANDROID_RUNTIME_NAME);
+            const registryData = await this.$packageManager.getRegistryPackageData(packageName);
             runtimeGradleVersions = registryData.versions[runtimeVersion];
         }
         const result = this.getGradleVersionsCore(runtimeGradleVersions);