From 5c1c0a2b2e40fd78eb218a4180e8add1a4871729 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 6 Apr 2023 13:25:26 +0200 Subject: [PATCH] Upgrade to Kotlin 1.8.20 Closes gh-34879 --- gradle.properties | 2 +- .../gradle/plugin/KotlinPluginActionIntegrationTests.java | 2 +- .../boot/testsupport/gradle/testkit/GradleBuild.java | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8b61614f9b0..837c3711e99 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.caching=true org.gradle.parallel=true org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 -kotlinVersion=1.8.10 +kotlinVersion=1.8.20 tomcatVersion=10.1.7 nativeBuildToolsVersion=0.9.20 diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java index cdab2b2925f..4323d8ba2a0 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java @@ -83,7 +83,7 @@ class KotlinPluginActionIntegrationTests { assertThat(configured).containsExactly("help"); } else { - assertThat(configured).containsExactlyInAnyOrder("help", "clean", "compileKotlin", "compileTestKotlin"); + assertThat(configured).containsExactlyInAnyOrder("help", "clean"); } } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleBuild.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleBuild.java index 3707237f158..70602933734 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleBuild.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleBuild.java @@ -49,8 +49,9 @@ import org.gradle.testkit.runner.GradleRunner; import org.gradle.util.GradleVersion; import org.jetbrains.kotlin.gradle.model.KotlinProject; import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerPluginSupportPlugin; -import org.jetbrains.kotlin.gradle.plugin.KotlinPlugin; +import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformJvmPlugin; import org.jetbrains.kotlin.project.model.LanguageSettings; +import org.jetbrains.kotlin.tooling.core.KotlinToolingVersion; import org.tomlj.Toml; import org.springframework.asm.ClassVisitor; @@ -118,7 +119,9 @@ public class GradleBuild { new File(pathOfJarContaining(DependencyManagementPlugin.class)), new File(pathOfJarContaining("org.jetbrains.kotlin.cli.common.PropertiesKt")), new File(pathOfJarContaining("org.jetbrains.kotlin.compilerRunner.KotlinLogger")), - new File(pathOfJarContaining(KotlinPlugin.class)), new File(pathOfJarContaining(KotlinProject.class)), + new File(pathOfJarContaining(KotlinPlatformJvmPlugin.class)), + new File(pathOfJarContaining(KotlinProject.class)), + new File(pathOfJarContaining(KotlinToolingVersion.class)), new File(pathOfJarContaining("org.jetbrains.kotlin.daemon.client.KotlinCompilerClient")), new File(pathOfJarContaining(KotlinCompilerPluginSupportPlugin.class)), new File(pathOfJarContaining(LanguageSettings.class)),