From ff9d4799aaa773211da7e40c1f4946557378b585 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Mon, 27 Feb 2023 19:41:32 +0100 Subject: [PATCH] [Gradle] KotlinCompilationK2MultiplatformConfigurator: Only configure when K2 is used ^KT-56210 Verification Pending --- .../KotlinCompilationK2MultiplatformConfigurator.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationK2MultiplatformConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationK2MultiplatformConfigurator.kt index ec7e456a3a4..73cf1be2f55 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationK2MultiplatformConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationK2MultiplatformConfigurator.kt @@ -5,6 +5,7 @@ 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.tasks.K2MultiplatformCompilationTask import org.jetbrains.kotlin.gradle.tasks.K2MultiplatformStructure @@ -16,6 +17,7 @@ internal object KotlinCompilationK2MultiplatformConfigurator : KotlinCompilation if (compileTask !is K2MultiplatformCompilationTask) return@configureEach compileTask.multiplatformStructure.refinesEdges.set(compilation.project.provider { + if (!compileTask.compilerOptions.usesK2.get()) return@provider emptyList() compilation.allKotlinSourceSets.flatMap { sourceSet -> sourceSet.dependsOn.map { dependsOn -> K2MultiplatformStructure.RefinesEdge(sourceSet.name, dependsOn.name) @@ -24,6 +26,7 @@ internal object KotlinCompilationK2MultiplatformConfigurator : KotlinCompilation }) compileTask.multiplatformStructure.fragments.set(compilation.project.provider { + if (!compileTask.compilerOptions.usesK2.get()) return@provider emptyList() compilation.allKotlinSourceSets.map { sourceSet -> K2MultiplatformStructure.Fragment(sourceSet.name, sourceSet.kotlin.asFileTree) }