Changeset 35765 in osm


Ignore:
Timestamp:
2021-05-23T14:25:17+02:00 (4 years ago)
Author:
simon04
Message:

see #20920 - javac --release 8 for plugins

Location:
applications/editors/josm/plugins
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/build-common.xml

    r35714 r35765  
    3030    <!-- this is the directory where the plugin jar is copied to -->
    3131    <property name="plugin.dist.dir"        location="../../dist"/>
    32     <property name="java.lang.version"      value="1.8" />
     32    <property name="java.lang.version"      value="8" />
    3333    <property name="javadoc.executable"     value="javadoc" />
    3434    <property name="javadoc.link"           value="https://docs.oracle.com/javase/8/docs/api" />
     
    120120        </path>
    121121        <javac srcdir="${plugin.src.dir}" debug="true" destdir="${plugin.build.dir}" includeantruntime="false"
    122             encoding="UTF-8" target="${java.lang.version}" source="${java.lang.version}" fork="yes">
     122            encoding="UTF-8" release="${java.lang.version}" fork="yes">
    123123            <compilerarg value="-J-Xbootclasspath/p:${toString:jdk8.boot.classpath}" unless:set="isJava9"/>
    124124            <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" if:set="isJava11" unless:set="noErrorProne"/>
     
    588588        <sequential>
    589589            <javac debug="on" includeantruntime="false" srcdir="${plugin.test.dir}/unit" destdir="${plugin.test.dir}/build/unit" encoding="UTF-8"
    590                 target="${java.lang.version}" source="${java.lang.version}">
     590                release="${java.lang.version}">
    591591                <classpath>
    592592                    <fileset refid="plugin.requires.jars"/>
     
    644644        <mkdir dir="${checkstyle-build.dir}"/>
    645645        <javac sourcepath="" srcdir="../00_core_tools/checkstyle/src" failonerror="true"
    646             destdir="${checkstyle-build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on"
     646            destdir="${checkstyle-build.dir}" release="${java.lang.version}" debug="on"
    647647            includeantruntime="false" createMissingPackageInfoClass="false"
    648648            encoding="UTF-8" classpathref="checkstyle.classpath">
  • applications/editors/josm/plugins/comfort0/build.xml

    r35587 r35765  
    2424            <arg value="-DEBUG_PARSER=false"/>
    2525            <arg value="-DEBUG_TOKEN_MANAGER=false"/>
    26             <arg value="-JDK_VERSION=${java.lang.version}"/>
     26            <arg value="-JDK_VERSION=1.${java.lang.version}"/>
    2727            <arg value="-GRAMMAR_ENCODING=UTF-8"/>
    2828            <arg value="-OUTPUT_DIRECTORY=${parser.dir}/parsergen"/>
Note: See TracChangeset for help on using the changeset viewer.