Changeset 14109 in josm for trunk/build.xml


Ignore:
Timestamp:
2018-08-08T22:58:16+02:00 (6 years ago)
Author:
Don-vip
Message:

see #15560, see #16047 - make error_prone work on Java 10/11. For details refer to:

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/build.xml

    r14096 r14109  
    6565            <matches string="${ant.java.version}" pattern="1[1-9]" />
    6666        </condition>
    67         <!-- Disable error_prone on Java 10+, see https://github.com/google/error-prone/issues/860 -->
     67        <!-- error_prone works differently on Java 10+, see https://github.com/google/error-prone/issues/860 -->
    6868        <condition property="javac.compiler" value="modern" else="com.google.errorprone.ErrorProneAntCompilerAdapter">
    6969            <isset property="isJava10"/>
    … …  
    333333                <pathelement location="${error_prone_ant.jar}"/>
    334334            </compilerclasspath>
     335            <compilerarg line="-XDcompilePolicy=simple" compiler="modern"/>
     336            <compilerarg line="-processorpath ${error_prone_ant.jar}" compiler="modern"/>
    335337            <compilerarg value="-Xlint:cast"/>
    336338            <compilerarg value="-Xlint:deprecation"/>
    … …  
    349351            <compilerarg value="-Xep:ReferenceEquality:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
    350352            <compilerarg value="-Xep:StringSplitter:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
     353            <compilerarg value="-Xplugin:ErrorProne -Xep:CatchAndPrintStackTrace:OFF -Xep:ReferenceEquality:OFF -Xep:StringSplitter:OFF" compiler="modern"/>
    351354            <compilerarg line="-Xmaxwarns 1000"/>
    352355        </javac>
    … …  
    360363                <pathelement location="${error_prone_ant.jar}"/>
    361364            </compilerclasspath>
     365            <compilerarg line="-XDcompilePolicy=simple" compiler="modern"/>
     366            <compilerarg line="-processorpath ${error_prone_ant.jar}" compiler="modern"/>
    362367            <compilerarg value="-Xlint:cast"/>
    363368            <compilerarg value="-Xlint:deprecation"/>
    … …  
    380385            <compilerarg value="-Xep:StringSplitter:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
    381386            <compilerarg value="-Xep:JdkObsolete:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
     387            <compilerarg value="-Xplugin:ErrorProne -Xep:ReferenceEquality:OFF -Xep:ImmutableEnumChecker:OFF -Xep:FutureReturnValueIgnored:OFF -Xep:FloatingPointLiteralPrecision:OFF -Xep:ShortCircuitBoolean:OFF -Xep:StringSplitter:OFF -Xep:JdkObsolete:OFF" compiler="modern"/>
    382388            <compilerarg line="-Xmaxwarns 1000"/>
    383389            <exclude name="org/openstreetmap/josm/io/audio/fx/*.java" if:set="noJavaFX"/>
Note: See TracChangeset for help on using the changeset viewer.