Changeset 15963 in josm for trunk/build.xml

Timestamp:

2020-02-29T16:02:30+01:00 (6 years ago)

Author:

Don-vip

Message:

see #17516 - update to error-prone 2.3.5-SNAPSHOT plus following patches for Java 13 compatibility (​https://github.com/don-vip/error-prone/commits/jdk13):

• ​https://github.com/google/error-prone/pull/1107
• ​https://github.com/google/error-prone/pull/1110
• ​https://github.com/google/error-prone/pull/1111
• ​https://github.com/google/error-prone/pull/1398
• ​https://github.com/google/error-prone/pull/1439

File:

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

trunk/build.xml

@@ -43 +43 @@
         <property name="error_prone_core.jar" location="${tools.dir}/error_prone_core.jar"/>
         <property name="error_prone_javac.jar" location="${tools.dir}/error_prone_javac.jar"/>
+        <property name="auto-value-annotations.jar" location="${tools.dir}/auto-value-annotations.jar"/>
         <property name="dataflow.jar" location="${tools.dir}/dataflow.jar"/>
         <property name="javacutil.jar" location="${tools.dir}/javacutil.jar"/>
@@ -102 +103 @@
             <pathelement location="${guava.jar}"/>
             <pathelement location="${jformatstring.jar}"/>
+            <pathelement location="${auto-value-annotations.jar}"/>
         </path>
     </target>
@@ -357 +359 @@
             <!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
             <compilerarg value="-XDignore.symbol.file"/>
-            <compilerarg value="-Xplugin:ErrorProne -Xep:CatchAndPrintStackTrace:OFF -Xep:ReferenceEquality:OFF -Xep:StringSplitter:OFF"/>
+            <compilerarg value="-Xplugin:ErrorProne -Xep:CatchAndPrintStackTrace:OFF -Xep:ReferenceEquality:OFF -Xep:StringSplitter:OFF -Xep:BadImport:OFF"/>
             <compilerarg line="-Xmaxwarns 1000"/>
         </javac>
@@ -383 +385 @@
             <!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
             <compilerarg value="-XDignore.symbol.file"/>
-            <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 -Xep:UnnecessaryParentheses:OFF -Xep:EqualsGetClass:OFF -Xep:ThreadPriorityCheck:OFF -Xep:UndefinedEquals:OFF -Xep:MixedMutabilityReturnType:OFF -Xep:OverrideThrowableToString:OFF -Xep:JavaTimeDefaultTimeZone:OFF -Xep:UnusedVariable:OFF -Xep:EqualsUsingHashCode:OFF"/>
+            <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 -Xep:UnnecessaryParentheses:OFF -Xep:EqualsGetClass:OFF -Xep:ThreadPriorityCheck:OFF -Xep:UndefinedEquals:OFF -Xep:MixedMutabilityReturnType:OFF -Xep:OverrideThrowableToString:OFF -Xep:JavaTimeDefaultTimeZone:OFF -Xep:UnusedVariable:OFF -Xep:EqualsUsingHashCode:OFF -Xep:BadImport:OFF -Xep:UnnecessaryLambda:OFF -Xep:AnnotateFormatMethod:OFF -Xep:MutablePublicArray:OFF"/>
             <compilerarg line="-Xmaxwarns 1000"/>
             <exclude name="org/openstreetmap/josm/io/audio/fx/*.java" if:set="noJavaFX"/>