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

Filter out JRE installations on MacOS

Browse Source 
java_home tool shows also JRE installations located at
"/Library/Internet Plug-Ins/JavaAppletPlugin.plugin" path.
They should not be used as there are no javac and other tools there.
This commit is contained in:
Pavel Punegov
2021-05-25 12:35:03 +03:00
committed by Space
parent 9b8ae8ce4f
commit 6e901e3785
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/jdksFinder.kt
+7 -2
View File
@@ -117,8 +117,13 @@ fun MutableCollection<JdkId>.discoverJdksOnMacOS(project: Project) {
for (rex in macOsJavaHomeOutRegexes) { for (rex in macOsJavaHomeOutRegexes) {
val matchResult = rex.matchEntire(line) val matchResult = rex.matchEntire(line)
if (matchResult != null) { if (matchResult != null) {
addIfBetter(project, matchResult.groupValues[1], matchResult.groupValues[0], File(matchResult.groupValues[3])) val jdkHomeDir = File(matchResult.groupValues[3])
break // Filter out JRE installed at /Library/Internet Plug-Ins/JavaAppletPlugin.plugin/
// and shown by the java_home tool
if (!jdkHomeDir.path.contains("JavaAppletPlugin.plugin")) {
addIfBetter(project, matchResult.groupValues[1], matchResult.groupValues[0], jdkHomeDir)
break
}
} }
} }
} }