From 27aaac5a96bb27e6cf3f6b13453031d0855ef093 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 10 Nov 2016 19:59:35 +0300 Subject: [PATCH] Kotlin Facet: Infer 1.6 platform version for modules with JDK 1.7 dependency #KT-14741 Fixed --- idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt b/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt index 0379aa2293f..5497ba50916 100644 --- a/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt @@ -68,8 +68,8 @@ private fun getDefaultTargetPlatform(module: Module, rootModel: ModuleRootModel? val sdk = ((rootModel ?: ModuleRootManager.getInstance(module))).sdk val sdkVersion = (sdk?.sdkType as? JavaSdk)?.getVersion(sdk!!) return when { - sdkVersion != null && sdkVersion <= JavaSdkVersion.JDK_1_6 -> TargetPlatformKind.Jvm[JvmTarget.JVM_1_6] - else -> TargetPlatformKind.Jvm[JvmTarget.JVM_1_8] + sdkVersion == null || sdkVersion >= JavaSdkVersion.JDK_1_8 -> TargetPlatformKind.Jvm[JvmTarget.JVM_1_8] + else -> TargetPlatformKind.Jvm[JvmTarget.JVM_1_6] } }