From dfbd82b8382cd63754c6ad2ea525ad40186fb952 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 24 Jun 2021 14:05:36 -0700 Subject: [PATCH] Fix Kotlin 1.5.20 classpath issues See gh-27086 --- .../org/springframework/boot/gradle/testkit/GradleBuild.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java index 629b0fe3f3..d2f3a7be46 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java @@ -50,6 +50,7 @@ import org.jetbrains.kotlin.daemon.client.KotlinCompilerClient; 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.project.model.LanguageSettings; import org.tomlj.Toml; import org.springframework.asm.ClassVisitor; @@ -113,6 +114,7 @@ public class GradleBuild { new File(pathOfJarContaining(KotlinPlugin.class)), new File(pathOfJarContaining(KotlinProject.class)), new File(pathOfJarContaining(KotlinCompilerClient.class)), new File(pathOfJarContaining(KotlinCompilerPluginSupportPlugin.class)), + new File(pathOfJarContaining(LanguageSettings.class)), new File(pathOfJarContaining(ArchiveEntry.class)), new File(pathOfJarContaining(BuildRequest.class)), new File(pathOfJarContaining(HttpClientConnectionManager.class)), new File(pathOfJarContaining(HttpRequest.class)), new File(pathOfJarContaining(Module.class)),