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

[build] Fix JDK detection on Mac OS X 11 (Big Sur)

Browse Source 
#KTI-443 fixed
This commit is contained in:
Ilya Chernikov
2021-01-05 13:02:03 +01:00
parent 77836f1aa9
commit ffdcda8914
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/jdksFinder.kt
+6 -2
View File
@@ -101,8 +101,12 @@ fun MutableCollection<JdkId>.discoverJdks(project: Project) {
} }
} }
private val macOsJavaHomeOutRegexes = listOf(Regex("""\s+(\S+),\s+(\S+):\s+".*?"\s+(.+)"""), private val macOsJavaHomeOutRegexes =
Regex("""\s+(\S+)\s+\((.*?)\):\s+(.+)""")) listOf(
Regex("""\s+(\S+),\s+(\S+):\s+".*?"\s+(.+)"""),
Regex("""\s+(\S+)\s+\((.*?)\):\s+(.+)"""),
Regex("""\s+(\S+)\s+\((.*?)\)\s+"[^"]*"\s+-\s+"[^"]*"\s(.+)""")
)
fun MutableCollection<JdkId>.discoverJdksOnMacOS(project: Project) { fun MutableCollection<JdkId>.discoverJdksOnMacOS(project: Project) {
val procBuilder = ProcessBuilder("/usr/libexec/java_home", "-V").redirectErrorStream(true) val procBuilder = ProcessBuilder("/usr/libexec/java_home", "-V").redirectErrorStream(true)