Skip to content

Commit d17ccca

Browse files
committed
Update os version comparing policy. Fixes #9
1 parent c0a789a commit d17ccca

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

src/main/java/com/jthemedetecor/util/OsInfo.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import oshi.PlatformEnum;
88
import oshi.SystemInfo;
99
import oshi.software.os.OperatingSystem;
10+
import io.github.g00fy2.versioncompare.Version;
1011

1112
import java.io.BufferedReader;
1213
import java.io.IOException;
@@ -39,7 +40,7 @@ public static boolean isLinux() {
3940
}
4041

4142
public static boolean isMacOsMojaveOrLater() {
42-
return hasTypeAndVersionOrHigher(PlatformEnum.MACOSX, "10.14");
43+
return hasTypeAndVersionOrHigher(PlatformEnum.MACOS, "10.14");
4344
}
4445

4546
public static boolean isGnome() {
@@ -54,12 +55,12 @@ public static boolean hasType(PlatformEnum platformType) {
5455
return OsInfo.platformType.equals(platformType);
5556
}
5657

57-
public static boolean hasVersionOrHigher(String version) {
58-
return parseVersion(OsInfo.version) >= parseVersion(version);
58+
public static boolean isVersionAtLeast(String version) {
59+
return new Version(OsInfo.version).isAtLeast(version);
5960
}
6061

6162
public static boolean hasTypeAndVersionOrHigher(PlatformEnum platformType, String version) {
62-
return hasType(platformType) && hasVersionOrHigher(version);
63+
return hasType(platformType) && isVersionAtLeast(version);
6364
}
6465

6566
public static String getVersion() {

src/main/java/module-info.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
requires org.jetbrains.annotations;
66
requires com.sun.jna;
77
requires com.github.oshi;
8+
requires versioncompare;
89

910
exports com.jthemedetecor;
1011

0 commit comments

Comments
 (0)