Skip to content

Commit 16718f6

Browse files
committed
Upgrade to Detekt 2.0.0-alpha.0
We need to upgrade for better compatibility with Java 25. See gh-47413
1 parent c1924f2 commit 16718f6

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

buildSrc/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ dependencies {
5252
implementation("commons-codec:commons-codec:${commonsCodecVersion}")
5353
implementation("de.undercouch.download:de.undercouch.download.gradle.plugin:5.5.0")
5454
implementation("dev.adamko.dokkatoo:dokkatoo-plugin:2.3.1")
55-
implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.8")
55+
implementation("dev.detekt:detekt-gradle-plugin:2.0.0-alpha.0")
5656
implementation("io.spring.gradle.antora:spring-antora-plugin:0.0.1")
5757
implementation("io.spring.javaformat:spring-javaformat-gradle-plugin:${javaFormatVersion}")
5858
implementation("io.spring.nohttp:nohttp-gradle:0.0.11")

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
import dev.adamko.dokkatoo.DokkatooExtension;
2222
import dev.adamko.dokkatoo.formats.DokkatooHtmlPlugin;
23-
import io.gitlab.arturbosch.detekt.Detekt;
24-
import io.gitlab.arturbosch.detekt.DetektPlugin;
25-
import io.gitlab.arturbosch.detekt.extensions.DetektExtension;
23+
import dev.detekt.gradle.Detekt;
24+
import dev.detekt.gradle.extensions.DetektExtension;
25+
import dev.detekt.gradle.plugin.DetektPlugin;
2626
import org.gradle.api.Project;
2727
import org.gradle.api.tasks.SourceSet;
2828
import org.gradle.api.tasks.SourceSetContainer;
@@ -103,7 +103,9 @@ private void configureDetekt(Project project) {
103103
project.getPlugins().apply(DetektPlugin.class);
104104
DetektExtension detekt = project.getExtensions().getByType(DetektExtension.class);
105105
detekt.getConfig().setFrom(project.getRootProject().file("config/detekt/config.yml"));
106-
project.getTasks().withType(Detekt.class).configureEach((task) -> task.setJvmTarget(JVM_TARGET.getTarget()));
106+
project.getTasks()
107+
.withType(Detekt.class)
108+
.configureEach((task) -> task.getJvmTarget().set(JVM_TARGET.getTarget()));
107109
}
108110

109111
}

config/detekt/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ style:
1919
active: true
2020
NewLineAtEndOfFile:
2121
active: true
22-
UnusedImports:
22+
UnusedImport:
2323
active: true
2424
WildcardImport:
2525
active: true

0 commit comments

Comments
 (0)