From ff1ace834280c478a4e32955800290250016b98f Mon Sep 17 00:00:00 2001 From: William278 Date: Sat, 10 Sep 2022 19:27:26 +0300 Subject: [PATCH] Update version format --- build.gradle | 4 ++-- .../src/main/java/net/william278/husksync/util/Version.java | 2 +- gradle.properties | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 275edfa9..d6a0883b 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { } group 'net.william278' -version "$ext.plugin_version+${versionMetadata()}" +version "$ext.plugin_version-${versionMetadata()}" ext { set 'version', version.toString() @@ -102,5 +102,5 @@ def versionMetadata() { if (grgit == null) { return System.getenv("GITHUB_RUN_NUMBER") ? 'build.' + System.getenv("GITHUB_RUN_NUMBER") : 'unknown' } - return 'rev.' + grgit.head().abbreviatedId + (grgit.status().clean ? '' : '-indev') + return grgit.head().abbreviatedId + (grgit.status().clean ? '' : '-indev') } \ No newline at end of file diff --git a/common/src/main/java/net/william278/husksync/util/Version.java b/common/src/main/java/net/william278/husksync/util/Version.java index d93cc8e8..1ed1799f 100644 --- a/common/src/main/java/net/william278/husksync/util/Version.java +++ b/common/src/main/java/net/william278/husksync/util/Version.java @@ -9,7 +9,7 @@ import java.util.regex.Pattern; public class Version implements Comparable { private final static String VERSION_SEPARATOR = "."; private final static String MINECRAFT_META_SEPARATOR = "-"; - private final static String PLUGIN_META_SEPARATOR = "+"; + private final static String PLUGIN_META_SEPARATOR = "-"; private int[] versions = new int[]{}; @NotNull diff --git a/gradle.properties b/gradle.properties index 1928bb97..d2bffd12 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs='-Dfile.encoding=UTF-8' org.gradle.daemon=true javaVersion=16 -plugin_version=2.0.2 +plugin_version=2.1 plugin_archive=husksync jedis_version=4.2.3