diff options
| author | Joe George <joe@zeroc.com> | 2020-06-12 13:58:35 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2020-06-12 14:56:12 -0400 |
| commit | 995e2062399bb1f3d1afcedf5a8128b3c6c39bb5 (patch) | |
| tree | 888a7f1ff7a5ac8a84f320dd17ba3ff9a04c62e6 /java | |
| parent | Improve slice2py lookup in test suite (diff) | |
| download | ice-995e2062399bb1f3d1afcedf5a8128b3c6c39bb5.tar.bz2 ice-995e2062399bb1f3d1afcedf5a8128b3c6c39bb5.tar.xz ice-995e2062399bb1f3d1afcedf5a8128b3c6c39bb5.zip | |
Skip Proguard build of IceGridGUI if using Java 14
Diffstat (limited to 'java')
| -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 |