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

Also look in (x86)

This commit is contained in:
Arnout Engelen 2018-08-15 11:21:30 +02:00
parent b1fc7dc183
commit b699f0fc6f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -369,8 +369,7 @@ private[sbt] object CrossJava {
} }
} }
class WindowsDiscoverConfig extends JavaDiscoverConf { class WindowsDiscoverConfig(base: File) extends JavaDiscoverConf {
val base: File = file("C://Program Files/Java")
def candidates() = wrapNull(base.list()) def candidates() = wrapNull(base.list())
@ -403,7 +402,8 @@ private[sbt] object CrossJava {
new LinuxDiscoverConfig(file("/usr") / "java"), new LinuxDiscoverConfig(file("/usr") / "java"),
new LinuxDiscoverConfig(file("/usr") / "lib" / "jvm"), new LinuxDiscoverConfig(file("/usr") / "lib" / "jvm"),
new MacOsDiscoverConfig, new MacOsDiscoverConfig,
new WindowsDiscoverConfig, new WindowsDiscoverConfig(file("C://Program Files/Java")),
new WindowsDiscoverConfig(file("C://Program Files (x86)/Java")),
new JavaHomeDiscoverConfig, new JavaHomeDiscoverConfig,
) )
} }