Changeset 34373 in osm for applications


Ignore:
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:
1 edited

Legend:

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

    r34368 r34373  
    9898        <echo message="compiling sources for ${plugin.jar} ..."/>
    9999        <javac compiler="${javac.compiler}" srcdir="${plugin.src.dir}" debug="true" destdir="${plugin.build.dir}" includeantruntime="false"
    100             encoding="UTF-8" source="${java.lang.version}">
     100            encoding="UTF-8" target="${java.lang.version}" source="${java.lang.version}">
    101101            <compilerclasspath>
    102102                <pathelement location="${error_prone_ant.jar}"/>
    103103            </compilerclasspath>
    104             <compilerarg value="--add-modules" if:set="isJava9" unless:set="isJava11" />
    105             <compilerarg value="java.activation,java.se.ee" if:set="isJava9" unless:set="isJava11" />
    106104            <compilerarg value="-Xlint:deprecation"/>
    107105            <compilerarg value="-Xlint:unchecked"/>
     
    526524        <sequential>
    527525            <javac debug="on" includeantruntime="false" srcdir="${plugin.test.dir}/unit" destdir="${plugin.test.dir}/build/unit" encoding="UTF-8"
    528                 source="${java.lang.version}">
     526                target="${java.lang.version}" source="${java.lang.version}">
    529527                <classpath>
    530528                    <fileset refid="plugin.requires.jars"/>
    531529                    <path refid="test.classpath"/>
    532530                </classpath>
    533                 <compilerarg value="--add-modules" if:set="isJava9" unless:set="isJava11" />
    534                 <compilerarg value="java.activation,java.se.ee" if:set="isJava9" unless:set="isJava11" />
    535531                                <compilerarg value="-Xlint:all"/>
    536532                                <compilerarg value="-Xlint:-serial"/>
Note: See TracChangeset for help on using the changeset viewer.