Merge branch '2.3.x' into 2.4.x

Closes gh-25899

buildSrc/build.gradle

@@ -21,6 +21,8 @@ dependencies {
 	implementation("org.asciidoctor:asciidoctor-gradle-jvm:3.0.0")
 	implementation("org.asciidoctor:asciidoctor-gradle-jvm-pdf:3.0.0")
 	implementation("org.gradle:test-retry-gradle-plugin:1.1.9")
+	implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31")
+	implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.31")
 	implementation("org.springframework:spring-core:5.2.2.RELEASE")
 	implementation("org.springframework:spring-web:5.2.2.RELEASE")
 	implementation("io.spring.javaformat:spring-javaformat-gradle-plugin:${javaFormatVersion}")

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

@@ -46,6 +46,7 @@ public class ConventionsPlugin implements Plugin<Project> {
 		new JavaConventions().apply(project);
 		new MavenPublishingConventions().apply(project);
 		new AsciidoctorConventions().apply(project);
+		new KotlinConventions().apply(project);
 	}
 
 }

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

+/*
+ * Copyright 2012-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.build;
+
+import org.gradle.api.Project;
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions;
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile;
+
+/**
+ * Conventions that are applied in the presence of the {@code org.jetbrains.kotlin.jvm}
+ * plugin. When the plugin is applied:
+ *
+ * <ul>
+ * <li>{@link KotlinCompile} tasks are configured to use {@code apiVersion} and
+ * {@code languageVersion} 1.3.
+ * </ul>
+ *
+ * <p/>
+ *
+ * @author Andy Wilkinson
+ */
+class KotlinConventions {
+
+	void apply(Project project) {
+		project.getPlugins().withId("org.jetbrains.kotlin.jvm", (plugin) -> {
+			project.getTasks().withType(KotlinCompile.class, (compile) -> {
+				KotlinJvmOptions kotlinOptions = compile.getKotlinOptions();
+				kotlinOptions.setApiVersion("1.3");
+				kotlinOptions.setLanguageVersion("1.3");
+			});
+		});
+	}
+
+}