Changeset 34363 in osm for applications

Timestamp:

2018-06-29T21:30:37+02:00 (6 years ago)

Author:

donvip

Message:

see #josm15560, see #josm16047 - Add compatibility with Java 10/11

File:

• applications/editors/josm/plugins/build-common.xml (modified) (4 diffs)

applications/editors/josm/plugins/build-common.xml

@@ -11 +11 @@
 **
 -->
-<project name="plugin_common" basedir="." xmlns:jacoco="antlib:org.jacoco.ant" xmlns:if="ant:if">
+<project name="plugin_common" basedir="." xmlns:jacoco="antlib:org.jacoco.ant" xmlns:if="ant:if" xmlns:unless="ant:unless">
 
     <property name="josm"                   location="../../core/dist/josm-custom.jar"/>
@@ -40 +40 @@
     <!-- For Java9-specific stuff -->
     <condition property="isJava9">
-        <matches string="${ant.java.version}" pattern="(1.)?9" />
+        <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>
+    <!-- For Java11-specific stuff -->
+    <condition property="isJava11">
+        <matches string="${ant.java.version}" pattern="1[1-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>
+    <!-- Disable jacoco on Java 11+, see https://github.com/jacoco/jacoco/issues/629 -->
+    <condition property="coverageByDefault">
+        <not>
+            <isset property="isJava11"/>
+        </not>
     </condition>
     <target name="-jaxb_before9" unless="isJava9">
@@ -231 +249 @@
             <bottom><![CDATA[<a href="https://josm.openstreetmap.de/wiki/Plugins">JOSM Plugins</a>]]></bottom>
             <arg value="-html5" if:set="isJava9" />
-            <arg value="--add-exports" if:set="isJava9" />
-            <arg value="javafx.graphics/com.sun.javafx.application=ALL-UNNAMED" if:set="isJava9" />
+            <arg value="--add-exports" if:set="isJava9" unless:set="noJavaFX" />
+            <arg value="javafx.graphics/com.sun.javafx.application=ALL-UNNAMED" if:set="isJava9" unless:set="noJavaFX" />
         </javadoc>
     </target>
@@ -518 +536 @@
         <sequential>
             <echo message="Running unit tests with JUnit"/>
-            <jacoco:coverage destfile="${plugin.test.dir}/jacoco.exec">
+            <jacoco:coverage destfile="${plugin.test.dir}/jacoco.exec" enabled="${coverageByDefault}">
                 <junit printsummary="yes" fork="true" forkmode="once" dir="${basedir}">
                     <jvmarg value="-Dfile.encoding=UTF-8"/>