From ed13d655fc73e49192682e6758bdd08e5498511d Mon Sep 17 00:00:00 2001
From: wakingrufus <wakingrufus@gmail.com>
Date: Fri, 19 Dec 2025 11:17:03 -0600
Subject: [PATCH] upgrade Gradle, kotlin, and java

---
 build.gradle.kts                         |  2 +-
 gradle/gradle-daemon-jvm.properties      |  1 +
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 personal-site/build.gradle.kts           | 25 +++++++++++++-----------
 settings.gradle.kts                      |  4 ++--
 5 files changed, 19 insertions(+), 15 deletions(-)
 create mode 100644 gradle/gradle-daemon-jvm.properties

diff --git a/build.gradle.kts b/build.gradle.kts
index fd137b6..7645504 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ allprojects {
 }
 
 tasks.getByName<Wrapper>("wrapper") {
-    gradleVersion = "8.13"
+    gradleVersion = "9.2.1"
     distributionType = Wrapper.DistributionType.BIN
 }
 
diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties
new file mode 100644
index 0000000..c18ca59
--- /dev/null
+++ b/gradle/gradle-daemon-jvm.properties
@@ -0,0 +1 @@
+toolchainVersion=21
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 37f853b..23449a2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/personal-site/build.gradle.kts b/personal-site/build.gradle.kts
index c15377f..6e9bfc2 100644
--- a/personal-site/build.gradle.kts
+++ b/personal-site/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
     implementation("org.jsoup:jsoup:1.15.3")
     implementation("com.beust:klaxon:5.5")
     implementation("com.github.kittinunf.fuel:fuel:2.3.1")
-    implementation("ch.qos.logback:logback-classic:1.4.5")
+    implementation("ch.qos.logback:logback-classic:1.5.22")
     implementation("com.rometools:rome:1.10.0")
     implementation("com.vladsch.flexmark:flexmark-all:0.50.16")
 
@@ -29,21 +29,24 @@ dependencies {
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.3.1")
 }
 
-val testTask = tasks.getByName<Test>("test") {
-    useJUnitPlatform()
-}
-
-tasks.jacocoTestReport {
-    dependsOn(testTask)
+testing {
+    suites {
+        named<JvmTestSuite>("test"){
+            useJUnitJupiter()
+            targets.all {
+                testTask.configure {
+                    finalizedBy("jacocoTestReport")
+                }
+            }
+        }
+    }
 }
 
-tasks.findByPath("build")?.dependsOn("jacocoTestReport")
-
 tasks.getByName<JavaExec>("run") {
     if (project.hasProperty("neocities.apiKey")) {
-        args(project.properties.get("neocities.apiKey"))
+        args(project.properties.get("neocities.apiKey") ?: "")
     } else if (project.hasProperty("neocities.user")) {
-        args(project.properties.get("neocities.user"), project.properties.get("neocities.password"))
+        args(project.properties.get("neocities.user") ?: "", project.properties.get("neocities.password") ?: "")
     }
 }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 3d660a0..3d9abda 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,7 +1,7 @@
 pluginManagement{
     plugins {
-        id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
-        id("org.jetbrains.kotlin.jvm") version "2.1.20"
+        id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
+        id("org.jetbrains.kotlin.jvm") version "2.3.0"
         id("com.jfrog.artifactory") version "4.24.12"
     }
 }