File tree Expand file tree Collapse file tree 3 files changed +2
-7
lines changed Expand file tree Collapse file tree 3 files changed +2
-7
lines changed Original file line number Diff line number Diff line change @@ -75,10 +75,6 @@ buildscript {
7575
7676 CacheRedirector . configureBuildScript(buildscript, rootProject)
7777}
78- // todo:KLUDGE: Hierarchical project structures are not fully supported in IDEA, enable only for a regular built
79- if (! Idea . active) {
80- ext. set(" kotlin.mpp.enableGranularSourceSetsMetadata" , " true" )
81- }
8278
8379// todo:KLUDGE: This is needed to workaround dependency resolution between Java and MPP modules
8480def configureKotlinJvmPlatform (configuration ) {
@@ -278,7 +274,7 @@ configure(subprojects.findAll { !unpublished.contains(it.name) }) {
278274
279275 List<String > jarTasks
280276 if (isMultiplatform(it)) {
281- jarTasks = [" jvmJar" , " metadataJar " ]
277+ jarTasks = [" jvmJar" ]
282278 } else if (it. name == " kotlinx-coroutines-debug" ) {
283279 // We shadow debug module instead of just packaging it
284280 jarTasks = [" shadowJar" ]
Original file line number Diff line number Diff line change @@ -53,7 +53,6 @@ kotlin.native.ignoreDisabledTargets=true
5353# TODO: Remove once KT-37187 is fixed
5454org.gradle.jvmargs =-Xmx3g
5555
56- kotlin.mpp.enableCompatibilityMetadataVariant =true
5756kotlin.mpp.stability.nowarn =true
5857kotlinx.atomicfu.enableJvmIrTransformation =true
5958# When the flag below is set to `true`, AtomicFU cannot process
Original file line number Diff line number Diff line change @@ -273,7 +273,7 @@ jvmJar { setupManifest(it) }
273273 * kotlinx-coroutines-core-jvm, but our resolving machinery guarantees that
274274 * any JVM project that depends on -core artifact also depends on -core-jvm one.
275275 */
276- metadataJar { setupManifest(it) }
276+ allMetadataJar { setupManifest(it) }
277277
278278static def setupManifest (Jar jar ) {
279279 jar. manifest {
You can’t perform that action at this time.
0 commit comments