azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor: Rename "Default" platform to "Common"

Browse Source 
Original commit: a84275b057
This commit is contained in:
Alexey Sedunov
2016-12-19 18:31:26 +03:00
parent cfe9f0d579
commit 31ea161c80
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt
+2 -2
View File
@@ -37,10 +37,10 @@ sealed class TargetPlatformKind<out Version : DescriptionAware>(
object JavaScript : TargetPlatformKind<NoVersion>(NoVersion, "JavaScript")
object Default : TargetPlatformKind<NoVersion>(NoVersion, "Default (experimental)")
object Common : TargetPlatformKind<NoVersion>(NoVersion, "Common (experimental)")
companion object {
val ALL_PLATFORMS: List<TargetPlatformKind<*>> by lazy { listOf(Jvm.JVM_1_6, JavaScript, Default) }
val ALL_PLATFORMS: List<TargetPlatformKind<*>> by lazy { listOf(Jvm.JVM_1_6, JavaScript, Common) }
}
}
jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt
+3 -3
View File
@@ -64,8 +64,8 @@ class JpsKotlinCompilerSettings : JpsElementBase<JpsKotlinCompilerSettings>() {
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<JpsKotlinCompilerSettings>() {
multiPlatform = module
.dependenciesList
.dependencies
.any { (it as? JpsModuleDependency)?.module?.targetPlatform == TargetPlatformKind.Default }
.any { (it as? JpsModuleDependency)?.module?.targetPlatform == TargetPlatformKind.Common }
}
}