EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-25 22:56:45 +01:00
Code Issues Projects Releases Wiki Activity

Allow suffixes to the version

Browse Source 
- Useful for "PlotSquared-5.10.4-SNAPSHOT" etc
This commit is contained in:
dordsor21 2020-05-01 15:53:40 +01:00
parent 17698065a0
commit b5de5f30ac
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Core/src/main/java/com/plotsquared/core/PlotVersion.java
View File

@ -29,12 +29,20 @@ public class PlotVersion {
public final int year, month, day, hash; public final int year, month, day, hash;
public final String versionString; public final String versionString;
public final int[] version; public final int[] version;
public final String suffix;
public PlotVersion(int year, int month, int day, int hash, String versionString) { public PlotVersion(int year, int month, int day, int hash, String versionString) {
this.year = year; this.year = year;
this.month = month; this.month = month;
this.day = day; this.day = day;
this.hash = hash; this.hash = hash;
int dash = versionString.indexOf('-');
if (dash != -1) {
suffix = versionString.substring(dash);
versionString = versionString.substring(0, dash);
} else {
suffix = "";
}
this.versionString = versionString.substring(versionString.indexOf('=') + 1); this.versionString = versionString.substring(versionString.indexOf('=') + 1);
version = new int[3]; version = new int[3];
String[] verArray = versionString.substring(versionString.indexOf('=') + 1).split("\\."); String[] verArray = versionString.substring(versionString.indexOf('=') + 1).split("\\.");
@ -44,6 +52,13 @@ public class PlotVersion {
} }
public PlotVersion(String versionString, String commit, String date) { public PlotVersion(String versionString, String commit, String date) {
int dash = versionString.indexOf('-');
if (dash != -1) {
suffix = versionString.substring(dash);
versionString = versionString.substring(0, dash);
} else {
suffix = "";
}
this.versionString = versionString.substring(versionString.indexOf('=') + 1); this.versionString = versionString.substring(versionString.indexOf('=') + 1);
version = new int[3]; version = new int[3];
String[] verArray = this.versionString.split("\\."); String[] verArray = this.versionString.split("\\.");
@ -79,7 +94,7 @@ public class PlotVersion {
if (hash == 0 && versionString == null) { if (hash == 0 && versionString == null) {
return "PlotSquared-NoVer-SNAPSHOT"; return "PlotSquared-NoVer-SNAPSHOT";
} else { } else {
return "PlotSquared-" + versionString; return "PlotSquared-" + versionString + suffix;
} }
} }
@ -90,7 +105,9 @@ public class PlotVersion {
* @return true if the given version is a "later" version * @return true if the given version is a "later" version
*/ */
public boolean isLaterVersion(String versionString) { public boolean isLaterVersion(String versionString) {
String[] verArray = versionString.split("\\."); int dash = versionString.indexOf('-');
String[] verArray =
versionString.substring(0, dash == -1 ? versionString.length() : dash).split("\\.");
int one = Integer.parseInt(verArray[0]); int one = Integer.parseInt(verArray[0]);
int two = Integer.parseInt(verArray[1]); int two = Integer.parseInt(verArray[1]);
int three = Integer.parseInt(verArray[2]); int three = Integer.parseInt(verArray[2]);

9
build.gradle
View File

@ -29,7 +29,14 @@ ext {
git = Grgit.open(dir: new File(rootDir.toString() + "/.git")) git = Grgit.open(dir: new File(rootDir.toString() + "/.git"))
} }
version = "5.10.4" def ver = "5.10.4"
def versuffix = ""
ext {
if (project.hasProperty("versionsuffix")) {
versuffix = "-$versionsuffix"
}
}
version = ver + versuffix
description = rootProject.name description = rootProject.name