From 8fe0c88ab1be670221f8b2e63bdc209fcd910fa2 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Mon, 24 Oct 2022 11:28:58 +0200 Subject: [PATCH] [Gradle][Minor] KotlinCompilationProjection: Inline .isMainCompilationDatas ^KT-54312 Verification Pending --- .../kotlin/gradle/plugin/KotlinCompilationProjection.kt | 4 ++-- .../mpp/pm20/GradleKpmVariantCompilationDataInternal.kt | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilationProjection.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilationProjection.kt index 5445010dcde..68ea5164fcb 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilationProjection.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilationProjection.kt @@ -13,8 +13,8 @@ import org.gradle.api.file.FileCollection import org.gradle.api.file.SourceDirectorySet import org.jetbrains.kotlin.gradle.plugin.mpp.internal import org.jetbrains.kotlin.gradle.plugin.mpp.isMain +import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmModule import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinCompilationData -import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.isMainCompilationData import org.jetbrains.kotlin.gradle.utils.filesProvider import org.jetbrains.kotlin.project.model.LanguageSettings @@ -124,7 +124,7 @@ internal sealed class KotlinCompilationProjection { get() = project.filesProvider { origin.friendPaths } override val isMain: Boolean - get() = origin.isMainCompilationData() + get() = origin.compilationPurpose == GradleKpmModule.MAIN_MODULE_NAME override val classesDirs: ConfigurableFileCollection get() = origin.output.classesDirs diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantCompilationDataInternal.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantCompilationDataInternal.kt index 68420b50062..1fdf27b8649 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantCompilationDataInternal.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantCompilationDataInternal.kt @@ -82,8 +82,3 @@ interface GradleKpmVariantCompilationDataInternal : Gra .mapNotNull { variantMatch -> variantMatch.chosenVariant as? GradleKpmVariant } } } - -fun KotlinCompilationData<*>.isMainCompilationData(): Boolean = when (this) { - is KotlinCompilation<*> -> isMain() - else -> compilationPurpose == GradleKpmModule.MAIN_MODULE_NAME -}