From cbd9018ac7309bed6a5324b32c89465389298a93 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Mon, 12 Dec 2016 16:10:19 +0100 Subject: [PATCH] Temporary remove JVM_1_8 target from facet settings Original commit: facee840202840a45e11f04ec31163de810deb0f --- .../org/jetbrains/kotlin/config/KotlinFacetSettings.kt | 10 +++------- 1 file changed, 3 insertions(+), 7 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 0c2fd311d3a..e5315348240 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -31,12 +31,8 @@ sealed class TargetPlatformKind( ) : DescriptionAware { override val description = "$name ${version.description}" - class Jvm(version: JvmTarget) : TargetPlatformKind(version, "JVM") { - companion object { - val JVM_PLATFORMS by lazy { JvmTarget.values().map(::Jvm) } - - operator fun get(version: JvmTarget) = JVM_PLATFORMS[version.ordinal] - } + sealed class Jvm(version: JvmTarget) : TargetPlatformKind(version, "JVM") { + object JVM_1_6 : Jvm(JvmTarget.JVM_1_6) } object JavaScript : TargetPlatformKind(NoVersion, "JavaScript") @@ -44,7 +40,7 @@ sealed class TargetPlatformKind( object Default : TargetPlatformKind(NoVersion, "Default (experimental)") companion object { - val ALL_PLATFORMS: List> by lazy { Jvm.JVM_PLATFORMS + JavaScript + Default } + val ALL_PLATFORMS: List> by lazy { listOf(Jvm.JVM_1_6, JavaScript, Default) } } }