Adapt to upstream changes

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:shadow-gradle-plugin:9.0.0-rc2")
+    implementation("com.diffplug.spotless:spotless-plugin-gradle:7.2.1")
+    implementation("de.skuzzle.restrictimports:restrict-imports-gradle-plugin:2.6.1")
 }

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

@@ -26,9 +26,9 @@ dependencies {
     implementation("redis.clients:jedis:3.5.1")
     implementation("co.aikar:idb-core:1.0.0-SNAPSHOT")
     implementation("co.aikar:idb-bukkit:1.0.0-SNAPSHOT")
-    implementation("net.kyori:adventure-api:4.17.0")
-    implementation("net.kyori:adventure-text-serializer-plain:4.17.0")
-    implementation("net.kyori:adventure-platform-bukkit:4.3.4")
+    implementation("net.kyori:adventure-api:4.24.0")
+    implementation("net.kyori:adventure-text-serializer-plain:4.24.0")
+    implementation("net.kyori:adventure-platform-bukkit:4.4.1")
 
     compileOnly("app.ashcon:sportpaper:1.8.8-R0.1-SNAPSHOT")
     compileOnly("tc.oc.pgm:core:0.16-SNAPSHOT")
@@ -55,7 +55,7 @@ spotless {
     ratchetFrom = "origin/dev"
     java {
         removeUnusedImports()
-        palantirJavaFormat("2.47.0").style("GOOGLE").formatJavadoc(true)
+        palantirJavaFormat("2.73.0").style("GOOGLE").formatJavadoc(true)
     }
 }
 

buildSrc/src/main/kotlin/extensions.kt

@@ -1,16 +1,13 @@
 import org.gradle.api.Project
-import java.io.ByteArrayOutputStream
 
 
 fun Project.latestCommitHash(): 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()
+    return providers.exec {
+        commandLine("git")
+        args(args)
+    }.standardOutput.asText.get().trim()
 }

core/build.gradle.kts

@@ -10,6 +10,7 @@ tasks.named<ShadowJar>("shadowJar") {
     archiveFileName = "Community.jar"
     archiveClassifier.set("")
     destinationDirectory = rootProject.projectDir.resolve("build/libs")
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 
     minimize()
 
@@ -42,15 +43,22 @@ publishing {
 
 tasks {
     processResources {
+        val name = project.name
+        val description = project.description
+        val version = project.version.toString()
+        val commitHash = project.latestCommitHash()
+
         filesMatching(listOf("plugin.yml")) {
             expand(
-                "name" to project.name,
-                "description" to project.description,
-                "mainClass" to "dev.pgm.community.Community",
-                "version" to project.version,
-                "commitHash" to project.latestCommitHash(),
-                "author" to "applenick",
-                "url" to "https://pgm.dev/")
+                mapOf(
+                    "name" to name,
+                    "description" to description,
+                    "mainClass" to "dev.pgm.community.Community",
+                    "version" to version,
+                    "commitHash" to commitHash,
+                    "author" to "applenick",
+                    "url" to "https://pgm.dev/")
+                )
         }
     }
 

core/src/main/java/dev/pgm/community/mutations/types/gameplay/BlitzMutation.java

@@ -19,9 +19,8 @@
 /** BlitzMutation - Enables blitz on a non-blitz match * */
 public class BlitzMutation extends MutationBase {
 
-  private static MutationRangeOption BLITZ_LIVES =
-      new MutationRangeOption(
-          "Blitz Lives", "The number of lives per-user", Material.EGG, true, 1, 1, 999);
+  private static MutationRangeOption BLITZ_LIVES = new MutationRangeOption(
+      "Blitz Lives", "The number of lives per-user", Material.EGG, true, 1, 1, 999);
 
   private BlitzMatchModule blitz;
 
@@ -37,15 +36,15 @@ public Collection<MutationOption> getOptions() {
   @Override
   public void enable() {
     super.enable();
-    this.blitz =
-        new BlitzMatchModule(
-            match,
-            new BlitzConfig(
-                BLITZ_LIVES.getValue(),
-                true,
-                StaticFilter.ALLOW,
-                StaticFilter.ALLOW,
-                StaticFilter.DENY));
+    this.blitz = new BlitzMatchModule(
+        match,
+        new BlitzConfig(
+            BLITZ_LIVES.getValue(),
+            true,
+            false,
+            StaticFilter.ALLOW,
+            StaticFilter.ALLOW,
+            StaticFilter.DENY));
 
     blitz.enable();
     match.addListener(blitz, MatchScope.RUNNING);

gradle.properties

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 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.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME