Cleanup and migrate to Adventure

build.gradle.kts

@@ -41,14 +41,22 @@ publishing {
 
 tasks {
     processResources {
+        val description = project.description
+        val version = project.version.toString()
+        val commitHash = project.latestCommitHash()
+
+        inputs.property("commitHash", commitHash)
+
         filesMatching(listOf("plugin.yml")) {
             expand(
-                "name" to project.name,
-                "description" to project.description,
-                "mainClass" to "dev.pgm.events.EventsPlugin",
-                "version" to project.version,
-                "commitHash" to project.latestCommitHash(),
-                "url" to "https://pgm.dev/"
+                mapOf(
+                    "description" to description,
+                    "apiVersion" to "1.21.11",
+                    "mainClass" to "dev.pgm.events.EventsPlugin",
+                    "version" to version,
+                    "commitHash" to commitHash.get(),
+                    "url" to "https://pgm.dev/"
+                )
             )
         }
     }

buildSrc/build.gradle.kts

@@ -9,7 +9,7 @@ repositories {
 }
 
 dependencies {
-    implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.0")
-    implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.0.BETA4")
-    implementation("de.skuzzle.restrictimports:restrict-imports-gradle-plugin:2.6.0")
+    implementation("com.gradleup.shadow:com.gradleup.shadow.gradle.plugin:9.4.2")
+    implementation("com.diffplug.gradle.spotless:com.diffplug.gradle.spotless.gradle.plugin:8.6.0")
+    implementation("de.skuzzle.restrictimports:de.skuzzle.restrictimports.gradle.plugin:3.0.0")
 }

buildSrc/src/main/kotlin/buildlogic.java-conventions.gradle.kts

@@ -14,43 +14,49 @@ repositories {
     mavenLocal()
     mavenCentral()
     maven("https://oss.sonatype.org/content/repositories/snapshots/") // Snapshots
-    maven("https://repo.pgm.fyi/snapshots/") // PGM-specific depdencies
-    maven("https://repo.papermc.io/repository/maven-public/") // Needed for bungeecord-chat
+    maven("https://repo.pgm.fyi/snapshots/") // PGM-specific dependencies
+    maven("https://repo.papermc.io/repository/maven-public/")
+
 }
 
 dependencies {
-    compileOnly("dev.pgm.paper:paper-api:1.8_1.21.1-SNAPSHOT")
-    compileOnly("tc.oc.pgm:core:0.16-SNAPSHOT")
-    compileOnly("net.md-5:bungeecord-chat:1.20-R0.2-deprecated+build.18")
+    // Annotations
+    api("org.jspecify:jspecify:1.0.0")
+    compileOnly("org.jetbrains:annotations:26.1.0")
     compileOnly("org.incendo:cloud-annotations:2.0.0")
-    compileOnly("org.jetbrains:annotations:22.0.0")
+
+    // Provided dependencies
+    compileOnly("dev.pgm.paper:paper-api:1.8_1.21.11-SNAPSHOT")
+    compileOnly("tc.oc.pgm:core:0.16-SNAPSHOT") { isTransitive = false }
+    compileOnly("net.kyori:adventure-api:4.26.1")
+    compileOnly("com.google.guava:guava:17.0")
 }
 
 group = "dev.pgm"
 version = "1.0.0-SNAPSHOT"
 description = "Manage PvP tournament events"
 
 tasks {
-    withType<JavaCompile>() {
+    withType<JavaCompile> {
         options.encoding = "UTF-8"
     }
-    withType<Javadoc>() {
+    withType<Javadoc> {
         options.encoding = "UTF-8"
     }
 }
 
 spotless {
-    ratchetFrom = "origin/master"
     java {
         removeUnusedImports()
-        palantirJavaFormat("2.47.0").style("GOOGLE").formatJavadoc(true)
+        trimTrailingWhitespace()
+        formatAnnotations()
+        palantirJavaFormat("2.93.0").style("GOOGLE").formatJavadoc(true)
     }
 }
 
-
 restrictImports {
     group {
-        reason = "Use org.jetbrains.annotations to add annotations"
+        reason = "Use org.jspecify.annotations to add annotations, or org.jetbrains.annotations if needed"
         bannedImports = listOf("javax.annotation.**")
     }
     group {

buildSrc/src/main/kotlin/extensions.kt

@@ -1,16 +1,14 @@
 import org.gradle.api.Project
-import java.io.ByteArrayOutputStream
+import org.gradle.api.provider.Provider
 
 
-fun Project.latestCommitHash(): String {
+fun Project.latestCommitHash(): Provider<String> {
     return runGitCommand(listOf("rev-parse", "--short", "HEAD"))
 }
 
-fun Project.runGitCommand(args: List<String>): String {
-    val byteOut = ByteArrayOutputStream()
-    exec {
-        commandLine = listOf("git") + args
-        standardOutput = byteOut
-    }
-    return byteOut.toString(Charsets.UTF_8.name()).trim()
+fun Project.runGitCommand(args: List<String>): Provider<String> {
+    return providers.exec {
+        commandLine("git")
+        args(args)
+    }.standardOutput.asText.map { it.trim() }
 }

gradle.properties

@@ -0,0 +1 @@
+//org.gradle.configuration-cache=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists