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

Revert ' Temporary remove JVM_1_8 target from facet settings'

Browse Source 
Original commit: b6bf53f96f
This commit is contained in:
Mikhael Bogdanov
2017-01-11 17:00:10 +01:00
parent 12d0207bcc
commit ae18166ef2
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt
+8 -3
View File
@@ -31,8 +31,12 @@ sealed class TargetPlatformKind<out Version : DescriptionAware>(
) : DescriptionAware { ) : DescriptionAware {
override val description = "$name ${version.description}" override val description = "$name ${version.description}"
sealed class Jvm(version: JvmTarget) : TargetPlatformKind<JvmTarget>(version, "JVM") { class Jvm(version: JvmTarget) : TargetPlatformKind<JvmTarget>(version, "JVM") {
object JVM_1_6 : Jvm(JvmTarget.JVM_1_6) 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") object JavaScript : TargetPlatformKind<NoVersion>(NoVersion, "JavaScript")
@@ -40,7 +44,8 @@ sealed class TargetPlatformKind<out Version : DescriptionAware>(
object Common : TargetPlatformKind<NoVersion>(NoVersion, "Common (experimental)") object Common : TargetPlatformKind<NoVersion>(NoVersion, "Common (experimental)")
companion object { 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 }
} }
} }