Changeset 17906 in josm for trunk

Timestamp:

2021-05-23T12:10:05+02:00 (3 years ago)

Author:

simon04

Message:

fix #20920 - javac --release 8

File:

• trunk/build.xml (modified) (8 diffs)

trunk/build.xml

@@ -69 +69 @@
         <property name="dist-optimized.jar" location="${dist.dir}/josm-custom-optimized.jar"/>
         <property name="dist-sources.jar" location="${dist.dir}/josm-custom-sources.jar"/>
-        <property name="java.lang.version" value="1.8" />
+        <property name="java.lang.version" value="8" />
         <property name="test.headless" value="true" />
         <property name="jacoco.includes" value="org.openstreetmap.josm.*" />
@@ -192 +192 @@
             <arg value="-DEBUG_PARSER=false"/>
             <arg value="-DEBUG_TOKEN_MANAGER=false"/>
-            <arg value="-JDK_VERSION=${java.lang.version}"/>
+            <arg value="-JDK_VERSION=1.${java.lang.version}"/>
             <arg value="-GRAMMAR_ENCODING=UTF-8"/>
             <arg value="-OUTPUT_DIRECTORY=${mapcss.dir}/parsergen"/>
@@ -201 +201 @@
         <!-- COTS -->
         <javac srcdir="${src.dir}" includes="com/kitfox/**" excludes="**/package-info.java" nowarn="on" encoding="iso-8859-1"
-            destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeAntRuntime="false">
+            destdir="${build.dir}" release="${java.lang.version}" debug="on" includeAntRuntime="false">
             <!-- get rid of "internal proprietary API" warning -->
             <compilerarg value="-XDignore.symbol.file"/>
@@ -215 +215 @@
         <javac sourcepath="" srcdir="${src.dir}" fork="yes"
             excludes="com/**,org/apache/commons/**,**/package-info.java"
-            destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" encoding="UTF-8">
+            destdir="${build.dir}" release="${java.lang.version}" debug="on" includeantruntime="false" encoding="UTF-8">
             <compilerarg value="-J-Xbootclasspath/p:${toString:errorprone_javac.classpath}" unless:set="isJava9"/>
             <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" if:set="isJava16" unless:set="noErrorProne"/>
@@ -351 +351 @@
         <sequential>
             <javac srcdir="${test.dir}/@{testfamily}" destdir="${test.dir}/build/@{testfamily}"
-                target="${java.lang.version}" source="${java.lang.version}" debug="on"
+                release="${java.lang.version}" debug="on"
                 includeantruntime="false" encoding="UTF-8">
                 <compilerarg value="-Xlint:all"/>
@@ -748 +748 @@
     <target name="script-compile" depends="test-compile" description="Compile all scripts">
         <javac sourcepath="" srcdir="${base.dir}/scripts" failonerror="true" includes="*.java"
-               destdir="${script-build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on"
+               destdir="${script-build.dir}" release="${java.lang.version}" debug="on"
                includeantruntime="false" encoding="UTF-8">
             <classpath>
@@ -829 +829 @@
         <mkdir dir="${checkstyle-build.dir}"/>
         <javac sourcepath="" srcdir="${checkstyle.dir}/src" failonerror="true"
-            destdir="${checkstyle-build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on"
+            destdir="${checkstyle-build.dir}" release="${java.lang.version}" debug="on"
             includeantruntime="false"
             encoding="UTF-8" classpathref="checkstyle.classpath">
@@ -905 +905 @@
         <mkdir dir="${proj-build.dir}"/>
         <javac sourcepath="" srcdir="${base.dir}/scripts" failonerror="true" includes="BuildProjectionDefinitions.java"
-            destdir="${proj-build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on"
+            destdir="${proj-build.dir}" release="${java.lang.version}" debug="on"
             includeantruntime="false"
             encoding="UTF-8" classpath="${proj-classpath}">