Skip to content

fix: use npm view command to get gradle versions from registry in order to fix the problems when private npm registry is configured #4308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/base-package-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export abstract class BasePackageManager implements INodePackageManager {
array.push(`--${flag}`);
array.push(`${config[flag]}`);
} else if (config[flag]) {
if (flag === "dist-tags" || flag === "versions" || flag === "name") {
if (flag === "dist-tags" || flag === "versions" || flag === "name" || flag === "gradle") {
array.push(` ${flag}`);
continue;
}
Expand Down
40 changes: 35 additions & 5 deletions lib/services/android-plugin-build-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -294,26 +294,56 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
}

private async getRuntimeGradleVersions(projectDir: string): Promise<IRuntimeGradleVersions> {
const registryData = await this.$packageManager.getRegistryPackageData(TNS_ANDROID_RUNTIME_NAME);
let runtimeGradleVersions: IRuntimeGradleVersions = null;
if (projectDir) {
const projectRuntimeVersion = this.$platformService.getCurrentPlatformVersion(
this.$devicePlatformsConstants.Android,
this.$projectDataService.getProjectData(projectDir));
runtimeGradleVersions = this.getGradleVersions(registryData.versions[projectRuntimeVersion]);
runtimeGradleVersions = await this.getGradleVersions(projectRuntimeVersion);
this.$logger.trace(`Got gradle versions ${JSON.stringify(runtimeGradleVersions)} from runtime v${projectRuntimeVersion}`);
}

if (!runtimeGradleVersions) {
const latestRuntimeVersion = registryData["dist-tags"].latest;
runtimeGradleVersions = this.getGradleVersions(registryData.versions[latestRuntimeVersion]);
const latestRuntimeVersion = await this.getLatestRuntimeVersion();
runtimeGradleVersions = await this.getGradleVersions(latestRuntimeVersion);
this.$logger.trace(`Got gradle versions ${JSON.stringify(runtimeGradleVersions)} from the latest runtime v${latestRuntimeVersion}`);
}

return runtimeGradleVersions || {};
}

private getGradleVersions(packageData: { gradle: { version: string, android: string } }): IRuntimeGradleVersions {
private async getLatestRuntimeVersion(): Promise<string> {
let runtimeVersion: string = null;

try {
const result = await this.$packageManager.view(TNS_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(TNS_ANDROID_RUNTIME_NAME);
runtimeVersion = registryData["dist-tags"].latest;
}

return runtimeVersion;
}

private async getGradleVersions(runtimeVersion: string): Promise<IRuntimeGradleVersions> {
let runtimeGradleVersions: { gradle: { version: string, android: string } } = null;

try {
const output = await this.$packageManager.view(`${TNS_ANDROID_RUNTIME_NAME}@${runtimeVersion}`, { gradle: true });
runtimeGradleVersions = { gradle: output };
} catch (err) {
this.$logger.trace(`Error while getting gradle data for android runtime from view command: ${err}`);
const registryData = await this.$packageManager.getRegistryPackageData(TNS_ANDROID_RUNTIME_NAME);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please print the error here

runtimeGradleVersions = registryData.versions[runtimeVersion];
}

const result = this.getGradleVersionsCore(runtimeGradleVersions);
return result;
}

private getGradleVersionsCore(packageData: { gradle: { version: string, android: string } }): IRuntimeGradleVersions {
const packageJsonGradle = packageData && packageData.gradle;
let runtimeVersions: IRuntimeGradleVersions = null;
if (packageJsonGradle && (packageJsonGradle.version || packageJsonGradle.android)) {
Expand Down
28 changes: 28 additions & 0 deletions test/services/android-plugin-build-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,34 @@ describe('androidPluginBuildService', () => {
}
};

return result;
},
view: async (packageName: string, config: any): Promise<any> => {
let result: any = null;
if (config && config.gradle) {
const packageVersion = packageName.split("@")[1];
switch (packageVersion) {
case "1.0.0":
result = {
version: options.projectRuntimeGradleVersion,
android: options.projectRuntimeGradleAndroidVersion
};
break;
case "4.1.2":
result = {
version: options.latestRuntimeGradleVersion,
android: options.latestRuntimeGradleAndroidVersion
};
break;
}
}

if (config && config["dist-tags"]) {
result = {
latest: "4.1.2"
};
}

return result;
}
};
Expand Down