From ffdcda89143fc1901b8370a6734c03d23396c482 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Tue, 5 Jan 2021 13:02:03 +0100 Subject: [PATCH] [build] Fix JDK detection on Mac OS X 11 (Big Sur) #KTI-443 fixed --- buildSrc/src/main/kotlin/jdksFinder.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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)