From 25d0d7f0f9fcf7b3ec24fd572d2c7238c65830d6 Mon Sep 17 00:00:00 2001
From: Pascal Honegger <git@honegger.dev>
Date: Fri, 1 Nov 2024 20:30:35 +0100
Subject: [PATCH] feat(backend): switch to Java 23

---
 .idea/misc.xml                       | 2 +-
 Backend/bootstrap/build.gradle.kts   | 2 +-
 Backend/data-access/build.gradle.kts | 2 +-
 Backend/domain/build.gradle.kts      | 2 +-
 Backend/security/build.gradle.kts    | 2 +-
 Backend/web-api/build.gradle.kts     | 2 +-
 Dockerfile                           | 4 ++--
 DockerfileBuiltLocally               | 2 +-
 settings.gradle.kts                  | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 2e2cd56..3c13ada 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -12,5 +12,5 @@
   <component name="MarkdownSettingsMigration">
     <option name="stateVersion" value="1" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_23" default="true" project-jdk-name="23" project-jdk-type="JavaSDK" />
 </project>
diff --git a/Backend/bootstrap/build.gradle.kts b/Backend/bootstrap/build.gradle.kts
index 5f781ba..11de7d6 100644
--- a/Backend/bootstrap/build.gradle.kts
+++ b/Backend/bootstrap/build.gradle.kts
@@ -13,7 +13,7 @@ application {
 }
 
 kotlin {
-    jvmToolchain(21)
+    jvmToolchain(23)
 }
 
 dependencies {
diff --git a/Backend/data-access/build.gradle.kts b/Backend/data-access/build.gradle.kts
index abf124d..a2b7ace 100644
--- a/Backend/data-access/build.gradle.kts
+++ b/Backend/data-access/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(21)
+    jvmToolchain(23)
 }
 
 dependencies {
diff --git a/Backend/domain/build.gradle.kts b/Backend/domain/build.gradle.kts
index 1d453a4..b32a507 100644
--- a/Backend/domain/build.gradle.kts
+++ b/Backend/domain/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(21)
+    jvmToolchain(23)
 }
 
 dependencies {
diff --git a/Backend/security/build.gradle.kts b/Backend/security/build.gradle.kts
index 0fefd1e..bd380f5 100644
--- a/Backend/security/build.gradle.kts
+++ b/Backend/security/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(21)
+    jvmToolchain(23)
 }
 
 dependencies {
diff --git a/Backend/web-api/build.gradle.kts b/Backend/web-api/build.gradle.kts
index 9acd0b1..c3a2ba5 100644
--- a/Backend/web-api/build.gradle.kts
+++ b/Backend/web-api/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(21)
+    jvmToolchain(23)
 }
 
 dependencies {
diff --git a/Dockerfile b/Dockerfile
index 7fb0402..897ccdd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,13 +5,13 @@ WORKDIR /home/node/src
 RUN pnpm i --frozen-lockfile
 RUN pnpm build
 
-FROM eclipse-temurin:21-jdk AS buildBackend
+FROM eclipse-temurin:23-jdk-alpine AS buildBackend
 COPY . /home/gradle/src
 COPY --from=buildFrontend /home/node/src/dist /home/gradle/src/Backend/bootstrap/src/main/resources/static
 WORKDIR /home/gradle/src
 RUN ./gradlew shadowJar --no-daemon
 
-FROM eclipse-temurin:21-jre
+FROM eclipse-temurin:23-jre-alpine
 EXPOSE 8080:8080
 RUN mkdir /app
 COPY --from=buildBackend /home/gradle/src/Backend/bootstrap/build/libs/*.jar /app/jasstracker.jar
diff --git a/DockerfileBuiltLocally b/DockerfileBuiltLocally
index c8c5660..ace6603 100644
--- a/DockerfileBuiltLocally
+++ b/DockerfileBuiltLocally
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21-jre
+FROM eclipse-temurin:23-jre-alpine
 EXPOSE 8080:8080
 RUN mkdir /app
 COPY ./Backend/bootstrap/build/libs/*.jar /app/jasstracker.jar
diff --git a/settings.gradle.kts b/settings.gradle.kts
index c99d65f..4cdce98 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 
 dependencyResolutionManagement {
     versionCatalogs {
-        val kotlin = "2.0.21"
+        val kotlin = "2.1.0-Beta2"
         val mockk = "1.13.13"
         val ktor = "3.0.1"
         val logback = "1.5.12"