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 {
75
75
76
76
CacheRedirector . configureBuildScript(buildscript, rootProject)
77
77
}
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
- }
82
78
83
79
// todo:KLUDGE: This is needed to workaround dependency resolution between Java and MPP modules
84
80
def configureKotlinJvmPlatform (configuration ) {
@@ -278,7 +274,7 @@ configure(subprojects.findAll { !unpublished.contains(it.name) }) {
278
274
279
275
List<String > jarTasks
280
276
if (isMultiplatform(it)) {
281
- jarTasks = [" jvmJar" , " metadataJar " ]
277
+ jarTasks = [" jvmJar" ]
282
278
} else if (it. name == " kotlinx-coroutines-debug" ) {
283
279
// We shadow debug module instead of just packaging it
284
280
jarTasks = [" shadowJar" ]
Original file line number Diff line number Diff line change @@ -53,7 +53,6 @@ kotlin.native.ignoreDisabledTargets=true
53
53
# TODO: Remove once KT-37187 is fixed
54
54
org.gradle.jvmargs =-Xmx3g
55
55
56
- kotlin.mpp.enableCompatibilityMetadataVariant =true
57
56
kotlin.mpp.stability.nowarn =true
58
57
kotlinx.atomicfu.enableJvmIrTransformation =true
59
58
# 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) }
273
273
* kotlinx-coroutines-core-jvm, but our resolving machinery guarantees that
274
274
* any JVM project that depends on -core artifact also depends on -core-jvm one.
275
275
*/
276
- metadataJar { setupManifest(it) }
276
+ allMetadataJar { setupManifest(it) }
277
277
278
278
static def setupManifest (Jar jar ) {
279
279
jar. manifest {
You can’t perform that action at this time.
0 commit comments