diff options
| author | Alexander.Likhachev <Alexander.Likhachev@jetbrains.com> | 2023-10-13 18:30:15 +0200 |
|---|---|---|
| committer | Alexander Likhachev <ALikhachev@users.noreply.github.com> | 2023-10-13 19:25:38 +0200 |
| commit | e684f47f888ad400e8c6df9145eeaa790a00d4bb (patch) | |
| tree | 63515bf69f0c57b6817b680bd01fa86b7f8b42f6 | |
| parent | a675cb3f3d7ae1d49243f36c99e5a18ba3cf1bd5 (diff) | |
| download | kotlinx.serialization-e684f47f888ad400e8c6df9145eeaa790a00d4bb.tar.gz | |
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
| -rw-r--r-- | buildSrc/src/main/kotlin/Java9Modularity.kt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/buildSrc/src/main/kotlin/Java9Modularity.kt b/buildSrc/src/main/kotlin/Java9Modularity.kt index 161b90db..57ebe4d1 100644 --- a/buildSrc/src/main/kotlin/Java9Modularity.kt +++ b/buildSrc/src/main/kotlin/Java9Modularity.kt @@ -12,6 +12,7 @@ import org.gradle.jvm.toolchain.* import org.gradle.kotlin.dsl.* import org.gradle.language.base.plugins.LifecycleBasePlugin.* import org.gradle.process.* +import org.jetbrains.kotlin.gradle.* import org.jetbrains.kotlin.gradle.dsl.* import org.jetbrains.kotlin.gradle.plugin.* import org.jetbrains.kotlin.gradle.plugin.mpp.* @@ -150,6 +151,11 @@ object Java9Modularity { // part of work-around for https://youtrack.jetbrains.com/issue/KT-60541 @Suppress("INVISIBLE_MEMBER") commonSourceSet.from(compileTask.commonSourceSet) + @OptIn(InternalKotlinGradlePluginApi::class) + apply { + multiplatformStructure.refinesEdges.set(compileTask.multiplatformStructure.refinesEdges) + multiplatformStructure.fragments.set(compileTask.multiplatformStructure.fragments) + } // part of work-around for https://youtrack.jetbrains.com/issue/KT-60541 // and work-around for https://youtrack.jetbrains.com/issue/KT-60582 incremental = false |