diff --git a/buildSrc/src/main/kotlin/jdksFinder.kt b/buildSrc/src/main/kotlin/jdksFinder.kt index b0afb396955..6c2216304e4 100644 --- a/buildSrc/src/main/kotlin/jdksFinder.kt +++ b/buildSrc/src/main/kotlin/jdksFinder.kt @@ -101,8 +101,12 @@ fun MutableCollection.discoverJdks(project: Project) { } } -private val macOsJavaHomeOutRegexes = listOf(Regex("""\s+(\S+),\s+(\S+):\s+".*?"\s+(.+)"""), - Regex("""\s+(\S+)\s+\((.*?)\):\s+(.+)""")) +private val macOsJavaHomeOutRegexes = + listOf( + Regex("""\s+(\S+),\s+(\S+):\s+".*?"\s+(.+)"""), + Regex("""\s+(\S+)\s+\((.*?)\):\s+(.+)"""), + Regex("""\s+(\S+)\s+\((.*?)\)\s+"[^"]*"\s+-\s+"[^"]*"\s(.+)""") +) fun MutableCollection.discoverJdksOnMacOS(project: Project) { val procBuilder = ProcessBuilder("/usr/libexec/java_home", "-V").redirectErrorStream(true)