diff options
| author | Joe George <joe@zeroc.com> | 2020-06-12 16:27:08 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2020-06-12 16:29:10 -0400 |
| commit | a3dd882aaf64486b1d8176f255258982f5067371 (patch) | |
| tree | 0975ed24ef1a4c1ec27b7747f35630e842b119d3 /java | |
| parent | Skip Proguard build of IceGridGUI if using Java 14 (diff) | |
| download | ice-a3dd882aaf64486b1d8176f255258982f5067371.tar.bz2 ice-a3dd882aaf64486b1d8176f255258982f5067371.tar.xz ice-a3dd882aaf64486b1d8176f255258982f5067371.zip | |
Even better Java version check for ProGuard
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/IceGridGUI/build.gradle | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/java/src/IceGridGUI/build.gradle b/java/src/IceGridGUI/build.gradle index ed81a8bcafe..78b97ed7bb3 100644 --- a/java/src/IceGridGUI/build.gradle +++ b/java/src/IceGridGUI/build.gradle @@ -81,15 +81,10 @@ jar { project.ext.libJars = [] -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 -} +// Proguard does not support Java >= 14 +project.ext.jarBuilder = icegridguiProguard.toBoolean() && + Double.parseDouble(System.getProperty("java.vm.specification.version")) < 14.0 + ? "proguard-jar.gradle" : "plain-jar.gradle" apply from: jarBuilder |