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

[build] java os mac (Big Sur)

Browse Source
This commit is contained in:
Vasily Levchenko
2020-11-17 09:53:54 +01:00
parent 840c1e612c
commit a7eaa35317
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/jdksFinder.kt
+2 -2
View File
@@ -105,8 +105,8 @@ private val macOsJavaHomeOutRegexes =
listOf( listOf(
Regex("""\s+(\S+),\s+(\S+):\s+".*?"\s+(.+)"""), Regex("""\s+(\S+),\s+(\S+):\s+".*?"\s+(.+)"""),
Regex("""\s+(\S+)\s+\((.*?)\):\s+(.+)"""), Regex("""\s+(\S+)\s+\((.*?)\):\s+(.+)"""),
Regex("""\s+(\S+)\s+\((.*?)\)\s+"[^"]*"\s+-\s+"[^"]*"\s(.+)""") Regex("""\s+(\S+)\s+\((.*?)\)\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)