From 881a7237d9c63ca728bd4009f7f4e44c7d1e9961 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 19 Oct 2024 16:38:06 +0200
Subject: [PATCH] chore(deps): Bump the kotlin group across 1 directory with 2
 updates (#1247)

* chore(deps): Bump the kotlin group across 1 directory with 2 updates

Bumps the kotlin group with 2 updates in the / directory: [jvm](https://github.com/JetBrains/kotlin) and [plugin.spring](https://github.com/JetBrains/kotlin).


Updates `jvm` from 1.9.24 to 2.0.21
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v2.0.21/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.24...v2.0.21)

Updates `plugin.spring` from 1.9.24 to 2.0.21
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v2.0.21/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.24...v2.0.21)

---
updated-dependencies:
- dependency-name: jvm
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: kotlin
- dependency-name: plugin.spring
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: kotlin
...

Signed-off-by: dependabot[bot] <support@github.com>

* finalize upgrade to Kotlin 2.0

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Benoit Orihuela <benoit.orihuela@egm.io>
---
 build.gradle.kts                         | 17 ++++++++++-------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index e7c3b0471..db476323b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,7 +2,8 @@ import com.google.cloud.tools.jib.gradle.PlatformParameters
 import io.gitlab.arturbosch.detekt.Detekt
 import io.gitlab.arturbosch.detekt.DetektCreateBaselineTask
 import io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 buildscript {
     dependencies {
@@ -21,8 +22,8 @@ plugins {
     id("org.springframework.boot") version "3.3.4" apply false
     id("io.spring.dependency-management") version "1.1.6" apply false
     id("org.graalvm.buildtools.native") version "0.10.3"
-    kotlin("jvm") version "1.9.24" apply false
-    kotlin("plugin.spring") version "1.9.24" apply false
+    kotlin("jvm") version "2.0.21" apply false
+    kotlin("plugin.spring") version "2.0.21" apply false
     id("com.google.cloud.tools.jib") version "3.4.3" apply false
     id("io.gitlab.arturbosch.detekt") version "1.23.6" apply false
     id("org.sonarqube") version "5.1.0.4882"
@@ -86,11 +87,13 @@ subprojects {
         testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test")
     }
 
-    tasks.withType<KotlinCompile> {
-        kotlinOptions {
-            freeCompilerArgs = listOf("-Xjsr305=strict")
-            jvmTarget = "${JavaVersion.VERSION_21}"
+    kotlin {
+        compilerOptions {
+            freeCompilerArgs.add("-Xjsr305=strict")
+            apiVersion.set(KotlinVersion.KOTLIN_2_0)
+            jvmTarget.set(JvmTarget.JVM_21)
         }
+        jvmToolchain(21)
     }
     tasks.withType<Test> {
         environment("SPRING_PROFILES_ACTIVE", "test")
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 20db9ad5c..2617362fd 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.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists