Changeset 32678 in osm

Timestamp:

2016-07-21T02:36:09+02:00 (8 years ago)

Author:

donvip

Message:

see #josm11390 - switch to Java 8

File:

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

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

@@ -16 +16 @@
     <property name="josm.test.build.dir"    location="../../core/test/build"/>
     <property name="groovy.jar"             location="../00_core_tools/groovy-all-2.4.7.jar"/>
+    <property name="error_prone_ant.jar"    location="../00_core_tools/error_prone_ant-2.0.9.jar"/>
     <property name="checkstyle.jar"         location="../00_core_tools/checkstyle/checkstyle-7.0-all.jar"/>
     <property name="findbugs-ant.jar"       location="../00_core_tools/findbugs/findbugs-ant.jar"/>
@@ -25 +26 @@
     <!-- this is the directory where the plugin jar is copied to -->
     <property name="plugin.dist.dir"        location="../../dist"/>
-    <property name="ant.build.javac.target" value="1.7"/>
-    <property name="ant.build.javac.source" value="1.7"/>
+    <property name="ant.build.javac.target" value="1.8"/>
+    <property name="ant.build.javac.source" value="1.8"/>
     <property name="plugin.jar"             location="${plugin.dist.dir}/${ant.project.name}.jar"/>
 
@@ -71 +72 @@
     <target name="compile" depends="init, pre-compile" unless="skip-compile">
         <echo message="compiling sources for ${plugin.jar} ..."/>
-        <javac srcdir="src" debug="true" destdir="${plugin.build.dir}" includeantruntime="false" encoding="UTF-8">
+        <javac compiler="com.google.errorprone.ErrorProneAntCompilerAdapter" srcdir="src" debug="true" destdir="${plugin.build.dir}" includeantruntime="false" encoding="UTF-8">
+            <compilerclasspath>
+                <pathelement location="${error_prone_ant.jar}"/>
+            </compilerclasspath>
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>