From 16718f676d7068b32266dba2cad0334348594f45 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <andy.wilkinson@broadcom.com>
Date: Mon, 6 Oct 2025 19:28:12 +0100
Subject: [PATCH] Upgrade to Detekt 2.0.0-alpha.0

We need to upgrade for better compatibility with Java 25.

See gh-47413
---
 buildSrc/build.gradle                                  |  2 +-
 .../springframework/boot/build/KotlinConventions.java  | 10 ++++++----
 config/detekt/config.yml                               |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index a31f0b0f1d0..b789eedec2d 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -52,7 +52,7 @@ dependencies {
 	implementation("commons-codec:commons-codec:${commonsCodecVersion}")
 	implementation("de.undercouch.download:de.undercouch.download.gradle.plugin:5.5.0")
 	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.javaformat:spring-javaformat-gradle-plugin:${javaFormatVersion}")
 	implementation("io.spring.nohttp:nohttp-gradle:0.0.11")
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/KotlinConventions.java b/buildSrc/src/main/java/org/springframework/boot/build/KotlinConventions.java
index 92bd0c96d1a..3f66b84a966 100644
--- a/buildSrc/src/main/java/org/springframework/boot/build/KotlinConventions.java
+++ b/buildSrc/src/main/java/org/springframework/boot/build/KotlinConventions.java
@@ -20,9 +20,9 @@ import java.net.URI;
 
 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 dev.detekt.gradle.Detekt;
+import dev.detekt.gradle.extensions.DetektExtension;
+import dev.detekt.gradle.plugin.DetektPlugin;
 import org.gradle.api.Project;
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.SourceSetContainer;
@@ -103,7 +103,9 @@ class KotlinConventions {
 		project.getPlugins().apply(DetektPlugin.class);
 		DetektExtension detekt = project.getExtensions().getByType(DetektExtension.class);
 		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()));
 	}
 
 }
diff --git a/config/detekt/config.yml b/config/detekt/config.yml
index 3cf66966fff..f33ff0ab9cb 100644
--- a/config/detekt/config.yml
+++ b/config/detekt/config.yml
@@ -19,7 +19,7 @@ style:
     active: true
   NewLineAtEndOfFile:
     active: true
-  UnusedImports:
+  UnusedImport:
     active: true
   WildcardImport:
     active: true