Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.4.x'

Browse Source 
Closes gh-45646
This commit is contained in:
Andy Wilkinson
2025-05-23 09:30:05 +01:00
parent 685dabce01 492a4abd70
commit a9cc83dc8f
354 changed files with 899 additions and 488 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
buildSrc/src/main/java/org/springframework/boot/build/KotlinConventions.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2024 the original author or authors.
* Copyright 2012-2025 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.
@@ -22,6 +22,9 @@ import java.util.List;
import dev.adamko.dokkatoo.DokkatooExtension;
import dev.adamko.dokkatoo.formats.DokkatooHtmlPlugin;
import io.gitlab.arturbosch.detekt.Detekt;
import io.gitlab.arturbosch.detekt.DetektPlugin;
import io.gitlab.arturbosch.detekt.extensions.DetektExtension;
import org.gradle.api.Project;
import org.gradle.api.tasks.SourceSet;
import org.gradle.api.tasks.SourceSetContainer;
@@ -40,6 +43,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile;
* <li>Treat all warnings as errors
* <li>Suppress version warnings
* </ul>
* <li>Detekt plugin is applied to perform static analysis of Kotlin code
* </ul>
*
* <p/>
@@ -48,18 +52,23 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile;
*/
class KotlinConventions {
private static final String JVM_TARGET = "17";
private static final String KOTLIN_VERSION = "1.7";
void apply(Project project) {
project.getPlugins().withId("org.jetbrains.kotlin.jvm", (plugin) -> {
project.getTasks().withType(KotlinCompile.class, this::configure);
project.getPlugins().withType(DokkatooHtmlPlugin.class, (dokkatooPlugin) -> configureDokkatoo(project));
configureDetekt(project);
});
}
private void configure(KotlinCompile compile) {
KotlinJvmOptions kotlinOptions = compile.getKotlinOptions();
kotlinOptions.setApiVersion("1.7");
kotlinOptions.setLanguageVersion("1.7");
kotlinOptions.setJvmTarget("17");
kotlinOptions.setApiVersion(KOTLIN_VERSION);
kotlinOptions.setLanguageVersion(KOTLIN_VERSION);
kotlinOptions.setJvmTarget(JVM_TARGET);
kotlinOptions.setAllWarningsAsErrors(true);
List<String> freeCompilerArgs = new ArrayList<>(kotlinOptions.getFreeCompilerArgs());
freeCompilerArgs.add("-Xsuppress-version-warnings");
@@ -91,4 +100,11 @@ class KotlinConventions {
});
}
private void configureDetekt(Project project) {
project.getPlugins().apply(DetektPlugin.class);
DetektExtension detekt = project.getExtensions().getByType(DetektExtension.class);
detekt.getConfig().setFrom(project.getRootProject().file("src/detekt/config.yml"));
project.getTasks().withType(Detekt.class).configureEach((task) -> task.setJvmTarget(JVM_TARGET));
}
}