Update JDK 21 -> 25 in ci.yml (#4429)

* Update JDK 21 -> 25 in ci.yml

* Updates to gradle configuration

- Update gradle wrapper to 9.3.1
- Update velocity to use Blossom 2.2.0
- Bubblegum fix for common exec-blocks

* Add source compatibility 8 to api module

Author: AuroraLS3

.github/workflows/ci.yml

@@ -51,7 +51,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '25'
       - name: 💼 Setup Gradle
         uses: gradle/actions/setup-gradle@v4
       - name: 🛠 Build jars 

Plan/api/build.gradle

@@ -9,6 +9,7 @@ dependencies {
 
 compileJava {
     options.release = 8
+    sourceCompatibility = "${JavaVersion.VERSION_1_8}"
 }
 
 def apiVersion = "5.7-R0.2"

Plan/build.gradle

@@ -51,6 +51,7 @@ subprojects {
 
     compileJava {
         options.release = 11
+        sourceCompatibility = "${JavaVersion.VERSION_11}"
     }
 
     ext {

Plan/common/build.gradle

@@ -9,6 +9,10 @@ plugins {
     id "io.swagger.core.v3.swagger-gradle-plugin" version "2.2.44"
 }
 
+compileTestFixturesJava {
+    sourceCompatibility = "${JavaVersion.VERSION_17}"
+}
+
 configurations {
     // Runtime downloading scopes
     mysqlDriver
@@ -200,6 +204,12 @@ tasks.named("checkstyleTest").configure {
     it.dependsOn(copyYarnBuildResults)
 }
 
+// Add support for exec block https://stackoverflow.com/a/79720796/20825073
+interface InjectedExecOps {
+    @Inject
+    ExecOperations getExecOps()
+}
+
 tasks.register("determineAssetModifications") {
     // Skip Yarn build on Jitpack since Jitpack doesn't offer gclib version compatible with Node 20
     // Jitpack build is used mainly for java dependencies.
@@ -211,14 +221,15 @@ tasks.register("determineAssetModifications") {
     inputs.files(fileTree(dir: "src/main/resources/assets/plan/themes"))
     outputs.file("build/resources/main/assets/plan/AssetVersion.yml")
 
+    def execOps = project.objects.newInstance(InjectedExecOps).execOps
     doLast {
         mkdir "build/resources/main/assets/plan"
         def versionFile = file("build/resources/main/assets/plan/AssetVersion.yml")
         versionFile.text = "" // Clear previous build
         ConfigurableFileTree tree = fileTree(dir: "src/main/resources/assets/plan/web")
         tree.forEach { File f ->
             def gitModified = new ByteArrayOutputStream()
-            exec {
+            execOps.exec {
                 commandLine "git", "log", "-1", "--pretty=%ct", f.toString()
                 standardOutput = gitModified
             }
@@ -234,7 +245,7 @@ tasks.register("determineAssetModifications") {
         tree = fileTree(dir: "src/main/resources/assets/plan/locale")
         tree.forEach { File f ->
             def gitModified = new ByteArrayOutputStream()
-            exec {
+            execOps.exec {
                 commandLine "git", "log", "-1", "--pretty=%ct", f.toString()
                 standardOutput = gitModified
             }
@@ -250,7 +261,7 @@ tasks.register("determineAssetModifications") {
         tree = fileTree(dir: "src/main/resources/assets/plan/themes")
         tree.forEach { File f ->
             def gitModified = new ByteArrayOutputStream()
-            exec {
+            execOps.exec {
                 commandLine "git", "log", "-1", "--pretty=%ct", f.toString()
                 standardOutput = gitModified
             }

Plan/gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

Plan/gradle/wrapper/gradle-wrapper.properties

@@ -1,12 +1,24 @@
 plugins {
-    id "net.kyori.blossom" version "1.3.1"
+    id "net.kyori.blossom" version "2.2.0"
 }
 
 apply plugin: "com.gradleup.shadow"
 
-blossom {
-    replaceTokenIn("src/main/java/com/djrapitops/plan/PlanVelocity.java")
-    replaceToken("@version@", "$fullVersion")
+compileJava {
+    dependsOn generateTemplates
+}
+
+sourceSets {
+    main {
+//        java {
+//            srcDir("src/main/java-templates")
+//        }
+        blossom {
+            javaSources {
+                property("version", "$fullVersion")
+            }
+        }
+    }
 }
 
 repositories {

Plan/gradlew

@@ -0,0 +1,21 @@
+/*
+ *  This file is part of Player Analytics (Plan).
+ *
+ *  Plan is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License v3 as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Plan is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
+ */
+package net.playeranalytics.plan;
+
+public class BuildParameters {
+    public static final String VERSION = "{{ version }}";
+}