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

MPP wizard: set sourceCompatibility / jvmTarget for JVM module

Browse Source 
Related to KT-23097
This commit is contained in:
Mikhail Glukhikh
2018-03-05 21:01:30 +03:00
committed by Mikhail Glukhikh
parent d9aa1796cd
commit 4f2701385d
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt
+5 -3
View File
@@ -236,10 +236,12 @@ fun getDefaultJvmTarget(sdk: Sdk?, version: String): JvmTarget? {
return null
}
val sdkVersion = sdk?.version
if (sdkVersion != null && sdkVersion.isAtLeast(JavaSdkVersion.JDK_1_8)) {
return JvmTarget.JVM_1_8
return when {
sdkVersion == null -> null
sdkVersion.isAtLeast(JavaSdkVersion.JDK_1_8) -> JvmTarget.JVM_1_8
sdkVersion.isAtLeast(JavaSdkVersion.JDK_1_6) -> JvmTarget.JVM_1_6
else -> null
}
return null
}
fun isSnapshot(version: String): Boolean {