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 df26ced324f..1d98580d35d 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -37,10 +37,10 @@ sealed class TargetPlatformKind( object JavaScript : TargetPlatformKind(NoVersion, "JavaScript") - object Default : TargetPlatformKind(NoVersion, "Default (experimental)") + object Common : TargetPlatformKind(NoVersion, "Common (experimental)") companion object { - val ALL_PLATFORMS: List> by lazy { listOf(Jvm.JVM_1_6, JavaScript, Default) } + val ALL_PLATFORMS: List> by lazy { listOf(Jvm.JVM_1_6, JavaScript, Common) } } } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt index 3aae4895765..c511a460d09 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt @@ -64,8 +64,8 @@ class JpsKotlinCompilerSettings : JpsElementBase() { private val JpsModule.targetPlatform: TargetPlatformKind<*>? get() { - val facetSettings = kotlinFacetExtension?.settings ?: return TargetPlatformKind.Default - if (facetSettings.useProjectSettings) return TargetPlatformKind.Default + val facetSettings = kotlinFacetExtension?.settings ?: return TargetPlatformKind.Common + if (facetSettings.useProjectSettings) return TargetPlatformKind.Common return facetSettings.versionInfo.targetPlatformKind } @@ -81,7 +81,7 @@ class JpsKotlinCompilerSettings : JpsElementBase() { multiPlatform = module .dependenciesList .dependencies - .any { (it as? JpsModuleDependency)?.module?.targetPlatform == TargetPlatformKind.Default } + .any { (it as? JpsModuleDependency)?.module?.targetPlatform == TargetPlatformKind.Common } } }