From ae18166ef2a43ca3f242fe2773550d44848bf810 Mon Sep 17 00:00:00 2001
From: Mikhael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Wed, 11 Jan 2017 17:00:10 +0100
Subject: [PATCH] Revert ' Temporary remove JVM_1_8 target from facet settings'

Original commit: b6bf53f96f4cc72950ce3377a33d72ae521aeff2
---
 .../jetbrains/kotlin/config/KotlinFacetSettings.kt    | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 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 1d98580d35d..d7e9152c3da 100644
--- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt
+++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt
@@ -31,8 +31,12 @@ sealed class TargetPlatformKind<out Version : DescriptionAware>(
 ) : DescriptionAware {
     override val description = "$name ${version.description}"
 
-    sealed class Jvm(version: JvmTarget) : TargetPlatformKind<JvmTarget>(version, "JVM") {
-        object JVM_1_6 : Jvm(JvmTarget.JVM_1_6)
+    class Jvm(version: JvmTarget) : TargetPlatformKind<JvmTarget>(version, "JVM") {
+        companion object {
+            val JVM_PLATFORMS by lazy { JvmTarget.values().map(::Jvm) }
+
+            operator fun get(version: JvmTarget) = JVM_PLATFORMS[version.ordinal]
+        }
     }
 
     object JavaScript : TargetPlatformKind<NoVersion>(NoVersion, "JavaScript")
@@ -40,7 +44,8 @@ sealed class TargetPlatformKind<out Version : DescriptionAware>(
     object Common : TargetPlatformKind<NoVersion>(NoVersion, "Common (experimental)")
 
     companion object {
-        val ALL_PLATFORMS: List<TargetPlatformKind<*>> by lazy { listOf(Jvm.JVM_1_6, JavaScript, Common) }
+
+        val ALL_PLATFORMS: List<TargetPlatformKind<*>> by lazy { Jvm.JVM_PLATFORMS + JavaScript + Common }
     }
 }