Skip to content

Commit 1700e38

Browse files
committed
chore: yarn2 fixes
1 parent 2a7d405 commit 1700e38

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

lib/package-installation-manager.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export class PackageInstallationManager implements IPackageInstallationManager {
7070
versions: true,
7171
});
7272

73-
return semver.maxSatisfying(data, versionRange);
73+
return semver.maxSatisfying(data.versions || data, versionRange);
7474
}
7575

7676
public async getMaxSatisfyingVersionSafe(
@@ -320,9 +320,10 @@ export class PackageInstallationManager implements IPackageInstallationManager {
320320
packageName: string,
321321
version: string
322322
): Promise<string> {
323-
const data: any = await this.$packageManager.view(packageName, {
323+
let data: any = await this.$packageManager.view(packageName, {
324324
"dist-tags": true,
325325
});
326+
data = data['dist-tags'] || data;
326327
this.$logger.trace("Using version %s. ", data[version]);
327328

328329
return data[version];

lib/services/android-plugin-build-service.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,12 +469,13 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
469469
let runtimeVersion: string = null;
470470

471471
try {
472-
const result = await this.$packageManager.view(
472+
let result = await this.$packageManager.view(
473473
SCOPED_ANDROID_RUNTIME_NAME,
474474
{
475475
"dist-tags": true,
476476
}
477477
);
478+
result = result['dist-tags'] || result;
478479
runtimeVersion = result.latest;
479480
} catch (err) {
480481
this.$logger.trace(
@@ -568,6 +569,7 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
568569
`${SCOPED_ANDROID_RUNTIME_NAME}@${runtimeVersion}`,
569570
{ version_info: true }
570571
);
572+
output = output['version_info'] || output;
571573

572574
if (!output) {
573575
/**
@@ -582,6 +584,7 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
582584
`${SCOPED_ANDROID_RUNTIME_NAME}@${runtimeVersion}`,
583585
{ gradle: true }
584586
);
587+
output = output['gradle'] || output;
585588

586589
const { version, android } = output;
587590

0 commit comments

Comments
 (0)