From 022f9106b10352aea4ea7b9e07f9e30a29e07651 Mon Sep 17 00:00:00 2001 From: Dmitry Savvinov Date: Thu, 5 Sep 2019 15:58:07 +0300 Subject: [PATCH] Minor: simplify condition in KotlinFacetSettings Original commit: dbd352e2ba1458f2ccb7eeee1ec824a3675f6756 --- .../src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index 303ac20aedc..0982184d57e 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -277,7 +277,7 @@ class KotlinFacetSettings { get() = when { isHmppEnabled -> KotlinMultiplatformVersion.M3 kind.isNewMPP -> KotlinMultiplatformVersion.M2 - targetPlatform.isCommon() || implementedModuleNames.isNotEmpty() || kind.isNewMPP -> KotlinMultiplatformVersion.M1 + targetPlatform.isCommon() || implementedModuleNames.isNotEmpty() -> KotlinMultiplatformVersion.M1 else -> null }