Skip to content
This repository was archived by the owner on Mar 21, 2023. It is now read-only.

Commit b9248fe

Browse files
authored
fix: use 2.13 binary version for 0.11.2 SNAPSHOT (#430)
1 parent e69dd2d commit b9248fe

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

src/__tests__/fetchMetals.test.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ describe("fetchMetals", () => {
1313
expectedDep("2.12", "0.11.2")
1414
);
1515
expect(calcServerDependency("0.11.2-SNAPSHOT")).toBe(
16-
expectedDep("2.12", "0.11.2-SNAPSHOT")
16+
expectedDep("2.13", "0.11.2-SNAPSHOT")
1717
);
1818
expect(calcServerDependency("0.11.2-RC1")).toBe(
1919
expectedDep("2.12", "0.11.2-RC1")
@@ -27,6 +27,9 @@ describe("fetchMetals", () => {
2727
expect(calcServerDependency("0.11.3-RC1")).toBe(
2828
expectedDep("2.13", "0.11.3-RC1")
2929
);
30+
expect(calcServerDependency("0.11.2+32-536ff4b1-SNAPSHOT")).toBe(
31+
expectedDep("2.13", "0.11.2+32-536ff4b1-SNAPSHOT")
32+
);
3033
});
3134
});
3235
});

src/fetchMetals.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,10 @@ export function fetchMetals({
5454
}
5555

5656
export function calcServerDependency(serverVersion: string): string {
57-
const binaryVersion = semver.gt(serverVersion, "0.11.2") ? "2.13" : "2.12";
57+
const use213 =
58+
semver.gt(serverVersion, "0.11.2") ||
59+
(serverVersion.startsWith("0.11.2") && serverVersion.endsWith("SNAPSHOT"));
60+
const binaryVersion = use213 ? "2.13" : "2.12";
5861
return serverVersion.includes(":")
5962
? serverVersion
6063
: `org.scalameta:metals_${binaryVersion}:${serverVersion}`;

0 commit comments

Comments
 (0)