From 406c58f5854a4aa18a2b82c8c67ad5b2ce3624be Mon Sep 17 00:00:00 2001 From: DNx Date: Mon, 30 Nov 2015 10:24:33 +0700 Subject: [PATCH 1/2] Remove build time from plugin version. --- src/main/resources/plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 3cb51c69..d037f06f 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -3,7 +3,7 @@ authors: [${pluginAuthors}] website: ${project.url} description: ${project.description} main: ${mainClass} -version: ${project.version}-b${buildNumber}-t${build.time} +version: ${project.version}-b${buildNumber} softdepend: - Vault - PermissionsBukkit From ea932712c3a55c7b1953f44e209b099407544e5a Mon Sep 17 00:00:00 2001 From: DNx Date: Mon, 30 Nov 2015 10:57:02 +0700 Subject: [PATCH 2/2] Fix constants setup. --- src/main/java/fr/xephi/authme/AuthMe.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java index 800cbc71..4f1886fc 100644 --- a/src/main/java/fr/xephi/authme/AuthMe.java +++ b/src/main/java/fr/xephi/authme/AuthMe.java @@ -185,9 +185,14 @@ public class AuthMe extends JavaPlugin { // TODO: enhance this private void setupConstants() { String versionRaw = this.getDescription().getVersion(); - pluginVersion = versionRaw.substring(0, versionRaw.indexOf("-b")); - String buildRaw = versionRaw.substring(1, versionRaw.indexOf("-b")); - pluginBuildNumber = buildRaw.substring(0, buildRaw.indexOf("-t")); + int index = versionRaw.lastIndexOf("-"); + if (index != -1) { + pluginVersion = versionRaw.substring(0, index); + pluginBuildNumber = versionRaw.substring(index + 1); + if (pluginBuildNumber.startsWith("b")) { + pluginBuildNumber = pluginBuildNumber.substring(1); + } + } } /**