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

[Gradle] KotlinCompilationK2MultiplatformConfigurator: Only configure when K2 is used

Browse Source 
^KT-56210 Verification Pending
This commit is contained in:
Sebastian Sellmair
2023-02-27 19:41:32 +01:00
committed by Space Team
parent 896d1ce267
commit ff9d4799aa
1 changed files with 3 additions and 0 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/mpp/compilationImpl/KotlinCompilationK2MultiplatformConfigurator.kt
+3
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl package org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl
import org.jetbrains.kotlin.gradle.dsl.usesK2
import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.KotlinCompilationImplFactory import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.KotlinCompilationImplFactory
import org.jetbrains.kotlin.gradle.tasks.K2MultiplatformCompilationTask import org.jetbrains.kotlin.gradle.tasks.K2MultiplatformCompilationTask
import org.jetbrains.kotlin.gradle.tasks.K2MultiplatformStructure import org.jetbrains.kotlin.gradle.tasks.K2MultiplatformStructure
@@ -16,6 +17,7 @@ internal object KotlinCompilationK2MultiplatformConfigurator : KotlinCompilation
if (compileTask !is K2MultiplatformCompilationTask) return@configureEach if (compileTask !is K2MultiplatformCompilationTask) return@configureEach
compileTask.multiplatformStructure.refinesEdges.set(compilation.project.provider { compileTask.multiplatformStructure.refinesEdges.set(compilation.project.provider {
if (!compileTask.compilerOptions.usesK2.get()) return@provider emptyList()
compilation.allKotlinSourceSets.flatMap { sourceSet -> compilation.allKotlinSourceSets.flatMap { sourceSet ->
sourceSet.dependsOn.map { dependsOn -> sourceSet.dependsOn.map { dependsOn ->
K2MultiplatformStructure.RefinesEdge(sourceSet.name, dependsOn.name) K2MultiplatformStructure.RefinesEdge(sourceSet.name, dependsOn.name)
@@ -24,6 +26,7 @@ internal object KotlinCompilationK2MultiplatformConfigurator : KotlinCompilation
}) })
compileTask.multiplatformStructure.fragments.set(compilation.project.provider { compileTask.multiplatformStructure.fragments.set(compilation.project.provider {
if (!compileTask.compilerOptions.usesK2.get()) return@provider emptyList()
compilation.allKotlinSourceSets.map { sourceSet -> compilation.allKotlinSourceSets.map { sourceSet ->
K2MultiplatformStructure.Fragment(sourceSet.name, sourceSet.kotlin.asFileTree) K2MultiplatformStructure.Fragment(sourceSet.name, sourceSet.kotlin.asFileTree)
} }