Skip to content

Commit 5c1c0a2

Browse files
committed
Upgrade to Kotlin 1.8.20
Closes gh-34879
1 parent 6876556 commit 5c1c0a2

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ org.gradle.caching=true
44
org.gradle.parallel=true
55
org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
66

7-
kotlinVersion=1.8.10
7+
kotlinVersion=1.8.20
88
tomcatVersion=10.1.7
99
nativeBuildToolsVersion=0.9.20
1010

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ void taskConfigurationIsAvoided() throws IOException {
8383
assertThat(configured).containsExactly("help");
8484
}
8585
else {
86-
assertThat(configured).containsExactlyInAnyOrder("help", "clean", "compileKotlin", "compileTestKotlin");
86+
assertThat(configured).containsExactlyInAnyOrder("help", "clean");
8787
}
8888
}
8989

spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleBuild.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@
4949
import org.gradle.util.GradleVersion;
5050
import org.jetbrains.kotlin.gradle.model.KotlinProject;
5151
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerPluginSupportPlugin;
52-
import org.jetbrains.kotlin.gradle.plugin.KotlinPlugin;
52+
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformJvmPlugin;
5353
import org.jetbrains.kotlin.project.model.LanguageSettings;
54+
import org.jetbrains.kotlin.tooling.core.KotlinToolingVersion;
5455
import org.tomlj.Toml;
5556

5657
import org.springframework.asm.ClassVisitor;
@@ -118,7 +119,9 @@ private List<File> pluginClasspath() {
118119
new File(pathOfJarContaining(DependencyManagementPlugin.class)),
119120
new File(pathOfJarContaining("org.jetbrains.kotlin.cli.common.PropertiesKt")),
120121
new File(pathOfJarContaining("org.jetbrains.kotlin.compilerRunner.KotlinLogger")),
121-
new File(pathOfJarContaining(KotlinPlugin.class)), new File(pathOfJarContaining(KotlinProject.class)),
122+
new File(pathOfJarContaining(KotlinPlatformJvmPlugin.class)),
123+
new File(pathOfJarContaining(KotlinProject.class)),
124+
new File(pathOfJarContaining(KotlinToolingVersion.class)),
122125
new File(pathOfJarContaining("org.jetbrains.kotlin.daemon.client.KotlinCompilerClient")),
123126
new File(pathOfJarContaining(KotlinCompilerPluginSupportPlugin.class)),
124127
new File(pathOfJarContaining(LanguageSettings.class)),

0 commit comments

Comments
 (0)