From 17a5f877cfd0632fd4b950a800d3b7abeba2a6a2 Mon Sep 17 00:00:00 2001 From: RaphiMC <50594595+RaphiMC@users.noreply.github.com> Date: Tue, 15 Aug 2023 01:52:03 +0200 Subject: [PATCH] Use full implementation version as subplatform name --- build.gradle | 10 ++++++++++ .../java/net/raphimc/viaaprilfools/ViaAprilFools.java | 1 + .../viaaprilfools/platform/ViaAprilFoolsPlatform.java | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1113eee..e41d08e 100644 --- a/build.gradle +++ b/build.gradle @@ -29,6 +29,7 @@ dependencies { blossom { replaceToken("\${version}", project.version, "src/main/java/net/raphimc/viaaprilfools/ViaAprilFools.java") + replaceToken("\${impl_version}", "git-${project.archivesBaseName}-${project.version}:${latestCommitHash()}", "src/main/java/net/raphimc/viaaprilfools/ViaAprilFools.java") } java { @@ -86,3 +87,12 @@ publishing { } } } + +String latestCommitHash() { + def stdout = new ByteArrayOutputStream() + exec { + commandLine "git", "rev-parse", "--short", "HEAD" + standardOutput = stdout + } + return stdout.toString().trim() +} diff --git a/src/main/java/net/raphimc/viaaprilfools/ViaAprilFools.java b/src/main/java/net/raphimc/viaaprilfools/ViaAprilFools.java index 72a80aa..f33105c 100644 --- a/src/main/java/net/raphimc/viaaprilfools/ViaAprilFools.java +++ b/src/main/java/net/raphimc/viaaprilfools/ViaAprilFools.java @@ -23,6 +23,7 @@ import net.raphimc.viaaprilfools.platform.ViaAprilFoolsPlatform; public class ViaAprilFools { public static final String VERSION = "${version}"; + public static final String IMPL_VERSION = "${impl_version}"; private static ViaAprilFoolsPlatform platform; private static ViaAprilFoolsConfig config; diff --git a/src/main/java/net/raphimc/viaaprilfools/platform/ViaAprilFoolsPlatform.java b/src/main/java/net/raphimc/viaaprilfools/platform/ViaAprilFoolsPlatform.java index 460eb20..cb67293 100644 --- a/src/main/java/net/raphimc/viaaprilfools/platform/ViaAprilFoolsPlatform.java +++ b/src/main/java/net/raphimc/viaaprilfools/platform/ViaAprilFoolsPlatform.java @@ -39,7 +39,7 @@ public interface ViaAprilFoolsPlatform { final ViaAprilFoolsConfig config = new ViaAprilFoolsConfig(new File(dataFolder, "viaaprilfools.yml")); config.reloadConfig(); ViaAprilFools.init(this, config); - Via.getManager().getSubPlatforms().add("ViaAprilFools-" + ViaAprilFools.VERSION); + Via.getManager().getSubPlatforms().add(ViaAprilFools.IMPL_VERSION); final ProtocolManager protocolManager = Via.getManager().getProtocolManager();