From 53be6f11866565394455d5225b5a14c2e67c62d1 Mon Sep 17 00:00:00 2001
From: Alexandre Mommers <none@ygdrasil.io>
Date: Thu, 7 Dec 2023 18:01:08 +0100
Subject: [PATCH] Update Gradle and JVM versions in klang project

This commit updates the Gradle version to 8.5 from 8.4-rc-2 and adjusts JVM toolchain from version 17 to 21. Additionally, the versions of plugins kotlin("jvm") and kotlin("plugin.serialization") are updated, improving the compatibility and performance of the project.
---
 klang/build.gradle.kts                        | 28 ++++++++++---------
 klang/gradle-plugin/build.gradle.kts          |  4 +--
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/klang/build.gradle.kts b/klang/build.gradle.kts
index 99da5c5c..921951eb 100644
--- a/klang/build.gradle.kts
+++ b/klang/build.gradle.kts
@@ -1,7 +1,8 @@
 plugins {
-    kotlin("jvm") version "1.9.10"
-    kotlin("plugin.serialization") version "1.9.10"
-    id("org.jetbrains.kotlinx.kover") version "0.7.3"
+	kotlin("jvm") version "1.9.20"
+	kotlin("plugin.serialization") version "1.9.20"
+	id("org.jetbrains.kotlinx.kover") version "0.7.3"
+	id("com.gradle.plugin-publish") version "1.0.0"
 }
 
 val projectVersion = System.getenv("VERSION")
@@ -22,16 +23,18 @@ allprojects {
 	version = projectVersion
 
 	kotlin {
-		jvmToolchain(17)
+		jvmToolchain(21)
 
-    sourceSets.all {
-        languageSettings {
-            java {
-                sourceCompatibility = JavaVersion.VERSION_21
-                targetCompatibility = JavaVersion.VERSION_21
-            }
-            languageVersion = "2.0"
-        }
+		sourceSets.all {
+			languageSettings {
+				java {
+					sourceCompatibility = JavaVersion.VERSION_21
+					targetCompatibility = JavaVersion.VERSION_21
+				}
+				languageVersion = "2.0"
+			}
+		}
+	}
 
 	publishing {
 
@@ -57,4 +60,3 @@ allprojects {
 	}
 }
 
-
diff --git a/klang/gradle-plugin/build.gradle.kts b/klang/gradle-plugin/build.gradle.kts
index 58a3680c..1db7395a 100644
--- a/klang/gradle-plugin/build.gradle.kts
+++ b/klang/gradle-plugin/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-	id("com.gradle.plugin-publish") version "1.0.0"
-	kotlin("jvm") version "1.9.0"
+	kotlin("jvm")
+	id("com.gradle.plugin-publish")
 }
 
 gradlePlugin {
diff --git a/klang/gradle/wrapper/gradle-wrapper.properties b/klang/gradle/wrapper/gradle-wrapper.properties
index 98ea3909..1af9e093 100644
--- a/klang/gradle/wrapper/gradle-wrapper.properties
+++ b/klang/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-rc-2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME