Skip to content

Commit ae4c152

Browse files
authored
feat: 添加新发布候选版本版本号格式支持 (#5810)
1 parent e436163 commit ae4c152

2 files changed

Lines changed: 5 additions & 0 deletions

File tree

HMCLCore/src/main/java/org/jackhuang/hmcl/util/versioning/GameVersionNumber.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,10 @@ static Release parse(String value) {
357357
needNormalize = true;
358358
releaseType = ReleaseType.PRE_RELEASE;
359359
eaVersion = VersionNumber.asVersion(suffix.substring(" Pre-release ".length()));
360+
} else if (suffix.startsWith("-rc-")) {
361+
needNormalize = true;
362+
releaseType = ReleaseType.RELEASE_CANDIDATE;
363+
eaVersion = VersionNumber.asVersion(suffix.substring("-rc-".length()));
360364
} else if (suffix.startsWith("-rc")) {
361365
releaseType = ReleaseType.RELEASE_CANDIDATE;
362366
eaVersion = VersionNumber.asVersion(suffix.substring("-rc".length()));

HMCLCore/src/test/java/org/jackhuang/hmcl/util/versioning/GameVersionNumberTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,7 @@ public void testToNormalizedString() {
439439
assertNormalized("26.1-pre1", "26.1-pre-1");
440440
assertNormalized("1.21.11-rc1", "1.21.11 Release Candidate 1");
441441
assertNormalized("1.21.11-rc1_unobfuscated", "1.21.11 Release Candidate 1 Unobfuscated");
442+
assertNormalized("26.1-rc1", "26.1-rc-1");
442443
assertNormalized("1.14_combat-212796", "1.14.3 - Combat Test");
443444
assertNormalized("1.14_combat-0", "Combat Test 2");
444445
assertNormalized("1.14_combat-3", "Combat Test 3");

0 commit comments

Comments
 (0)