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

Merge pull request #8032 from unkarjedy/1.10.x

This commit is contained in:
eugene yokota 2025-02-04 22:13:38 -05:00 committed by GitHub
parent 58be9438f8 a7d862a08b
commit c99a269bfb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -412,12 +412,18 @@ private[sbt] object CrossJava {
class MacOsDiscoverConfig extends JavaDiscoverConf { class MacOsDiscoverConfig extends JavaDiscoverConf {
val base: File = file("/Library") / "Java" / "JavaVirtualMachines" val base: File = file("/Library") / "Java" / "JavaVirtualMachines"
// User-specific JDKs are installed, for example, by IntelliJ IDEA
private val baseInUserHome: File = Path.userHome / "Library" / "Java" / "JavaVirtualMachines"
def javaHomes: Vector[(String, File)] = def javaHomes: Vector[(String, File)] =
wrapNull(base.list()) findAllHomes(base) ++
.collect { findAllHomes(baseInUserHome)
private def findAllHomes(root: File): Vector[(String, File)] = {
wrapNull(root.list()).collect {
case dir @ JavaHomeDir(version) => case dir @ JavaHomeDir(version) =>
version -> (base / dir / "Contents" / "Home") version -> (root / dir / "Contents" / "Home")
}
} }
} }