Changeset 13492 in josm


Ignore:
Timestamp:
2018-03-04T00:59:51+01:00 (21 months 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r13491 r13492  
    3434        <property name="dist.jar" location="${dist.dir}/josm-custom.jar"/>
    3535        <property name="dist-optimized.jar" location="${dist.dir}/josm-custom-optimized.jar"/>
    36         <property name="javac.compiler" value="com.google.errorprone.ErrorProneAntCompilerAdapter" />
    3736        <property name="java.lang.version" value="1.8" />
    3837        <property name="jacoco.includes" value="org.openstreetmap.josm.*" />
     
    4847        <condition property="isJava9">
    4948            <matches string="${ant.java.version}" pattern="(1.)?(9|1[0-9])" />
     49        </condition>
     50        <!-- For Java10-specific stuff -->
     51        <condition property="isJava10">
     52            <matches string="${ant.java.version}" pattern="1[0-9]" />
     53        </condition>
     54        <!-- Disable error_prone on Java 10+, see https://github.com/google/error-prone/issues/860 -->
     55        <condition property="javac.compiler" value="modern" else="com.google.errorprone.ErrorProneAntCompilerAdapter">
     56            <isset property="isJava10"/>
    5057        </condition>
    5158        <path id="test.classpath">
Note: See TracChangeset for help on using the changeset viewer.