Skip to content

Commit

Permalink
Stop building and publishing compatibility MPP metadata variant (#3809)
Browse files Browse the repository at this point in the history
Also, remove flag `kotlin.mpp.enableGranularSourceSetsMetadata` that has no effect anymore
  • Loading branch information
ilya-g authored Jul 18, 2023
1 parent 38909c7 commit 5c4a252
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 7 deletions.
6 changes: 1 addition & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -278,7 +274,7 @@ configure(subprojects.findAll { !unpublished.contains(it.name) }) {

List<String> 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"]
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion kotlinx-coroutines-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 5c4a252

Please sign in to comment.