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

Fix typo in jdksFinder.kt

Browse Source
This commit is contained in:
Amaury
2019-06-07 18:07:01 +01:00
committed by Ilya Chernikov
parent c8ad7b95cd
commit bb0ee8ca0a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/jdksFinder.kt
+3 -3
View File
@@ -43,7 +43,7 @@ private val javaVersionRegex = Regex("""(?:1\.)?(\d+)(\.\d+)?([+-_]\w+){0,3}""")
fun MutableCollection<JdkId>.addIfBetter(project: Project, version: String, id: String, homeDir: File): Boolean { fun MutableCollection<JdkId>.addIfBetter(project: Project, version: String, id: String, homeDir: File): Boolean {
val matchString = javaMajorVersionRegex.matchEntire(version)?.groupValues?.get(1) val matchString = javaMajorVersionRegex.matchEntire(version)?.groupValues?.get(1)
val majorJersion = when (matchString) { val majorJdkVersion = when (matchString) {
"6" -> JdkMajorVersion.JDK_16 "6" -> JdkMajorVersion.JDK_16
"7" -> JdkMajorVersion.JDK_17 "7" -> JdkMajorVersion.JDK_17
"8" -> JdkMajorVersion.JDK_18 "8" -> JdkMajorVersion.JDK_18
@@ -53,9 +53,9 @@ fun MutableCollection<JdkId>.addIfBetter(project: Project, version: String, id:
return false return false
} }
} }
val prev = find { it.majorVersion == majorJersion } val prev = find { it.majorVersion == majorJdkVersion }
if (prev == null) { if (prev == null) {
add(JdkId(false, majorJersion, version, homeDir)) add(JdkId(false, majorJdkVersion, version, homeDir))
return true return true
} }
if (prev.explicit) return false if (prev.explicit) return false