Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,11 @@ private Set<Path> doFindJdks() {
installedDirs.add(userHome.resolve(".jbang").resolve("cache").resolve("jdks"));
installedDirs.add(userHome.resolve(".asdf").resolve("installs"));
installedDirs.add(userHome.resolve(".jabba").resolve("jdk"));
installedDirs.add(userHome.resolve(".local")
.resolve("share")
.resolve("mise")
.resolve("installs")
.resolve("java"));

// OS related directories
String osname = System.getProperty("os.name").toLowerCase(Locale.ROOT);
Expand All @@ -436,8 +441,10 @@ private Set<Path> doFindJdks() {
if (macos) {
installedDirs.add(Paths.get("/Library/Java/JavaVirtualMachines"));
installedDirs.add(userHome.resolve("Library/Java/JavaVirtualMachines"));
installedDirs.add(userHome.resolve("hostedtoolcache"));
} else if (win) {
installedDirs.add(Paths.get("C:\\Program Files\\Java\\"));
installedDirs.add(Paths.get("C:\\hostedtoolcache\\windows\\"));
Path scoop = userHome.resolve("scoop").resolve("apps");
if (Files.isDirectory(scoop)) {
try (Stream<Path> stream = Files.list(scoop)) {
Expand All @@ -449,8 +456,11 @@ private Set<Path> doFindJdks() {
} else {
installedDirs.add(Paths.get("/usr/jdk"));
installedDirs.add(Paths.get("/usr/java"));
installedDirs.add(Paths.get("/usr/local/java"));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which tool uses this directory ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is based on the proposed alignment with the Gradle toolchain detection I mentioned in #129 – the original proposal for Gradle is documented in gradle/gradle#23620 and boils down to "people put it there during manual installations as common default".

I have no strong opinion on this and I am willing to exclude this particular search folder as it is a "customary" but ultimately a user-defined location.

installedDirs.add(Paths.get("/opt/java"));
installedDirs.add(Paths.get("/opt/hostedtoolcache"));
installedDirs.add(Paths.get("/usr/lib/jvm"));
installedDirs.add(Paths.get("/usr/lib64/jvm"));
}

for (Path dest : installedDirs) {
Expand Down
Loading