Skip to content

Commit

Permalink
Remove usage of MPP targets function for JVM-only projects (#5383)
Browse files Browse the repository at this point in the history
* Remove usage of MPP `targets` function for JVM-only projects

KotlinJvmProjectExtension is a KotlinSingleJavaTargetExtension and only
has a single target, so using the MPP `targets` function is unnecessary.

* Remove redundant deprecation suppression
  • Loading branch information
3flex committed Oct 7, 2022
1 parent 075db1f commit 7027c27
Showing 1 changed file with 6 additions and 11 deletions.
@@ -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

0 comments on commit 7027c27

Please sign in to comment.