Minor: make sdk version comparison compatible with JDK > 9

2017-11-14 16:46:12 +03:00
parent 0e5c443894
commit 679a460c44
1 changed files with 3 additions and 3 deletions
@@ -316,9 +316,9 @@ fun getStdlibArtifactId(sdk: Sdk?, version: String): String {
    }

    val sdkVersion = sdk?.version
-    return when (sdkVersion) {
-        JavaSdkVersion.JDK_1_8, JavaSdkVersion.JDK_1_9 -> MAVEN_STDLIB_ID_JDK8
-        JavaSdkVersion.JDK_1_7 -> MAVEN_STDLIB_ID_JDK7
+    return when {
+        sdkVersion != null && sdkVersion.isAtLeast(JavaSdkVersion.JDK_1_8) -> MAVEN_STDLIB_ID_JDK8
+        sdkVersion == JavaSdkVersion.JDK_1_7 -> MAVEN_STDLIB_ID_JDK7
        else -> MAVEN_STDLIB_ID
    }
 }