From fa674a57f6b09e0e0a6a45dbcc76ccdf4fc16b14 Mon Sep 17 00:00:00 2001 From: Adrian Date: Fri, 6 Jan 2023 20:58:45 -0500 Subject: [PATCH] misc: Improved dependencies declaration with libraries catalog --- api/paper/build.gradle.kts | 16 +++---- api/velocity/build.gradle.kts | 2 +- build.gradle.kts | 2 +- common/build.gradle.kts | 13 +++--- .../authmevelocity/common/Constants.java | 4 +- gradle/libs.versions.toml | 42 +++++++++++++++++++ paper/build.gradle.kts | 12 +++--- velocity/build.gradle.kts | 14 +++---- 8 files changed, 76 insertions(+), 29 deletions(-) create mode 100644 gradle/libs.versions.toml diff --git a/api/paper/build.gradle.kts b/api/paper/build.gradle.kts index 08dc163..da97b64 100644 --- a/api/paper/build.gradle.kts +++ b/api/paper/build.gradle.kts @@ -8,17 +8,19 @@ java { } dependencies { - compileOnly("io.papermc.paper:paper-api:1.19.1-R0.1-SNAPSHOT") + compileOnly(libs.paper) } tasks { javadoc { - options.encoding = Charsets.UTF_8.name() - (options as StandardJavadocDocletOptions).links( - "https://jd.adventure.kyori.net/api/4.11.0/", - "https://jd.adventure.kyori.net/text-minimessage/4.11.0/", - "https://jd.papermc.io/paper/1.19/" - ) + (options as StandardJavadocDocletOptions).run { + encoding = Charsets.UTF_8.name() + links( + "https://jd.adventure.kyori.net/api/4.11.0/", + "https://jd.adventure.kyori.net/text-minimessage/4.11.0/", + "https://jd.papermc.io/paper/1.19/" + ) + } } } diff --git a/api/velocity/build.gradle.kts b/api/velocity/build.gradle.kts index d102126..df55e62 100644 --- a/api/velocity/build.gradle.kts +++ b/api/velocity/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - compileOnly("com.velocitypowered:velocity-api:3.1.2-SNAPSHOT") + compileOnly(libs.velocity) } java { diff --git a/build.gradle.kts b/build.gradle.kts index 117990c..fc1bfab 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,6 @@ plugins { java - id("com.github.johnrengelman.shadow") version "7.1.2" + alias(libs.plugins.shadow) } repositories { diff --git a/common/build.gradle.kts b/common/build.gradle.kts index ccb35a0..129878d 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -1,6 +1,7 @@ plugins { - id("net.kyori.blossom") version "1.3.1" - id("com.github.johnrengelman.shadow") version "7.1.2" + alias(libs.plugins.blossom) + // Required to shadow packages + alias(libs.plugins.shadow) } repositories { @@ -9,9 +10,9 @@ repositories { } dependencies { - compileOnly("org.spongepowered:configurate-hocon:4.1.2") - compileOnly("net.byteflux:libby-core:1.1.5") - compileOnly("net.kyori:adventure-api:4.12.0") + compileOnly(libs.configurate.hocon) + compileOnly(libs.libby.core) + compileOnly(libs.adventure) } tasks { @@ -26,4 +27,6 @@ blossom { replaceTokenIn("src/main/java/me/adrianed/authmevelocity/common/Constants.java") replaceToken("{version}", project.version) replaceToken("{description}", project.description) + replaceToken("{configurate}", libs.versions.configurate.get()) + replaceToken("{geantyref}", libs.versions.geantyref.get()) } \ No newline at end of file diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/Constants.java b/common/src/main/java/me/adrianed/authmevelocity/common/Constants.java index 158488f..799f0e2 100644 --- a/common/src/main/java/me/adrianed/authmevelocity/common/Constants.java +++ b/common/src/main/java/me/adrianed/authmevelocity/common/Constants.java @@ -5,6 +5,6 @@ public final class Constants { public static final String VERSION = "{version}"; public static final String DESCRIPTION = "{description}"; - public static final String CONFIGURATE = "4.1.2"; - public static final String GEANTYREF = "1.3.13"; + public static final String CONFIGURATE = "{configurate}"; + public static final String GEANTYREF = "{geantyref}"; } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..e8ce546 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,42 @@ +metadata.format.version = "1.1" + +[versions] + +velocity = "3.2.0-SNAPSHOT" +paper = "1.19.3-R0.1-SNAPSHOT" +miniplaceholders = "1.3.1" +fastlogin = "1.12-SNAPSHOT" +authme = "5.6.0-SNAPSHOT" +libby = "1.1.5" +pluginyml = "0.5.2" +bstats = "3.0.0" +shadow = "7.1.2" +configurate = "4.1.2" +adventure = "4.12.0" +blossom = "1.3.1" +geantyref = "1.3.13" + +[libraries] + +adventure = { group = "net.kyori", name = "adventure-api", version.ref = "adventure" } + +paper = { group = "io.papermc.paper", name = "paper-api", version.ref = "paper" } +velocity = { group = "com.velocitypowered", name = "velocity-api", version.ref = "velocity" } +authme = { module = "fr.xephi:authme", version.ref = "authme" } + +libby-core = { group = "net.byteflux", name = "libby-core", version.ref = "libby" } +libby-bukkit = { group = "net.byteflux", name = "libby-bukkit", version.ref = "libby" } +libby-velocity = { group = "net.byteflux", name = "libby-velocity", version.ref = "libby" } + +miniplaceholders = { group = "com.github.4drian3d", name = "MiniPlaceholders", version.ref = "miniplaceholders" } + +fastlogin-velocity = { group = "com.github.games647", name = "fastlogin.velocity", version.ref = "fastlogin" } +bstats-velocity = { group = "org.bstats", name = "bstats-velocity", version.ref = "bstats" } + +configurate-hocon = { group = "org.spongepowered", name = "configurate-hocon", version.ref = "configurate" } + +[plugins] + +pluginyml-bukkit = { id = "net.minecrell.plugin-yml.bukkit", version.ref = "pluginyml" } +shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" } +blossom = { id = "net.kyori.blossom", version.ref = "blossom" } diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts index a8c5103..139284e 100644 --- a/paper/build.gradle.kts +++ b/paper/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("net.minecrell.plugin-yml.bukkit") version "0.5.2" - id("com.github.johnrengelman.shadow") version "7.1.2" + alias(libs.plugins.pluginyml.bukkit) + alias(libs.plugins.shadow) } repositories { @@ -12,10 +12,10 @@ repositories { dependencies { compileOnly(project(":authmevelocity-common")) compileOnly(project(":authmevelocity-api-paper")) - compileOnly("io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT") - compileOnly("fr.xephi:authme:5.6.0-SNAPSHOT") - compileOnly("com.github.4drian3d:MiniPlaceholders:1.3.1") - shadow("net.byteflux:libby-bukkit:1.1.5") + compileOnly(libs.paper) + compileOnly(libs.authme) + compileOnly(libs.miniplaceholders) + shadow(libs.libby.bukkit) } bukkit { diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts index b2642f3..1566edd 100644 --- a/velocity/build.gradle.kts +++ b/velocity/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("com.github.johnrengelman.shadow") version "7.1.2" + alias(libs.plugins.shadow) } repositories { @@ -11,12 +11,12 @@ repositories { dependencies { compileOnly(project(":authmevelocity-common")) compileOnly(project(":authmevelocity-api-velocity")) - compileOnly("com.velocitypowered:velocity-api:3.1.2-SNAPSHOT") - compileOnly("com.github.4drian3d:MiniPlaceholders:1.3.1") - compileOnly("com.github.games647:fastlogin.velocity:1.12-SNAPSHOT") - shadow("net.byteflux:libby-velocity:1.1.5") - shadow("org.bstats:bstats-velocity:3.0.0") - annotationProcessor("com.velocitypowered:velocity-api:3.1.2-SNAPSHOT") + compileOnly(libs.velocity) + compileOnly(libs.miniplaceholders) + compileOnly(libs.fastlogin.velocity) + shadow(libs.libby.velocity) + shadow(libs.bstats.velocity) + annotationProcessor(libs.velocity) } tasks {