Skip to content

Commit c8f16f8

Browse files
committed
Fix latest version finding logic
1 parent f4e8965 commit c8f16f8

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

gradle/java_no_deps.gradle

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,17 @@ project.afterEvaluate {
155155
if (javaHomeVersions.isEmpty()) {
156156
throw new GradleException("No JAVA_X_HOME environment variables found.")
157157
}
158-
def latestVersion = javaHomeVersions.keySet().collect { key ->
158+
def javaVersions = javaHomeVersions.keySet().collect { key ->
159159
def matcher = key =~ /JAVA_([0-9]+)_HOME/
160+
if (!matcher.matches()) {
161+
return null
162+
}
160163
matcher.group(1) as Integer
161-
}.max()
162-
testJvm = latestVersion.toString()
164+
}.findAll { it != null }
165+
if (javaVersions.isEmpty()) {
166+
throw new GradleException("No Java versions found from JAVA_X_HOME environment variables.")
167+
}
168+
testJvm = javaVersions.max().toString()
163169
}
164170
if (testJvm) {
165171
def matcher = testJvm =~ /([a-zA-Z]*)([0-9]+)/

0 commit comments

Comments
 (0)