Changeset 13073 in josm for trunk/build.xml

Timestamp:

2017-11-03T10:51:06+01:00 (8 years ago)

Author:

Don-vip

Message:

see #11924 - see #15560 - support jdk10+ in build.xml, update to proguard 6.0beta1 and error_prone 2.1.2

File:

• trunk/build.xml (modified) (4 diffs)

trunk/build.xml

@@ -40 +40 @@
         <!-- For Java9-specific stuff -->
         <condition property="isJava9">
-            <matches string="${ant.java.version}" pattern="(1.)?9" />
+            <matches string="${ant.java.version}" pattern="(1.)?(9|1[0-9])" />
         </condition>
         <path id="test.classpath">
@@ -338 +338 @@
             <compilerarg value="-Xep:FloatingPointLiteralPrecision:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
             <compilerarg value="-Xep:ShortCircuitBoolean:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
-            <compilerarg value="-Xep:LiteralClassName:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
+            <compilerarg value="-Xep:JdkObsolete:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
             <compilerarg line="-Xmaxwarns 1000"/>
             <exclude name="org/openstreetmap/josm/io/audio/JavaFxMediaPlayer.java" if:set="noJavaFX"/>
@@ -539 +539 @@
         </jacoco:report>
     </target>
-    <!-- Proguard does not support Java 9 : http://sourceforge.net/p/proguard/bugs/551/ -->
-    <target name="dist-optimized" depends="dist" unless="isJava9">
+    <target name="dist-optimized" depends="dist">
         <taskdef resource="proguard/ant/task.properties" classpath="tools/proguard.jar"/>
         <proguard>
@@ -546 +545 @@
         -outjars ${dist-optimized.jar}
 
-        -libraryjars ${java.home}/lib/rt.jar
-        -libraryjars ${java.home}/lib/jce.jar
-        -libraryjars ${java.home}/lib/ext/jfxrt.jar
+        -libraryjars ${java.home}/lib
 
         -dontoptimize