From 79119fc46761202d60ab7f85e6a51e0988e0eab0 Mon Sep 17 00:00:00 2001
From: grimsi <9295182+grimsi@users.noreply.github.com>
Date: Thu, 5 Dec 2024 09:48:43 +0100
Subject: [PATCH] Update dependencies and plugins

---
 gameyfin/build.gradle.kts      | 12 ++++++------
 gradle.properties              |  6 ++++--
 plugins/igdb/build.gradle.kts  |  4 ++--
 plugins/steam/build.gradle.kts |  4 ++--
 settings.gradle.kts            |  1 +
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/gameyfin/build.gradle.kts b/gameyfin/build.gradle.kts
index d3fe842..dee05aa 100644
--- a/gameyfin/build.gradle.kts
+++ b/gameyfin/build.gradle.kts
@@ -8,8 +8,8 @@ plugins {
     kotlin("jvm")
     kotlin("plugin.spring")
     kotlin("plugin.jpa")
+    id("com.google.devtools.ksp")
     application
-    id("com.google.devtools.ksp") version "2.0.20-1.0.24"
 }
 
 application {
@@ -32,7 +32,7 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-security")
     implementation("org.springframework.boot:spring-boot-starter-validation")
     implementation("org.springframework.cloud:spring-cloud-starter")
-    implementation("jakarta.validation:jakarta.validation-api:3.0.2")
+    implementation("jakarta.validation:jakarta.validation-api:3.1.0")
 
     // Kotlin extensions
     implementation("org.jetbrains.kotlin:kotlin-reflect")
@@ -49,12 +49,12 @@ dependencies {
     api("com.vaadin:vaadin-spring-boot-starter")
 
     // Logging
-    implementation("io.github.oshai:kotlin-logging-jvm:6.0.3")
+    implementation("io.github.oshai:kotlin-logging-jvm:7.0.3")
 
     // Persistence & I/O
     implementation("org.springframework.boot:spring-boot-starter-data-jpa")
-    implementation("com.github.paulcwarren:spring-content-fs-boot-starter:3.0.14")
-    implementation("commons-io:commons-io:2.16.1")
+    implementation("com.github.paulcwarren:spring-content-fs-boot-starter:3.0.15")
+    implementation("commons-io:commons-io:2.18.0")
 
     // SSO
     implementation("org.springframework.boot:spring-boot-starter-oauth2-client")
@@ -67,7 +67,7 @@ dependencies {
 
     // Plugins
     implementation(project(":plugin-api"))
-    ksp("care.better.pf4j:pf4j-kotlin-symbol-processing:2.0.20-1.0.1")
+    ksp("care.better.pf4j:pf4j-kotlin-symbol-processing:${rootProject.extra["pf4jKspVersion"]}")
 
     // Development
     developmentOnly("org.springframework.boot:spring-boot-devtools")
diff --git a/gradle.properties b/gradle.properties
index b790752..3e0126d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,11 +1,13 @@
 # Plugin versions
-kotlinVersion=2.0.20
+kotlinVersion=2.0.21
+kspVersion=2.0.21-1.0.28
 vaadinVersion=24.5.7
 springBootVersion=3.4.0
 springCloudVersion=2024.0.0
 springDependencyManagementVersion=1.1.6
+# Dependency versions
 pf4jVersion=3.13.0
-pf4jSpringVersion=0.9.0
+pf4jKspVersion=2.0.21-1.0.1
 # Annotation processor settings
 kapt.use.k2=true
 ksp.useKSP2=true
\ No newline at end of file
diff --git a/plugins/igdb/build.gradle.kts b/plugins/igdb/build.gradle.kts
index e35fb8e..214ad4a 100644
--- a/plugins/igdb/build.gradle.kts
+++ b/plugins/igdb/build.gradle.kts
@@ -1,9 +1,9 @@
 plugins {
-    id("com.google.devtools.ksp") version "2.0.20-1.0.24"
+    id("com.google.devtools.ksp")
 }
 
 dependencies {
-    ksp("care.better.pf4j:pf4j-kotlin-symbol-processing:2.0.20-1.0.1")
+    ksp("care.better.pf4j:pf4j-kotlin-symbol-processing:${rootProject.extra["pf4jKspVersion"]}")
 
     // IGDB API client
     implementation("io.github.husnjak:igdb-api-jvm:1.2.0")
diff --git a/plugins/steam/build.gradle.kts b/plugins/steam/build.gradle.kts
index baf6fc3..2157a92 100644
--- a/plugins/steam/build.gradle.kts
+++ b/plugins/steam/build.gradle.kts
@@ -1,7 +1,7 @@
 val ktor_version = "3.0.0"
 
 plugins {
-    id("com.google.devtools.ksp") version "2.0.20-1.0.24"
+    id("com.google.devtools.ksp")
     kotlin("plugin.serialization")
 }
 
@@ -10,7 +10,7 @@ repositories {
 }
 
 dependencies {
-    ksp("care.better.pf4j:pf4j-kotlin-symbol-processing:2.0.20-1.0.1")
+    ksp("care.better.pf4j:pf4j-kotlin-symbol-processing:${rootProject.extra["pf4jKspVersion"]}")
 
     implementation("io.ktor:ktor-client-core:$ktor_version")
     implementation("io.ktor:ktor-client-cio:$ktor_version")
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 65b0ecd..5272b9b 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -9,6 +9,7 @@ pluginManagement {
         id("com.vaadin") version extra["vaadinVersion"] as String
         id("org.springframework.boot") version extra["springBootVersion"] as String
         id("io.spring.dependency-management") version extra["springDependencyManagementVersion"] as String
+        id("com.google.devtools.ksp") version extra["kspVersion"] as String
         kotlin("jvm") version extra["kotlinVersion"] as String
         kotlin("plugin.spring") version extra["kotlinVersion"] as String
         kotlin("plugin.jpa") version extra["kotlinVersion"] as String