better versioning

This commit is contained in:
FalsePattern committed 2022-01-10 18:21:27 +01:00
1 parent 4d0010101d
commit b9c6cda2ec
6 files changed
+185 -23

No files matched your search

@@ -0,0 +1,50 @@
package com.falsepattern.lib.api;
import lombok.NonNull;
import lombok.val;
import java.util.Arrays;
import java.util.stream.Collectors;
public class ComplexVersion extends Version {
final Version[] versions;
public ComplexVersion(@NonNull Version mainVersion, Version... subVersions) {
this.versions = new Version[subVersions.length + 1];
this.versions[0] = mainVersion;
System.arraycopy(subVersions, 0, this.versions, 1, subVersions.length);
}
@Override
public int compareTo(@NonNull Version o) {
if (o instanceof ComplexVersion) {
val other = (ComplexVersion) o;
int count = Math.min(versions.length, other.versions.length);
for (int i = 0; i < count; i++) {
val result = versions[i].compareTo(other.versions[i]);
if (result != 0) return result;
}
if (versions.length != other.versions.length) {
return versions.length - other.versions.length;
} else {
return 0;
}
} else if (o instanceof SemanticVersion) {
val other = (SemanticVersion) o;
val result = other.compareTo(versions[0]);
if (result != 0) {
return result;
}
if (versions.length > 1) {
return -1;
}
return 0;
} else {
throw new IllegalArgumentException("Could not compare version with class " + o.getClass().getName());
}
}
@Override
public String toString() {
return Arrays.stream(versions).map(Version::toString).collect(Collectors.joining("-"));
}
}
@@ -1,10 +1,13 @@
package com.falsepattern.lib.api;
import com.falsepattern.lib.FalsePatternLib;
import lombok.Builder;
import lombok.NonNull;
public class DependencyLoader {
public static void loadLibrary(String groupId, String artifactId, String version, String devSuffix, boolean isMod) {
FalsePatternLib.loadLibrary(groupId, artifactId, version, devSuffix, isMod);
@Builder
public static void loadLibrary(String loadingModId, String groupId, String artifactId, @NonNull Version minVersion, Version maxVersion, @NonNull Version preferredVersion, String devSuffix, boolean isMod) {
FalsePatternLib.loadLibrary(loadingModId, groupId, artifactId, minVersion, maxVersion, preferredVersion, devSuffix, isMod);
}
public static void addMavenRepo(String url) {
@@ -0,0 +1,70 @@
package com.falsepattern.lib.api;
import lombok.Builder;
import lombok.Getter;
import lombok.NonNull;
import lombok.val;
import java.util.Objects;
public class SemanticVersion extends Version {
@Getter
private final int majorVersion;
@Getter
private final int minorVersion;
@Getter
private final int patchVersion;
@Getter
private final String preRelease;
@Getter
private final String build;
@Builder
public SemanticVersion(int majorVersion, int minorVersion, int patchVersion, String preRelease, String build) {
this.majorVersion = majorVersion;
this.minorVersion = minorVersion;
this.patchVersion = patchVersion;
preRelease = preRelease.trim();
build = build.trim();
this.preRelease = "".equals(preRelease) ? null : preRelease;
this.build = "".equals(build) ? null : build;
}
@Override
public int compareTo(@NonNull Version o) {
if (o instanceof ComplexVersion) {
val result = this.compareTo(((ComplexVersion)o).versions[0]);
if (result != 0) {
return result;
} else if (((ComplexVersion) o).versions.length > 1) {
return 1;
} else {
return 0;
}
} else if (o instanceof SemanticVersion) {
val other = (SemanticVersion)o;
if (majorVersion != other.majorVersion) {
return majorVersion - other.majorVersion;
} else if (minorVersion != other.minorVersion) {
return minorVersion - other.minorVersion;
} else if (patchVersion != other.patchVersion) {
return patchVersion - other.patchVersion;
} else if (!Objects.equals(preRelease, other.preRelease)) {
if (preRelease == null) {
return 1;
} else if (other.preRelease == null) {
return -1;
}
return preRelease.compareTo(other.preRelease);
} else {
return 0;
}
}
return 0;
}
@Override
public String toString() {
return majorVersion + "." + minorVersion + "." + patchVersion + (preRelease == null ? "" : "-" + preRelease) + (build == null ? "" : "+" + build);
}
}
@@ -0,0 +1,15 @@
package com.falsepattern.lib.api;
public abstract class Version implements Comparable<Version> {
Version(){}
public boolean equals(Version other) {
return compareTo(other) == 0;
}
@Override
public boolean equals(Object obj) {
if (!(obj instanceof Version)) return false;
return equals((Version) obj);
}
}