Changeset 14109 in josm

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:

• ​https://github.com/google/error-prone/issues/860
• ​https://github.com/google/error-prone/issues/1086

File:

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

trunk/build.xml

@@ -65 +65 @@
             <matches string="${ant.java.version}" pattern="1[1-9]" />
         </condition>
-        <!-- Disable error_prone on Java 10+, see https://github.com/google/error-prone/issues/860 -->
+        <!-- error_prone works differently on Java 10+, see https://github.com/google/error-prone/issues/860 -->
         <condition property="javac.compiler" value="modern" else="com.google.errorprone.ErrorProneAntCompilerAdapter">
             <isset property="isJava10"/>
@@ -333 +333 @@
                 <pathelement location="${error_prone_ant.jar}"/>
             </compilerclasspath>
+            <compilerarg line="-XDcompilePolicy=simple" compiler="modern"/>
+            <compilerarg line="-processorpath ${error_prone_ant.jar}" compiler="modern"/>
             <compilerarg value="-Xlint:cast"/>
             <compilerarg value="-Xlint:deprecation"/>
@@ -349 +351 @@
             <compilerarg value="-Xep:ReferenceEquality:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
             <compilerarg value="-Xep:StringSplitter:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
+            <compilerarg value="-Xplugin:ErrorProne -Xep:CatchAndPrintStackTrace:OFF -Xep:ReferenceEquality:OFF -Xep:StringSplitter:OFF" compiler="modern"/>
             <compilerarg line="-Xmaxwarns 1000"/>
         </javac>
@@ -360 +363 @@
                 <pathelement location="${error_prone_ant.jar}"/>
             </compilerclasspath>
+            <compilerarg line="-XDcompilePolicy=simple" compiler="modern"/>
+            <compilerarg line="-processorpath ${error_prone_ant.jar}" compiler="modern"/>
             <compilerarg value="-Xlint:cast"/>
             <compilerarg value="-Xlint:deprecation"/>
@@ -380 +385 @@
             <compilerarg value="-Xep:StringSplitter:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
             <compilerarg value="-Xep:JdkObsolete:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
+            <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"/>
             <compilerarg line="-Xmaxwarns 1000"/>
             <exclude name="org/openstreetmap/josm/io/audio/fx/*.java" if:set="noJavaFX"/>