From f0d67b22b4ca63c7035ad3e5440fc0634105cde3 Mon Sep 17 00:00:00 2001
From: Jim Martens <github@2martens.de>
Date: Wed, 13 Dec 2023 09:33:24 +0100
Subject: [PATCH] chore: Update to Java 21

---
 buildSrc/src/main/kotlin/twomartens.kotlin.gradle.kts | 4 ++++
 gradle.properties                                     | 2 +-
 gradle/libs.versions.toml                             | 6 +++---
 gradle/wrapper/gradle-wrapper.properties              | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/buildSrc/src/main/kotlin/twomartens.kotlin.gradle.kts b/buildSrc/src/main/kotlin/twomartens.kotlin.gradle.kts
index 3b58353..fe477e2 100644
--- a/buildSrc/src/main/kotlin/twomartens.kotlin.gradle.kts
+++ b/buildSrc/src/main/kotlin/twomartens.kotlin.gradle.kts
@@ -1,4 +1,5 @@
 import org.gradle.accessors.dm.LibrariesForLibs
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     kotlin("jvm")
@@ -11,8 +12,11 @@ dependencies {
     implementation(kotlin("reflect"))
 }
 
+val projectSourceCompatibility: String = rootProject.properties["projectSourceCompatibility"].toString()
+
 kotlin {
     compilerOptions {
         freeCompilerArgs.add("-Xjvm-default=all")
+        jvmTarget.set(JvmTarget.fromTarget(projectSourceCompatibility))
     }
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index fb0a158..0e60092 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 projectname=timetable
 projectgroup=de.2martens
-projectSourceCompatibility=17
+projectSourceCompatibility=21
 file.encoding=utf-8
 org.gradle.parallel=true
 org.gradle.daemon=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 712e209..347af88 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
-spring-boot = "3.1.2"
+spring-boot = "3.2.0"
 spring-doc = "2.1.0"
-spring-cloud = "2022.0.4"
+spring-cloud = "2023.0.0"
 spring-grpc = "2.14.0.RELEASE"
 grpc = "1.57.0"
 tomcat-annotations = "6.0.53"
@@ -23,7 +23,7 @@ plugin-nebula-release = "17.2.2"
 plugin-lombok = "8.0.1"
 plugin-gradle-versions = "0.46.0"
 plugin-version-catalog = "0.8.0"
-plugin-kotlin-gradle = "1.9.0"
+plugin-kotlin-gradle = "1.9.21"
 plugin-jib = "3.3.2"
 
 [libraries]
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index db9a6b8..a595206 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists