From b9911d0e0c3b193bb22e77998a96192d80a202cb Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Mon, 10 Feb 2020 18:36:32 +0700 Subject: [PATCH] [Commonizer] Use only if kotlin.native.enableDependencyPropagation=false --- .../native/internal/KotlinNativePlatformDependencies.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/KotlinNativePlatformDependencies.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/KotlinNativePlatformDependencies.kt index 17204b8fec7..2ef322b3a1b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/KotlinNativePlatformDependencies.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/KotlinNativePlatformDependencies.kt @@ -24,6 +24,9 @@ import org.jetbrains.kotlin.konan.target.KonanTarget import org.jetbrains.kotlin.utils.addToStdlib.flattenTo import java.io.File +private val Project.isNativeDependencyPropagationEnabled: Boolean + get() = (findProperty("kotlin.native.enableDependencyPropagation") as? String)?.toBoolean() ?: true + internal fun Project.setUpKotlinNativePlatformDependencies() { if (multiplatformExtensionOrNull == null) { // 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 val allowCommonizer = compareVersionNumbers(kotlinVersion, "1.4") >= 0 && isKotlinGranularMetadataEnabled + && !isNativeDependencyPropagationEnabled // temporary fix: turn on commonizer only when native deps propagation is disabled && isInIdeaSync val dependencyResolver = NativePlatformDependencyResolver(this, kotlinVersion)