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

Remove usage of MPP targets function for JVM-only projects #5383

Merged
merged 2 commits into from Oct 7, 2022
Merged

Remove usage of MPP targets function for JVM-only projects #5383

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d3a9f7
Remove usage of MPP `targets` function for JVM-only projects
3flex Oct 6, 2022
6801514
Remove redundant deprecation suppression
3flex Oct 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
17 changes: 6 additions & 11 deletions detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/DetektJvm.kt
View file
Open in desktop
@@ -1,5 +1,3 @@
@file:Suppress("DEPRECATION")

package io.gitlab.arturbosch.detekt.internal

import io.gitlab.arturbosch.detekt.DetektPlugin
Expand All @@ -9,18 +7,15 @@ import org.gradle.api.file.FileCollection
import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.targets

internal class DetektJvm(private val project: Project) {
fun registerTasks(extension: DetektExtension) {
project.extensions.getByType(KotlinJvmProjectExtension::class.java).targets.forEach { target ->
target.compilations.all { compilation ->
val inputSource = compilation.kotlinSourceSets
.map { it.kotlin.sourceDirectories }
.fold(project.files() as FileCollection) { collection, next -> collection.plus(next) }
project.registerJvmDetektTask(compilation, extension, inputSource)
project.registerJvmCreateBaselineTask(compilation, extension, inputSource)
}
project.extensions.getByType(KotlinJvmProjectExtension::class.java).target.compilations.all { compilation ->
val inputSource = compilation.kotlinSourceSets
.map { it.kotlin.sourceDirectories }
.fold(project.files() as FileCollection) { collection, next -> collection.plus(next) }
project.registerJvmDetektTask(compilation, extension, inputSource)
project.registerJvmCreateBaselineTask(compilation, extension, inputSource)
}
}

Expand Down