Changeset 14172 in josm


Ignore:
Timestamp:
2018-08-21T00:53:11+02:00 (6 years ago)
Author:
Don-vip
Message:

see #16498 - jacoco 0.8.2.20180819 already supports Java 12 in fact :)

See ​https://github.com/jacoco/jacoco/issues/738

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/build.xml

    r14171 r14172  
    5454            <isset property="clevel"/>
    5555        </condition>
    56         <!-- For Java9-specific stuff -->
    57         <condition property="isJava9">
    58             <matches string="${ant.java.version}" pattern="(1.)?(9|1[0-9])" />
    59         </condition>
    60         <!-- For Java10-specific stuff -->
    61         <condition property="isJava10">
    62             <matches string="${ant.java.version}" pattern="1[0-9]" />
    63         </condition>
    64         <!-- For Java11-specific stuff -->
    65         <condition property="isJava11">
    66             <matches string="${ant.java.version}" pattern="1[1-9]" />
    67         </condition>
    68         <!-- For Java12-specific stuff -->
    69         <condition property="isJava12">
    70             <matches string="${ant.java.version}" pattern="1[2-9]" />
    71         </condition>
     56        <!-- For Java specific stuff by version -->
     57        <condition property="isJava9"><matches string="${ant.java.version}" pattern="(1.)?(9|1[0-9])" /></condition>
     58        <condition property="isJava10"><matches string="${ant.java.version}" pattern="1[0-9]" /></condition>
     59        <condition property="isJava11"><matches string="${ant.java.version}" pattern="1[1-9]" /></condition>
     60        <condition property="isJava12"><matches string="${ant.java.version}" pattern="1[2-9]" /></condition>
     61        <condition property="isJava13"><matches string="${ant.java.version}" pattern="1[3-9]" /></condition>
    7262        <!-- error_prone works differently on Java 10+, see https://github.com/google/error-prone/issues/860 -->
    7363        <condition property="javac.compiler" value="modern" else="com.google.errorprone.ErrorProneAntCompilerAdapter">
    7464            <isset property="isJava10"/>
    7565        </condition>
    76         <!-- Disable jacoco on Java 12+ -->
     66        <!-- Disable jacoco on Java 13+, see https://github.com/jacoco/jacoco/pull/738 -->
    7767        <condition property="coverageByDefault">
    7868            <not>
    79                 <isset property="isJava12"/>
     69                <isset property="isJava13"/>
    8070            </not>
    8171        </condition>
Note: See TracChangeset for help on using the changeset viewer.