From c12e1dc872fd0b7eddabe0782be5cfd44825e47f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 8 Jan 2026 17:23:34 +0000 Subject: [PATCH] Upgrade to Kotlin 2.3.0 Closes gh-48745 --- .../boot/gradle/testkit/PluginClasspathGradleBuild.java | 2 -- gradle.properties | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/build-plugin/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/PluginClasspathGradleBuild.java b/build-plugin/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/PluginClasspathGradleBuild.java index b064ba83f0e..a9f617a7264 100644 --- a/build-plugin/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/PluginClasspathGradleBuild.java +++ b/build-plugin/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/PluginClasspathGradleBuild.java @@ -32,7 +32,6 @@ import org.apache.hc.core5.http2.HttpVersionPolicy; import org.cyclonedx.gradle.CyclonedxPlugin; import org.gradle.testkit.runner.GradleRunner; import org.jetbrains.kotlin.gradle.fus.BuildUidService; -import org.jetbrains.kotlin.gradle.model.KotlinProject; import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerPluginSupportPlugin; import org.jetbrains.kotlin.project.model.LanguageSettings; import org.jetbrains.kotlin.tooling.core.KotlinToolingVersion; @@ -86,7 +85,6 @@ public class PluginClasspathGradleBuild extends GradleBuild { classpath.add(new File(pathOfJarContaining(DependencyManagementPlugin.class))); if (this.kotlin) { classpath.add(new File(pathOfJarContaining("org.jetbrains.kotlin.cli.common.PropertiesKt"))); - classpath.add(new File(pathOfJarContaining(KotlinProject.class))); classpath.add(new File(pathOfJarContaining(KotlinToolingVersion.class))); classpath.add(new File(pathOfJarContaining("org.jetbrains.kotlin.build.report.metrics.BuildTime"))); classpath.add(new File(pathOfJarContaining("org.jetbrains.kotlin.buildtools.api.CompilationService"))); diff --git a/gradle.properties b/gradle.properties index 051b6c59ac6..3d7626ea293 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ jackson2Version=2.20.1 jacksonVersion=3.0.3 javaFormatVersion=0.0.47 junitJupiterVersion=6.0.1 -kotlinVersion=2.2.21 +kotlinVersion=2.3.0 mavenVersion=3.9.10 mockitoVersion=5.20.0 nativeBuildToolsVersion=0.11.3