Skip to content

Commit e684f47

Browse files
committed
Fix JPMS verification task for K2
The task for verification of Kotlin sources for JPMS problems tries to replicate the setup of the default Kotlin/JVM compilation task. The change here introduces copying of `K2MultiplatformCompilationTask.multiplatformStructure` to set up compilation arguments properly within K2. #KT-61952 Fixed
1 parent a675cb3 commit e684f47

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

buildSrc/src/main/kotlin/Java9Modularity.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import org.gradle.jvm.toolchain.*
1212
import org.gradle.kotlin.dsl.*
1313
import org.gradle.language.base.plugins.LifecycleBasePlugin.*
1414
import org.gradle.process.*
15+
import org.jetbrains.kotlin.gradle.*
1516
import org.jetbrains.kotlin.gradle.dsl.*
1617
import org.jetbrains.kotlin.gradle.plugin.*
1718
import org.jetbrains.kotlin.gradle.plugin.mpp.*
@@ -150,6 +151,11 @@ object Java9Modularity {
150151
// part of work-around for https://youtrack.jetbrains.com/issue/KT-60541
151152
@Suppress("INVISIBLE_MEMBER")
152153
commonSourceSet.from(compileTask.commonSourceSet)
154+
@OptIn(InternalKotlinGradlePluginApi::class)
155+
apply {
156+
multiplatformStructure.refinesEdges.set(compileTask.multiplatformStructure.refinesEdges)
157+
multiplatformStructure.fragments.set(compileTask.multiplatformStructure.fragments)
158+
}
153159
// part of work-around for https://youtrack.jetbrains.com/issue/KT-60541
154160
// and work-around for https://youtrack.jetbrains.com/issue/KT-60582
155161
incremental = false

0 commit comments

Comments
 (0)