Fixed error handling when Java version can't be determined (#118)

* Fixed error handling when Java version can't be determined

* Made build getJavaExecutableVersion more resilient to output variations

gradle/java.gradle

@@ -234,14 +234,19 @@ JavaVersion getJavaExecutableVersion(String path) {
       commandLine = [path, "-version"]
       errorOutput = stream
     }
-    def matcher = stream.toString() =~ /^(?:java|openjdk) version "([^"]+)"/
+    def output = stream.toString()
-    if (matcher) {
+    for (def line : output.split('\n')) {
-      def version = JavaVersion.toVersion(matcher.group(1))
+      line = line.trim()
-      cache.put(path, version)
+      def matcher = line =~ /^(?:java|openjdk) version "([^"]+)"/
-      return version
+      if (matcher) {
-    } else {
+        def version = JavaVersion.toVersion(matcher.group(1))
-      throw new GradleScriptException("Cannot determine java version: ${stream.toString}")
+        cache.put(path, version)
+        return version
+      }
     }
+
+    // Getting here means we didn't find a line matching the version pattern.
+    throw new GradleScriptException("Cannot determine java version. Executable: ${path}, output: ${output}", null)
   }
 }