From 5c4a252aad163e416fdb5bab22e1971ae783dedf Mon Sep 17 00:00:00 2001 From: ilya-g Date: Tue, 18 Jul 2023 18:31:17 +0200 Subject: [PATCH] Stop building and publishing compatibility MPP metadata variant (#3809) Also, remove flag `kotlin.mpp.enableGranularSourceSetsMetadata` that has no effect anymore --- build.gradle | 6 +----- gradle.properties | 1 - kotlinx-coroutines-core/build.gradle | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 84d777018e..e7d405e124 100644 --- a/build.gradle +++ b/build.gradle @@ -75,10 +75,6 @@ buildscript { CacheRedirector.configureBuildScript(buildscript, rootProject) } -// todo:KLUDGE: Hierarchical project structures are not fully supported in IDEA, enable only for a regular built -if (!Idea.active) { - ext.set("kotlin.mpp.enableGranularSourceSetsMetadata", "true") -} // todo:KLUDGE: This is needed to workaround dependency resolution between Java and MPP modules def configureKotlinJvmPlatform(configuration) { @@ -278,7 +274,7 @@ configure(subprojects.findAll { !unpublished.contains(it.name) }) { List jarTasks if (isMultiplatform(it)) { - jarTasks = ["jvmJar", "metadataJar"] + jarTasks = ["jvmJar"] } else if (it.name == "kotlinx-coroutines-debug") { // We shadow debug module instead of just packaging it jarTasks = ["shadowJar"] diff --git a/gradle.properties b/gradle.properties index 9e6dc02320..d558080072 100644 --- a/gradle.properties +++ b/gradle.properties @@ -53,7 +53,6 @@ kotlin.native.ignoreDisabledTargets=true # TODO: Remove once KT-37187 is fixed org.gradle.jvmargs=-Xmx3g -kotlin.mpp.enableCompatibilityMetadataVariant=true kotlin.mpp.stability.nowarn=true kotlinx.atomicfu.enableJvmIrTransformation=true # When the flag below is set to `true`, AtomicFU cannot process diff --git a/kotlinx-coroutines-core/build.gradle b/kotlinx-coroutines-core/build.gradle index 272fb080ff..6b0d6c2c09 100644 --- a/kotlinx-coroutines-core/build.gradle +++ b/kotlinx-coroutines-core/build.gradle @@ -273,7 +273,7 @@ jvmJar { setupManifest(it) } * kotlinx-coroutines-core-jvm, but our resolving machinery guarantees that * any JVM project that depends on -core artifact also depends on -core-jvm one. */ -metadataJar { setupManifest(it) } +allMetadataJar { setupManifest(it) } static def setupManifest(Jar jar) { jar.manifest {