From 7027c27c9df516b5c6de009d0bed94883176f552 Mon Sep 17 00:00:00 2001 From: Matthew Haughton <3flex@users.noreply.github.com> Date: Fri, 7 Oct 2022 11:19:49 +1100 Subject: [PATCH] Remove usage of MPP targets function for JVM-only projects (#5383) * 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 --- .../arturbosch/detekt/internal/DetektJvm.kt | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/DetektJvm.kt b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/DetektJvm.kt index aa216a8beaa..3b2623bbcd2 100644 --- a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/DetektJvm.kt +++ b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/DetektJvm.kt @@ -1,5 +1,3 @@ -@file:Suppress("DEPRECATION") - package io.gitlab.arturbosch.detekt.internal import io.gitlab.arturbosch.detekt.DetektPlugin @@ -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) } }