From 7a50f5af94292ca1eacd54a6c656d9dddc07255f Mon Sep 17 00:00:00 2001 From: RaphiMC <50594595+RaphiMC@users.noreply.github.com> Date: Wed, 4 Jan 2023 03:39:05 +0100 Subject: [PATCH] Small improvements to versioning --- build.gradle | 11 +++++++++++ gradle.properties | 2 +- src/main/java/net/raphimc/vialegacy/ViaLegacy.java | 2 ++ .../raphimc/vialegacy/platform/ViaLegacyPlatform.java | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 0a5a26e..e889d33 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,7 @@ plugins { id "java-library" id "maven-publish" + id "net.kyori.blossom" version "1.2.0" } java.toolchain.languageVersion = JavaLanguageVersion.of(8) @@ -31,6 +32,10 @@ dependencies { //api "net.lenni0451.mcstructs:all:1.4.0" // Not yet used } +blossom { + replaceToken("\${version}", project.version, "src/main/java/net/raphimc/vialegacy/ViaLegacy.java") +} + java { withSourcesJar() withJavadocJar() @@ -40,6 +45,12 @@ javadoc { failOnError = false } +jar { + from("LICENSE") { + rename { "${it}_${project.archivesBaseName}" } + } +} + publishing { repositories { maven { diff --git a/gradle.properties b/gradle.properties index 1c1c0ba..166a6cc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,4 +6,4 @@ org.gradle.configureondemand=true # Project properties maven_name=ViaLegacy maven_group=net.raphimc -maven_version=2.0.1 +maven_version=2.0.2 diff --git a/src/main/java/net/raphimc/vialegacy/ViaLegacy.java b/src/main/java/net/raphimc/vialegacy/ViaLegacy.java index b1b9407..8301f38 100644 --- a/src/main/java/net/raphimc/vialegacy/ViaLegacy.java +++ b/src/main/java/net/raphimc/vialegacy/ViaLegacy.java @@ -5,6 +5,8 @@ import net.raphimc.vialegacy.platform.ViaLegacyPlatform; public class ViaLegacy { + public static final String VERSION = "${version}"; + private static ViaLegacyPlatform platform; private static ViaLegacyConfig config; diff --git a/src/main/java/net/raphimc/vialegacy/platform/ViaLegacyPlatform.java b/src/main/java/net/raphimc/vialegacy/platform/ViaLegacyPlatform.java index 909b7cd..131cf9b 100644 --- a/src/main/java/net/raphimc/vialegacy/platform/ViaLegacyPlatform.java +++ b/src/main/java/net/raphimc/vialegacy/platform/ViaLegacyPlatform.java @@ -72,7 +72,7 @@ public interface ViaLegacyPlatform { ViaLegacy.init(this, config); VersionEnum.init(); - Via.getManager().getSubPlatforms().add("ViaLegacy-2.0.0"); + Via.getManager().getSubPlatforms().add("ViaLegacy-" + ViaLegacy.VERSION); final ProtocolManager protocolManager = Via.getManager().getProtocolManager(); protocolManager.registerProtocol(new Protocol1_8to1_7_6_10(), VersionEnum.r1_8.getProtocol(), VersionEnum.r1_7_6tor1_7_10.getProtocol());