azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle][Minor] KotlinCompilationProjection: Inline .isMainCompilationDatas

Browse Source 
^KT-54312 Verification Pending
This commit is contained in:
Sebastian Sellmair
2022-10-24 11:28:58 +02:00
committed by Space Team
parent cf55af55d6
commit 8fe0c88ab1
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilationProjection.kt
+2 -2
View File
@@ -13,8 +13,8 @@ import org.gradle.api.file.FileCollection
import org.gradle.api.file.SourceDirectorySet import org.gradle.api.file.SourceDirectorySet
import org.jetbrains.kotlin.gradle.plugin.mpp.internal import org.jetbrains.kotlin.gradle.plugin.mpp.internal
import org.jetbrains.kotlin.gradle.plugin.mpp.isMain 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.KotlinCompilationData
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.isMainCompilationData
import org.jetbrains.kotlin.gradle.utils.filesProvider import org.jetbrains.kotlin.gradle.utils.filesProvider
import org.jetbrains.kotlin.project.model.LanguageSettings import org.jetbrains.kotlin.project.model.LanguageSettings
@@ -124,7 +124,7 @@ internal sealed class KotlinCompilationProjection {
get() = project.filesProvider { origin.friendPaths } get() = project.filesProvider { origin.friendPaths }
override val isMain: Boolean override val isMain: Boolean
get() = origin.isMainCompilationData() get() = origin.compilationPurpose == GradleKpmModule.MAIN_MODULE_NAME
override val classesDirs: ConfigurableFileCollection override val classesDirs: ConfigurableFileCollection
get() = origin.output.classesDirs get() = origin.output.classesDirs
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmVariantCompilationDataInternal.kt
-5
View File
@@ -82,8 +82,3 @@ interface GradleKpmVariantCompilationDataInternal<T : KotlinCommonOptions> : Gra
.mapNotNull { variantMatch -> variantMatch.chosenVariant as? GradleKpmVariant } .mapNotNull { variantMatch -> variantMatch.chosenVariant as? GradleKpmVariant }
} }
} }
fun KotlinCompilationData<*>.isMainCompilationData(): Boolean = when (this) {
is KotlinCompilation<*> -> isMain()
else -> compilationPurpose == GradleKpmModule.MAIN_MODULE_NAME
}