build: fix shading + update dependencies

Author: Zoriot

build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     java
-    id("com.palantir.git-version") version "4.0.0"
-    id("com.gradleup.shadow") version "9.0.2"
+    alias(libs.plugins.git.version)
+    alias(libs.plugins.shadow)
 }
 
 repositories {
@@ -45,7 +45,9 @@ dependencies {
     implementation(libs.com.alpsbte.alpslib.alpslib.hologram)
     implementation(libs.com.alpsbte.alpslib.alpslib.utils)
     implementation(libs.org.mariadb.jdbc.mariadb.java.client)
-    implementation(libs.com.zaxxer.hikaricp)
+    implementation(libs.com.zaxxer.hikaricp) {
+        exclude(group = "org.slf4j")
+    }
     implementation(platform(libs.com.intellectualsites.bom.bom.newest))
     compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Core")
     compileOnly(libs.com.sk89q.worldguard.worldguard.bukkit)
@@ -76,24 +78,19 @@ tasks.withType<Javadoc> {
 }
 
 tasks.shadowJar {
-    // Exclude annotation classes (e.g. org.jetbrains.annotations)
     exclude("org/jetbrains/annotations/**")
-    // Exclude slf4j classes
-    exclude("org/slf4j/**")
-    exclude("META-INF/**")
     archiveClassifier = ""
 
-    val relocationPrefix = "alpsplotsystem.libs"
-    relocate("com.alpsbte.alpslib", "$relocationPrefix.com.alpsbte.alpslib")
-    relocate("org.mariadb.jdbc", "$relocationPrefix.org.mariadb.jdbc")
-    relocate("com.zaxxer.hikari", "$relocationPrefix.com.zaxxer.hikari")
+    relocationPrefix = "$group.plotsystem.shaded"
+    enableAutoRelocation = true
 }
 
 tasks.assemble {
     dependsOn(tasks.shadowJar) // Ensure that the shadowJar task runs before the build task
 }
 
 tasks.jar {
+    archiveClassifier = "UNSHADED"
     enabled = false // Disable the default jar task since we are using shadowJar
 }
 

gradle/libs.versions.toml

@@ -2,22 +2,24 @@
 # https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format
 
 [versions]
-com-alpsbte-alpslib-alpslib-hologram = "1.1.1"
-com-alpsbte-alpslib-alpslib-io = "1.2.0"
-com-alpsbte-alpslib-alpslib-utils = "1.3.6"
-com-alpsbte-canvas = "1.3"
-com-arcaniax-headdatabase-api = "1.3.2"
-com-github-decentsoftware-eu-decentholograms = "2.9.2"
-com-github-fierioziy-particlenativeapi-particlenativeapi-plugin = "3.3.2"
-multiverse-core = "5.3.0"
-com-sk89q-worldguard-worldguard-bukkit = "7.1.0-SNAPSHOT"
-com-zaxxer-hikaricp = "6.3.0"
-commons-io-commons-io = "2.20.0"
-de-oliver-fancynpcs = "2.7.0"
-io-papermc-paper-paper-api = "1.21.8-R0.1-SNAPSHOT"
-li-cinnazeyy-langlibs-api = "1.5.1"
-org-mariadb-jdbc-mariadb-java-client = "2.7.4"
+com-alpsbte-alpslib-alpslib-hologram = "1.1.1" # https://mvn.alps-bte.com/service/rest/repository/browse/alps-bte/com/alpsbte/alpslib/alpslib-hologram/
+com-alpsbte-alpslib-alpslib-io = "1.2.0" # https://mvn.alps-bte.com/service/rest/repository/browse/alps-bte/com/alpsbte/alpslib/alpslib-io/
+com-alpsbte-alpslib-alpslib-utils = "1.3.6" # https://mvn.alps-bte.com/service/rest/repository/browse/alps-bte/com/alpsbte/alpslib/alpslib-utils/
+com-alpsbte-canvas = "1.3" # https://mvn.alps-bte.com/service/rest/repository/browse/alps-bte/com/alpsbte/canvas/
+com-arcaniax-headdatabase-api = "1.3.2" # https://github.com/Arcaniax-Development/HeadDatabase-API/releases
+com-github-decentsoftware-eu-decentholograms = "2.9.9" # https://github.com/DecentSoftware-eu/DecentHolograms/releases
+com-github-fierioziy-particlenativeapi-particlenativeapi-plugin = "3.3.2" # https://github.com/Fierioziy/ParticleNativeAPI/releases - we are stuck at v3 for now. Need to migrate some time or remove it
+multiverse-core = "5.5.1" # https://github.com/Multiverse/Multiverse-Core/releases
+com-sk89q-worldguard-worldguard-bukkit = "7.0.15" # https://maven.enginehub.org/ui/packages/gav:%2F%2Fcom.sk89q.worldguard:worldguard-bukkit?name=com.sk89q.worldguard&type=packages
+com-zaxxer-hikaricp = "7.0.2" # https://github.com/brettwooldridge/HikariCP/tags
+commons-io-commons-io = "2.20.0" # https://central.sonatype.com/artifact/commons-io/commons-io - provided by Paper
+de-oliver-fancynpcs = "2.9.0" # https://repo.fancyinnovations.com/#/releases/de/oliver/FancyNpcs
+io-papermc-paper-paper-api = "1.21.11-R0.1-SNAPSHOT"
+li-cinnazeyy-langlibs-api = "1.5.1" # https://mvn.alps-bte.com/service/rest/repository/browse/alps-bte/li/cinnazeyy/LangLibs-API/
+org-mariadb-jdbc-mariadb-java-client = "3.5.7" # https://central.sonatype.com/artifact/org.mariadb.jdbc/mariadb-java-client
 com-intellectualsites-bom-bom-newest = "1.55" # Ref: https://github.com/IntellectualSites/bom
+git-version = "4.3.0" # https://github.com/palantir/gradle-git-version/releases
+shadow = "9.3.1" # https://github.com/GradleUp/shadow/releases
 
 [libraries]
 com-alpsbte-alpslib-alpslib-hologram = { module = "com.alpsbte.alpslib:alpslib-hologram", version.ref = "com-alpsbte-alpslib-alpslib-hologram" }
@@ -35,4 +37,8 @@ de-oliver-fancynpcs = { module = "de.oliver:FancyNpcs", version.ref = "de-oliver
 io-papermc-paper-paper-api = { module = "io.papermc.paper:paper-api", version.ref = "io-papermc-paper-paper-api" }
 li-cinnazeyy-langlibs-api = { module = "li.cinnazeyy:LangLibs-API", version.ref = "li-cinnazeyy-langlibs-api" }
 org-mariadb-jdbc-mariadb-java-client = { module = "org.mariadb.jdbc:mariadb-java-client", version.ref = "org-mariadb-jdbc-mariadb-java-client" }
-com-intellectualsites-bom-bom-newest = { module = "com.intellectualsites.bom:bom-newest", version.ref = "com-intellectualsites-bom-bom-newest" }
+com-intellectualsites-bom-bom-newest = { module = "com.intellectualsites.bom:bom-newest", version.ref = "com-intellectualsites-bom-bom-newest" }
+
+[plugins]
+git-version = { id = "com.palantir.git-version", version.ref = "git-version" }
+shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }