Include branch in plugin version

This commit is contained in:
Gabriele C 2018-03-18 22:02:46 +01:00
parent 8b05ce4b92
commit ab8af032e1
2 changed files with 3 additions and 3 deletions

View File

@ -64,7 +64,7 @@
<project.outputName>AuthMe</project.outputName>
<project.buildNumber>CUSTOM</project.buildNumber>
<project.skipExtendedHashTests>false</project.skipExtendedHashTests>
<project.versionCode>${project.version}-b${project.buildNumber}</project.versionCode>
<project.versionCode>${project.version}-B${project.buildNumber}</project.versionCode>
<!-- BukkitPlugin properties -->
<bukkitplugin.name>${project.outputName}</bukkitplugin.name>
@ -87,7 +87,7 @@
</property>
</activation>
<properties>
<project.buildNumber>${env.BUILD_NUMBER}</project.buildNumber>
<project.buildNumber>${env.GIT_BRANCH}${env.BUILD_NUMBER}</project.buildNumber>
</properties>
</profile>
<!-- Skip long hash tests, reduce the test time of 20-30 seconds -->

View File

@ -186,7 +186,7 @@ public class AuthMe extends JavaPlugin {
if (index != -1) {
pluginVersion = versionRaw.substring(0, index);
pluginBuildNumber = versionRaw.substring(index + 1);
if (pluginBuildNumber.startsWith("b")) {
if (pluginBuildNumber.startsWith("B")) {
pluginBuildNumber = pluginBuildNumber.substring(1);
}
}