joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-01 07:35:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/gogio: add support for OpenJDK to java version detection

Browse Source 
When the `d8` command from the Android SDK fails because of an incompatible
java version, the error message is cryptic. Before reporting the errors, we
attempt to detect incompatible versions and report a clearer error. This change
adds support for OpenJDK as well as other vendors to the detection logic.

Fixes: https://todo.sr.ht/~eliasnaur/gio/342
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2022-01-15 18:29:38 +01:00
parent c4f98d3c1e
commit 2879fe8b41
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/gogio/androidbuild.go
+2 -1
View File
@@ -595,8 +595,9 @@ func determineJDKVersion() (int, int, bool) {
if err != nil {
return 0, 0, false
}
var vendor string
var major, minor int
_, err = fmt.Sscanf(string(out), "java version \"%d.%d", &major, &minor)
_, err = fmt.Sscanf(string(out), "%s version \"%d.%d", &vendor, &major, &minor)
return major, minor, err == nil
}