azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Commonizer] Use only if kotlin.native.enableDependencyPropagation=false

Browse Source
This commit is contained in:
Dmitriy Dolovov
2020-02-10 18:36:32 +07:00
parent f98a4e6715
commit b9911d0e0c
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/KotlinNativePlatformDependencies.kt
+4
View File
@@ -24,6 +24,9 @@ import org.jetbrains.kotlin.konan.target.KonanTarget
import org.jetbrains.kotlin.utils.addToStdlib.flattenTo import org.jetbrains.kotlin.utils.addToStdlib.flattenTo
import java.io.File import java.io.File
private val Project.isNativeDependencyPropagationEnabled: Boolean
get() = (findProperty("kotlin.native.enableDependencyPropagation") as? String)?.toBoolean() ?: true
internal fun Project.setUpKotlinNativePlatformDependencies() { internal fun Project.setUpKotlinNativePlatformDependencies() {
if (multiplatformExtensionOrNull == null) { if (multiplatformExtensionOrNull == null) {
// not a multiplatform project, nothing to set up // not a multiplatform project, nothing to set up
@@ -35,6 +38,7 @@ internal fun Project.setUpKotlinNativePlatformDependencies() {
// run commonizer only for 1.4+, only for HMPP projects and only on IDE sync // run commonizer only for 1.4+, only for HMPP projects and only on IDE sync
val allowCommonizer = compareVersionNumbers(kotlinVersion, "1.4") >= 0 val allowCommonizer = compareVersionNumbers(kotlinVersion, "1.4") >= 0
&& isKotlinGranularMetadataEnabled && isKotlinGranularMetadataEnabled
&& !isNativeDependencyPropagationEnabled // temporary fix: turn on commonizer only when native deps propagation is disabled
&& isInIdeaSync && isInIdeaSync
val dependencyResolver = NativePlatformDependencyResolver(this, kotlinVersion) val dependencyResolver = NativePlatformDependencyResolver(this, kotlinVersion)