From 31ea161c80e031a4627d3c9289113e0e02d7813a Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Mon, 19 Dec 2016 18:31:26 +0300 Subject: [PATCH] Minor: Rename "Default" platform to "Common" Original commit: a84275b05740ad2dc2f149a21d136108576912da --- .../src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt | 4 ++-- .../org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) 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 } } }