From f50751ed48cf5102803c8418eb8d70e49664f717 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Tue, 5 Sep 2023 20:59:08 +1000 Subject: [PATCH] [ci skip] Update blossom --- api/build.gradle.kts | 12 +++++++++--- .../com/viaversion/viaversion/util/VersionInfo.java | 7 ++++++- common/build.gradle.kts | 5 ----- .../com/viaversion/viaversion/util/DumpUtil.java | 2 +- settings.gradle.kts | 2 +- 5 files changed, 17 insertions(+), 11 deletions(-) rename api/src/main/{java => java-templates}/com/viaversion/viaversion/util/VersionInfo.java (86%) diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 09f6ac8d4..3929331fb 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -3,9 +3,15 @@ plugins { id("via.shadow-conventions") } -blossom { - replaceToken("\$VERSION", project.version) - replaceToken("\$IMPL_VERSION", "git-ViaVersion-${project.version}:${rootProject.latestCommitHash()}") +sourceSets { + main { + blossom { + javaSources { + property("version", project.version.toString()) + property("impl_version", "git-ViaVersion-${project.version}:${rootProject.latestCommitHash()}") + } + } + } } dependencies { diff --git a/api/src/main/java/com/viaversion/viaversion/util/VersionInfo.java b/api/src/main/java-templates/com/viaversion/viaversion/util/VersionInfo.java similarity index 86% rename from api/src/main/java/com/viaversion/viaversion/util/VersionInfo.java rename to api/src/main/java-templates/com/viaversion/viaversion/util/VersionInfo.java index 7c5f85fbf..a2fc68b2f 100644 --- a/api/src/main/java/com/viaversion/viaversion/util/VersionInfo.java +++ b/api/src/main/java-templates/com/viaversion/viaversion/util/VersionInfo.java @@ -31,9 +31,14 @@ public final class VersionInfo { * * @see ViaPlatform#getPluginVersion() */ - public static final String VERSION = "$VERSION"; + public static final String VERSION = "{{ version }}"; + private static final String IMPLEMENTATION_VERSION = "{{ impl_version }}"; public static String getVersion() { return VERSION; } + + public static String getImplementationVersion() { + return IMPLEMENTATION_VERSION; + } } diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 429b8eaf7..3c64427fd 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -2,11 +2,6 @@ plugins { id("net.kyori.blossom") } -blossom { - replaceToken("\$VERSION", project.version) - replaceToken("\$IMPL_VERSION", "git-ViaVersion-${project.version}:${rootProject.latestCommitHash()}") -} - dependencies { api(projects.viaversionApi) api(projects.viaversionApiLegacy) diff --git a/common/src/main/java/com/viaversion/viaversion/util/DumpUtil.java b/common/src/main/java/com/viaversion/viaversion/util/DumpUtil.java index 6a2612e4a..7d574a0af 100644 --- a/common/src/main/java/com/viaversion/viaversion/util/DumpUtil.java +++ b/common/src/main/java/com/viaversion/viaversion/util/DumpUtil.java @@ -62,7 +62,7 @@ public final class DumpUtil { Via.getPlatform().getPlatformName(), Via.getPlatform().getPlatformVersion(), Via.getPlatform().getPluginVersion(), - "$IMPL_VERSION", + com.viaversion.viaversion.util.VersionInfo.getImplementationVersion(), Via.getManager().getSubPlatforms() ); final Map configuration = Via.getPlatform().getConfigurationProvider().getValues(); diff --git a/settings.gradle.kts b/settings.gradle.kts index 8c97c3778..730b0fbec 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -17,7 +17,7 @@ dependencyResolutionManagement { pluginManagement { // default plugin versions plugins { - id("net.kyori.blossom") version "1.3.1" + id("net.kyori.blossom") version "2.0.1" id("com.github.johnrengelman.shadow") version "8.1.1" } }