From a7eaa35317f1e40b1962c68aa33e9aed19f1fea3 Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Tue, 17 Nov 2020 09:53:54 +0100 Subject: [PATCH] [build] java os mac (Big Sur) --- buildSrc/src/main/kotlin/jdksFinder.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/jdksFinder.kt b/buildSrc/src/main/kotlin/jdksFinder.kt index 3ed259ae7a7..9c6ef0e7e27 100644 --- a/buildSrc/src/main/kotlin/jdksFinder.kt +++ b/buildSrc/src/main/kotlin/jdksFinder.kt @@ -105,8 +105,8 @@ private val macOsJavaHomeOutRegexes = listOf( Regex("""\s+(\S+),\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.discoverJdksOnMacOS(project: Project) { val procBuilder = ProcessBuilder("/usr/libexec/java_home", "-V").redirectErrorStream(true)