From 94f66c237bd14f9c31c531d2449f7d9f45f08a9b Mon Sep 17 00:00:00 2001 From: Sergey Igushkin Date: Wed, 13 Nov 2019 17:31:22 +0300 Subject: [PATCH] (minor) replace the predicate for intermediate source set Use a condition that is safe in projects with just one target and intermediate source sets. --- .../kotlin/gradle/targets/native/KotlinNativeTargetPreset.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetPreset.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetPreset.kt index 0a5c1edce91..06653913336 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetPreset.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetPreset.kt @@ -125,7 +125,8 @@ abstract class AbstractKotlinNativeTargetPreset( fun KotlinSourceSet.isIntermediateNativeSourceSet(): Boolean { val compilations = compilationsBySourceSets[this] ?: return false - if (compilations.size <= 1) return false // intermediate source-sets participate at least in two compilations + if (compilations.all { it.defaultSourceSet == this }) + return false return compilations.all { it.target.platformType == KotlinPlatformType.native } }