Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use the correct source directory set on JVM #5163

Merged
merged 7 commits into from Oct 6, 2022
Merged

Use the correct source directory set on JVM #5163

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e959b22
Reuse SourceSet.kotlin
Goooler Aug 1, 2022
bd745db
Avoid NPEs in Kotlin 1.7.20
Goooler Aug 1, 2022
6557141
Inline
Goooler Aug 1, 2022
4533389
Cleanup
Goooler Aug 1, 2022
f40cc31
Use the correct source directory set for KGP
Goooler Aug 30, 2022
dde117a
Merge branch 'main' into fixKotlin1720
Goooler Aug 30, 2022
172d579
Merge branch 'main' into fixKotlin1720
Goooler Sep 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/DetektJvm.kt
View file
Open in desktop
Expand Up @@ -2,15 +2,19 @@ package io.gitlab.arturbosch.detekt.internal

import io.gitlab.arturbosch.detekt.DetektPlugin
import io.gitlab.arturbosch.detekt.extensions.DetektExtension
import org.gradle.api.GradleException
import org.gradle.api.Project
import org.gradle.api.file.FileCollection
import org.gradle.api.file.SourceDirectorySet
import org.gradle.api.internal.HasConvention
import org.gradle.api.plugins.JavaPluginConvention
import org.gradle.api.tasks.SourceSet
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet

internal class DetektJvm(private val project: Project) {
private val SourceSet.kotlin: SourceDirectorySet
cortinico marked this conversation as resolved.
Show resolved Hide resolved
get() = ((this as HasConvention).convention.plugins["kotlin"] as? KotlinSourceSet)?.kotlin
?: project.objects.sourceDirectorySet("empty", "Empty kotlin source set")

fun registerTasks(extension: DetektExtension) {
project.convention.getPlugin(JavaPluginConvention::class.java).sourceSets.all { sourceSet ->
project.registerJvmDetektTask(extension, sourceSet)
Expand All @@ -19,10 +23,8 @@ internal class DetektJvm(private val project: Project) {
}

private fun Project.registerJvmDetektTask(extension: DetektExtension, sourceSet: SourceSet) {
val kotlinSourceSet = (sourceSet as HasConvention).convention.plugins["kotlin"] as? KotlinSourceSet
?: throw GradleException("Kotlin source set not found. Please report on detekt's issue tracker")
registerDetektTask(DetektPlugin.DETEKT_TASK_NAME + sourceSet.name.capitalize(), extension) {
source = kotlinSourceSet.kotlin
source = sourceSet.kotlin
classpath.setFrom(sourceSet.compileClasspath.existingFiles(), sourceSet.output.classesDirs.existingFiles())
// If a baseline file is configured as input file, it must exist to be configured, otherwise the task fails.
// We try to find the configured baseline or alternatively a specific variant matching this task.
Expand All @@ -35,10 +37,8 @@ internal class DetektJvm(private val project: Project) {
}

private fun Project.registerJvmCreateBaselineTask(extension: DetektExtension, sourceSet: SourceSet) {
val kotlinSourceSet = (sourceSet as HasConvention).convention.plugins["kotlin"] as? KotlinSourceSet
?: throw GradleException("Kotlin source set not found. Please report on detekt's issue tracker")
registerCreateBaselineTask(DetektPlugin.BASELINE_TASK_NAME + sourceSet.name.capitalize(), extension) {
source = kotlinSourceSet.kotlin
source = sourceSet.kotlin
classpath.setFrom(sourceSet.compileClasspath.existingFiles(), sourceSet.output.classesDirs.existingFiles())
val variantBaselineFile = extension.baseline?.addVariantName(sourceSet.name)
baseline.set(project.layout.file(project.provider { variantBaselineFile }))
Expand Down