From a8bd655ef54628c5bc287810e220674b1285ca34 Mon Sep 17 00:00:00 2001 From: mohammed jasem alaajel Date: Thu, 23 Mar 2023 13:25:47 +0400 Subject: [PATCH] move version into the api --- RedisBungee-API/build.gradle.kts | 7 +++++++ .../minecraft/redisbungee/Constants.java | 13 +++++++++++++ RedisBungee-Velocity/build.gradle.kts | 8 ++------ .../redisbungee/RedisBungeeVelocityPlugin.java | 2 +- 4 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/Constants.java diff --git a/RedisBungee-API/build.gradle.kts b/RedisBungee-API/build.gradle.kts index d34fa50..37503e2 100644 --- a/RedisBungee-API/build.gradle.kts +++ b/RedisBungee-API/build.gradle.kts @@ -1,6 +1,7 @@ plugins { `java-library` `maven-publish` + id("net.kyori.blossom") version "1.2.0" } repositories { @@ -25,6 +26,12 @@ dependencies { description = "RedisBungee interafaces" +blossom { + replaceToken("@version@", "$version") + // replaceToken("@git_branch@", "") + // replaceToken("@git_commit@", "") +} + java { withJavadocJar() withSourcesJar() diff --git a/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/Constants.java b/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/Constants.java new file mode 100644 index 0000000..fbf43b8 --- /dev/null +++ b/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/Constants.java @@ -0,0 +1,13 @@ +package com.imaginarycode.minecraft.redisbungee; + +public class Constants { + + public final static String VERSION = "@version@"; + + // public final static String GIT_BRANCH = "@git_branch@"; + + // public final static String GIT_COMMIT = "@git_commit@"; + + + +} diff --git a/RedisBungee-Velocity/build.gradle.kts b/RedisBungee-Velocity/build.gradle.kts index 4931c9c..35fa624 100644 --- a/RedisBungee-Velocity/build.gradle.kts +++ b/RedisBungee-Velocity/build.gradle.kts @@ -3,7 +3,7 @@ plugins { `maven-publish` id("com.github.johnrengelman.shadow") version "8.1.1" id("xyz.jpenilla.run-velocity") version "2.0.0" - id("net.kyori.blossom") version "1.2.0" + } repositories { @@ -29,17 +29,13 @@ java { withSourcesJar() } -blossom { - replaceToken("@version@", "$version") -} - tasks { withType { val options = options as StandardJavadocDocletOptions options.use() options.isDocFilesSubDirs = true options.links( - "https://jd.papermc.io/velocity/3.0.0/", // bungeecord api + "https://jd.papermc.io/velocity/3.0.0/", // velocity api ) } runVelocity { diff --git a/RedisBungee-Velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeVelocityPlugin.java b/RedisBungee-Velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeVelocityPlugin.java index d5c96e3..2c618dd 100644 --- a/RedisBungee-Velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeVelocityPlugin.java +++ b/RedisBungee-Velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeVelocityPlugin.java @@ -57,7 +57,7 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -@Plugin(id = "redisbungee", name = "RedisBungee", version = "@version@", url = "https://github.com/ProxioDev/RedisBungee", authors = {"astei", "ProxioDev"}) +@Plugin(id = "redisbungee", name = "RedisBungee", version = Constants.VERSION, url = "https://github.com/ProxioDev/RedisBungee", authors = {"astei", "ProxioDev"}) public class RedisBungeeVelocityPlugin implements RedisBungeePlugin, ConfigLoader { private final ProxyServer server; private final Logger logger;