Merge branch '2.7.x'

buildSrc/src/main/java/org/springframework/boot/build/KotlinConventions.java

@@ -31,6 +31,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile;
  * <li>{@link KotlinCompile} tasks are configured to:
  * <ul>
  * <li>Use {@code apiVersion} and {@code languageVersion} 1.3.
+ * <li>Use {@code jvmTarget} 1.8.
  * <li>Treat all warnings as errors
  * <li>Suppress version warnings
  * </ul>

spring-boot-project/spring-boot/build.gradle

@@ -178,18 +178,6 @@ sourceSets {
 	}
 }
 
-compileKotlin {
-	kotlinOptions {
-		jvmTarget = 1.8
-	}
-}
-
-compileTestKotlin {
-	kotlinOptions {
-		jvmTarget = 1.8
-	}
-}
-
 test {
 	jvmArgs += "--add-opens=java.base/java.net=ALL-UNNAMED"
 }

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webflux-coroutines/build.gradle

@@ -6,18 +6,6 @@ plugins {
 
 description = "Spring Boot WebFlux coroutines smoke test"
 
-compileKotlin {
-	kotlinOptions {
-		jvmTarget = "1.8"
-	}
-}
-
-compileTestKotlin {
-	kotlinOptions {
-		jvmTarget = "1.8"
-	}
-}
-
 dependencies {
 	implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-webflux"))
 	implementation("com.fasterxml.jackson.module:jackson-module-kotlin")