luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Detect AdoptOpenJDK on macOS

This commit is contained in:
Regis Desgroppes 2020-10-09 17:07:42 +02:00
parent a2fc24bb6f
commit 63b375aa0f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/main/scala/sbt/internal/CrossJava.scala
View File

@ -388,7 +388,7 @@ private[sbt] object CrossJava {
object JavaDiscoverConfig {
object JavaHomeDir {
private val regex = """(\w+-)?(java-|jdk-?)(bin-)?(1\.)?([0-9]+).*""".r
private val regex = """(\w+-)?(java-|(?:adoptopen)?jdk-?)(bin-)?(1\.)?([0-9]+).*""".r
def unapply(s: CharSequence): Option[String] = {
s match {
case regex(vendor, _, _, m, n) => Some(JavaVersion(nullBlank(m) + n).toString)