Changeset 13492 in josm for trunk

Timestamp:

2018-03-04T00:59:51+01:00 (6 years ago)

Author:

Don-vip

Message:

see #15560, see #16047 - disable error_prone on Java 10+, see ​https://github.com/google/error-prone/issues/860

File:

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

trunk/build.xml

@@ -34 +34 @@
         <property name="dist.jar" location="${dist.dir}/josm-custom.jar"/>
         <property name="dist-optimized.jar" location="${dist.dir}/josm-custom-optimized.jar"/>
-        <property name="javac.compiler" value="com.google.errorprone.ErrorProneAntCompilerAdapter" />
         <property name="java.lang.version" value="1.8" />
         <property name="jacoco.includes" value="org.openstreetmap.josm.*" />
@@ -48 +47 @@
         <condition property="isJava9">
             <matches string="${ant.java.version}" pattern="(1.)?(9|1[0-9])" />
+        </condition>
+        <!-- For Java10-specific stuff -->
+        <condition property="isJava10">
+            <matches string="${ant.java.version}" pattern="1[0-9]" />
+        </condition>
+        <!-- Disable error_prone 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"/>
         </condition>
         <path id="test.classpath">