diff --git a/HMCL/build.gradle b/HMCL/build.gradle index d5c7d4f1e..85d38532f 100755 --- a/HMCL/build.gradle +++ b/HMCL/build.gradle @@ -38,11 +38,11 @@ def buildnumber = System.getenv("TRAVIS_BUILD_NUMBER") if (buildnumber == null) buildnumber = System.getenv("BUILD_NUMBER") if (buildnumber == null) -buildnumber = "52" +buildnumber = "60" def versionroot = System.getenv("VERSION_ROOT") if (versionroot == null) -versionroot = "2.7.9" +versionroot = "2.7.10" String mavenGroupId = 'HMCL' String mavenVersion = versionroot + '.' + buildnumber diff --git a/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/ComposedVersionNumber.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/ComposedVersionNumber.java index 769d87acf..84d29528f 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/ComposedVersionNumber.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/ComposedVersionNumber.java @@ -18,6 +18,7 @@ package org.jackhuang.hmcl.api; import java.util.Arrays; +import java.util.LinkedList; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -38,9 +39,9 @@ public final class ComposedVersionNumber extends VersionNumber { } ComposedVersionNumber(String version) { - composed = Arrays.stream(version.split("-")) - .map(VersionNumber::asVersion) - .collect(Collectors.toList()); + String slice[] = version.split("-"); + composed = new LinkedList<>(); + for (String str : slice) composed.add(VersionNumber.asVersion(str)); } @Override @@ -50,6 +51,9 @@ public final class ComposedVersionNumber extends VersionNumber { @Override public String toString() { - return composed.stream().map(VersionNumber::toString).collect(Collectors.joining("-")); + List seq = new LinkedList<>(); + for (VersionNumber str : composed) + seq.add(str.toString()); + return String.join("-", seq); } } \ No newline at end of file diff --git a/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/IntVersionNumber.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/IntVersionNumber.java index 76eaf487b..a6db44e90 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/IntVersionNumber.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/IntVersionNumber.java @@ -20,7 +20,6 @@ package org.jackhuang.hmcl.api; import java.util.LinkedList; import java.util.List; import java.util.Objects; -import java.util.stream.Collectors; /** * If a version string formats x.x.x.x, a {@code IntVersionNumber} diff --git a/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/VersionNumber.java b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/VersionNumber.java index e11580458..2814f5ca4 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/VersionNumber.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hmcl/api/VersionNumber.java @@ -36,13 +36,6 @@ public abstract class VersionNumber implements Comparable { return new StringVersionNumber(version); } - public static Optional parseVersion(String str) { - if (IntVersionNumber.isIntVersionNumber(str)) - return Optional.of(new IntVersionNumber(str).toString()); - else - return Optional.empty(); - } - @Override public int compareTo(VersionNumber o) { return COMPARATOR.compare(this, o);