spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.5.x' into 4.0.x

Browse Source 
Closes gh-49938
This commit is contained in:
Andy Wilkinson
2026-04-07 11:03:40 +01:00
parent c406d8d032 a988d65f5d
commit 5287ad0b17
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/java/org/springframework/boot/build/KotlinConventions.java
+16 -3
View File
@@ -17,6 +17,7 @@
package org.springframework.boot.build;
import java.net.URI;
import java.nio.file.Path;
import dev.detekt.gradle.Detekt;
import dev.detekt.gradle.extensions.DetektExtension;
@@ -106,9 +107,21 @@ 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.getJvmTarget().set(JVM_TARGET.getTarget()));
project.getTasks().withType(Detekt.class).configureEach((task) -> {
task.getJvmTarget().set(JVM_TARGET.getTarget());
normalizeMachineSpecificDefaults(project, task);
});
}
private void normalizeMachineSpecificDefaults(Project project, Detekt task) {
// See: https://github.com/detekt/detekt/issues/7170
task.getBasePath().set(pathRelativeToRootProject(task.getProject()).toString());
}
private static Path pathRelativeToRootProject(Project project) {
Path rootProjectDirectory = project.getIsolated().getRootProject().getProjectDirectory().getAsFile().toPath();
Path projectDirectory = project.getLayout().getProjectDirectory().getAsFile().toPath();
return projectDirectory.relativize(rootProjectDirectory);
}
}