Changeset 14171 in josm

Timestamp:

2018-08-20T00:24:00+02:00 (7 years ago)

Author:

Don-vip

Message:

see #16047, see #16498 - update to jacoco 0.8.2.20180819 for Java 11 compatibility. Keep it disabled for Java 12

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

Location:

trunk

Files:

• build.xml (modified) (1 diff)
• tools/jacocoant.jar (modified) ( previous)

trunk/build.xml

@@ -66 +66 @@
             <matches string="${ant.java.version}" pattern="1[1-9]" />
         </condition>
+        <!-- For Java12-specific stuff -->
+        <condition property="isJava12">
+            <matches string="${ant.java.version}" pattern="1[2-9]" />
+        </condition>
         <!-- 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"/>
         </condition>
-        <!-- Disable jacoco on Java 11+, see https://github.com/jacoco/jacoco/issues/629 -->
+        <!-- Disable jacoco on Java 12+ -->
         <condition property="coverageByDefault">
             <not>
-                <isset property="isJava11"/>
+                <isset property="isJava12"/>
             </not>
         </condition>