root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Upgrade to Detekt 2.0.0-alpha.0 

We need to upgrade for better compatibility with Java 25.

See gh-47413
This commit is contained in:
Andy Wilkinson 2025-10-06 19:28:12 +01:00
parent c1924f2fcd
commit 16718f676d
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/build.gradle
View File

@ -52,7 +52,7 @@ dependencies {
implementation("commons-codec:commons-codec:${commonsCodecVersion}") implementation("commons-codec:commons-codec:${commonsCodecVersion}")
implementation("de.undercouch.download:de.undercouch.download.gradle.plugin:5.5.0") implementation("de.undercouch.download:de.undercouch.download.gradle.plugin:5.5.0")
implementation("dev.adamko.dokkatoo:dokkatoo-plugin:2.3.1") implementation("dev.adamko.dokkatoo:dokkatoo-plugin:2.3.1")
implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.8") implementation("dev.detekt:detekt-gradle-plugin:2.0.0-alpha.0")
implementation("io.spring.gradle.antora:spring-antora-plugin:0.0.1") implementation("io.spring.gradle.antora:spring-antora-plugin:0.0.1")
implementation("io.spring.javaformat:spring-javaformat-gradle-plugin:${javaFormatVersion}") implementation("io.spring.javaformat:spring-javaformat-gradle-plugin:${javaFormatVersion}")
implementation("io.spring.nohttp:nohttp-gradle:0.0.11") implementation("io.spring.nohttp:nohttp-gradle:0.0.11")

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

@ -20,9 +20,9 @@ import java.net.URI;
import dev.adamko.dokkatoo.DokkatooExtension; import dev.adamko.dokkatoo.DokkatooExtension;
import dev.adamko.dokkatoo.formats.DokkatooHtmlPlugin; import dev.adamko.dokkatoo.formats.DokkatooHtmlPlugin;
import io.gitlab.arturbosch.detekt.Detekt; import dev.detekt.gradle.Detekt;
import io.gitlab.arturbosch.detekt.DetektPlugin; import dev.detekt.gradle.extensions.DetektExtension;
import io.gitlab.arturbosch.detekt.extensions.DetektExtension; import dev.detekt.gradle.plugin.DetektPlugin;
import org.gradle.api.Project; import org.gradle.api.Project;
import org.gradle.api.tasks.SourceSet; import org.gradle.api.tasks.SourceSet;
import org.gradle.api.tasks.SourceSetContainer; import org.gradle.api.tasks.SourceSetContainer;
@ -103,7 +103,9 @@ class KotlinConventions {
project.getPlugins().apply(DetektPlugin.class); project.getPlugins().apply(DetektPlugin.class);
DetektExtension detekt = project.getExtensions().getByType(DetektExtension.class); DetektExtension detekt = project.getExtensions().getByType(DetektExtension.class);
detekt.getConfig().setFrom(project.getRootProject().file("config/detekt/config.yml")); detekt.getConfig().setFrom(project.getRootProject().file("config/detekt/config.yml"));
project.getTasks().withType(Detekt.class).configureEach((task) -> task.setJvmTarget(JVM_TARGET.getTarget())); project.getTasks()
.withType(Detekt.class)
.configureEach((task) -> task.getJvmTarget().set(JVM_TARGET.getTarget()));
} }
} }

2
config/detekt/config.yml
View File

@ -19,7 +19,7 @@ style:
active: true active: true
NewLineAtEndOfFile: NewLineAtEndOfFile:
active: true active: true
UnusedImports: UnusedImport:
active: true active: true
WildcardImport: WildcardImport:
active: true active: true