diff options
| -rw-r--r-- | java/src/IceGridGUI/build.gradle | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/java/src/IceGridGUI/build.gradle b/java/src/IceGridGUI/build.gradle index 39cecabfe6c..ed81a8bcafe 100644 --- a/java/src/IceGridGUI/build.gradle +++ b/java/src/IceGridGUI/build.gradle @@ -81,9 +81,14 @@ jar { project.ext.libJars = [] -project.ext.jarBuilder = "plain-jar.gradle" -if(icegridguiProguard.toBoolean()) { - project.ext.jarBuilder = "proguard-jar.gradle" +project.ext.jarBuilder = "proguard-jar.gradle" +try { + // Proguard does not support Java >= 14 + if (!icegridguiProguard.toBoolean() || JavaVersion.current() >= JavaVersion.valueOf("VERSION_14")) { + project.ext.jarBuilder = "plain-jar.gradle" + } +} catch (IllegalArgumentException) { + // Old version of Gralde that that does not know about Java 14 } apply from: jarBuilder |