Changeset 35765 in osm

Timestamp:

2021-05-23T14:25:17+02:00 (3 years ago)

Author:

simon04

Message:

see #20920 - javac --release 8 for plugins

Location:

applications/editors/josm/plugins

Files:

• build-common.xml (modified) (4 diffs)
• comfort0/build.xml (modified) (1 diff)

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

@@ -30 +30 @@
     <!-- this is the directory where the plugin jar is copied to -->
     <property name="plugin.dist.dir"        location="../../dist"/>
-    <property name="java.lang.version"      value="1.8" />
+    <property name="java.lang.version"      value="8" />
     <property name="javadoc.executable"     value="javadoc" />
     <property name="javadoc.link"           value="https://docs.oracle.com/javase/8/docs/api" />
@@ -120 +120 @@
         </path>
         <javac srcdir="${plugin.src.dir}" debug="true" destdir="${plugin.build.dir}" includeantruntime="false"
-            encoding="UTF-8" target="${java.lang.version}" source="${java.lang.version}" fork="yes">
+            encoding="UTF-8" release="${java.lang.version}" fork="yes">
             <compilerarg value="-J-Xbootclasspath/p:${toString:jdk8.boot.classpath}" unless:set="isJava9"/>
             <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" if:set="isJava11" unless:set="noErrorProne"/>
@@ -588 +588 @@
         <sequential>
             <javac debug="on" includeantruntime="false" srcdir="${plugin.test.dir}/unit" destdir="${plugin.test.dir}/build/unit" encoding="UTF-8"
-                target="${java.lang.version}" source="${java.lang.version}">
+                release="${java.lang.version}">
                 <classpath>
                     <fileset refid="plugin.requires.jars"/>
@@ -644 +644 @@
         <mkdir dir="${checkstyle-build.dir}"/>
         <javac sourcepath="" srcdir="../00_core_tools/checkstyle/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" createMissingPackageInfoClass="false"
             encoding="UTF-8" classpathref="checkstyle.classpath">

applications/editors/josm/plugins/comfort0/build.xml

@@ -24 +24 @@
             <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=${parser.dir}/parsergen"/>