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

Kotlin Facet: Infer 1.6 platform version for modules with JDK 1.7 dependency

Browse Source 
#KT-14741 Fixed
This commit is contained in:
Alexey Sedunov
2016-11-10 19:59:35 +03:00
parent b1fbf9f6b6
commit 27aaac5a96
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt
+2 -2
View File
@@ -68,8 +68,8 @@ private fun getDefaultTargetPlatform(module: Module, rootModel: ModuleRootModel?
val sdk = ((rootModel ?: ModuleRootManager.getInstance(module))).sdk val sdk = ((rootModel ?: ModuleRootManager.getInstance(module))).sdk
val sdkVersion = (sdk?.sdkType as? JavaSdk)?.getVersion(sdk!!) val sdkVersion = (sdk?.sdkType as? JavaSdk)?.getVersion(sdk!!)
return when { return when {
sdkVersion != null && sdkVersion <= JavaSdkVersion.JDK_1_6 -> TargetPlatformKind.Jvm[JvmTarget.JVM_1_6] sdkVersion == null || sdkVersion >= JavaSdkVersion.JDK_1_8 -> TargetPlatformKind.Jvm[JvmTarget.JVM_1_8]
else -> TargetPlatformKind.Jvm[JvmTarget.JVM_1_8] else -> TargetPlatformKind.Jvm[JvmTarget.JVM_1_6]
} }
} }