Changeset 13073 in josm for trunk/build.xml


Ignore:
Timestamp:
2017-11-03T10:51:06+01:00 (23 months 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r13011 r13073  
    4040        <!-- For Java9-specific stuff -->
    4141        <condition property="isJava9">
    42             <matches string="${ant.java.version}" pattern="(1.)?9" />
     42            <matches string="${ant.java.version}" pattern="(1.)?(9|1[0-9])" />
    4343        </condition>
    4444        <path id="test.classpath">
     
    338338            <compilerarg value="-Xep:FloatingPointLiteralPrecision:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
    339339            <compilerarg value="-Xep:ShortCircuitBoolean:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
    340             <compilerarg value="-Xep:LiteralClassName:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
     340            <compilerarg value="-Xep:JdkObsolete:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
    341341            <compilerarg line="-Xmaxwarns 1000"/>
    342342            <exclude name="org/openstreetmap/josm/io/audio/JavaFxMediaPlayer.java" if:set="noJavaFX"/>
     
    539539        </jacoco:report>
    540540    </target>
    541     <!-- Proguard does not support Java 9 : http://sourceforge.net/p/proguard/bugs/551/ -->
    542     <target name="dist-optimized" depends="dist" unless="isJava9">
     541    <target name="dist-optimized" depends="dist">
    543542        <taskdef resource="proguard/ant/task.properties" classpath="tools/proguard.jar"/>
    544543        <proguard>
     
    546545        -outjars ${dist-optimized.jar}
    547546
    548         -libraryjars ${java.home}/lib/rt.jar
    549         -libraryjars ${java.home}/lib/jce.jar
    550         -libraryjars ${java.home}/lib/ext/jfxrt.jar
     547        -libraryjars ${java.home}/lib
    551548
    552549        -dontoptimize
Note: See TracChangeset for help on using the changeset viewer.