Changeset 34373 in osm for applications/editors

Timestamp:

2018-06-30T11:41:50+02:00 (6 years ago)

Author:

donvip

Message:

see #josm15560, see #josm16047 - restore target=1.8, remove add-modules option for javac targets

File:

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

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

@@ -98 +98 @@
         <echo message="compiling sources for ${plugin.jar} ..."/>
         <javac compiler="${javac.compiler}" srcdir="${plugin.src.dir}" debug="true" destdir="${plugin.build.dir}" includeantruntime="false"
-            encoding="UTF-8" source="${java.lang.version}">
+            encoding="UTF-8" target="${java.lang.version}" source="${java.lang.version}">
             <compilerclasspath>
                 <pathelement location="${error_prone_ant.jar}"/>
             </compilerclasspath>
-            <compilerarg value="--add-modules" if:set="isJava9" unless:set="isJava11" />
-            <compilerarg value="java.activation,java.se.ee" if:set="isJava9" unless:set="isJava11" />
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
@@ -526 +524 @@
         <sequential>
             <javac debug="on" includeantruntime="false" srcdir="${plugin.test.dir}/unit" destdir="${plugin.test.dir}/build/unit" encoding="UTF-8"
-                source="${java.lang.version}">
+                target="${java.lang.version}" source="${java.lang.version}">
                 <classpath>
                     <fileset refid="plugin.requires.jars"/>
                     <path refid="test.classpath"/>
                 </classpath>
-                <compilerarg value="--add-modules" if:set="isJava9" unless:set="isJava11" />
-                <compilerarg value="java.activation,java.se.ee" if:set="isJava9" unless:set="isJava11" />
                                 <compilerarg value="-Xlint:all"/>
                                 <compilerarg value="-Xlint:-serial"/>