File tree 2 files changed +9
-1
lines changed
2 files changed +9
-1
lines changed Original file line number Diff line number Diff line change 2
2
* Copyright 2016-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
3
3
*/
4
4
import org.jetbrains.kotlin.konan.target.HostManager
5
+ import org.gradle.util.VersionNumber
5
6
6
7
apply plugin : ' jdk-convention'
7
8
apply from : rootProject. file(" gradle/experimental.gradle" )
@@ -79,6 +80,11 @@ buildscript {
79
80
80
81
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
81
82
83
+ // Hierarchical project structures are not fully supported in 1.3.7x MPP, enable conditionally for 1.4.x
84
+ if (VersionNumber . parse(kotlin_version) > VersionNumber . parse(" 1.3.79" )) {
85
+ ext. set(" kotlin.mpp.enableGranularSourceSetsMetadata" , " true" )
86
+ }
87
+
82
88
// todo:KLUDGE: This is needed to workaround dependency resolution between Java and MPP modules
83
89
def configureKotlinJvmPlatform (configuration ) {
84
90
configuration. attributes. attribute(KotlinPlatformType . attribute, KotlinPlatformType . jvm)
Original file line number Diff line number Diff line change @@ -56,5 +56,7 @@ org.gradle.jvmargs=-Xmx2g
56
56
# https://github.com/gradle/gradle/issues/11412
57
57
systemProp.org.gradle.internal.publish.checksums.insecure =true
58
58
59
- kotlin.mpp.enableGranularSourceSetsMetadata =true
59
+ # This is commented out, and the property is set conditionally in build.gradle, because 1.3.71 doesn't work with it.
60
+ # Once this property is set by default in new versions or 1.3.71 is dropped, either uncomment or remove this line.
61
+ # kotlin.mpp.enableGranularSourceSetsMetadata=true
60
62
kotlin.mpp.enableCompatibilityMetadataVariant =true
You can’t perform that action at this time.
0 commit comments