Changeset 10580 in josm for trunk/build.xml


Ignore:
Timestamp:
2016-07-21T01:57:41+02:00 (3 years ago)
Author:
Don-vip
Message:

see #11390 - switch to Java 8

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r10546 r10580  
    212212            <arg value="-DEBUG_PARSER=false"/>
    213213            <arg value="-DEBUG_TOKEN_MANAGER=false"/>
    214             <arg value="-JDK_VERSION=1.7"/>
     214            <arg value="-JDK_VERSION=1.8"/>
    215215            <arg value="-GRAMMAR_ENCODING=UTF-8"/>
    216216            <arg value="-OUTPUT_DIRECTORY=${mapcss.dir}/parsergen"/>
     
    221221        <!-- COTS -->
    222222        <javac srcdir="${src.dir}" includes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**" nowarn="on" encoding="iso-8859-1"
    223             destdir="build" target="1.7" source="1.7" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false">
     223            destdir="build" target="1.8" source="1.8" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false">
    224224            <!-- get rid of "internal proprietary API" warning -->
    225225            <compilerarg value="-XDignore.symbol.file"/>
     
    245245        <!-- JMapViewer -->
    246246        <javac sourcepath="" srcdir="${src.dir}" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/josm/**,JOSM.java,gnu/**"
    247             destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
     247            destdir="build" target="1.8" source="1.8" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
    248248            <compilerarg value="-Xlint:cast"/>
    249249            <compilerarg value="-Xlint:deprecation"/>
     
    262262        <!-- JOSM -->
    263263        <javac sourcepath="" srcdir="${src.dir}" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java"
    264             destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
     264            destdir="build" target="1.8" source="1.8" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
    265265            <compilerarg value="-Xlint:cast"/>
    266266            <compilerarg value="-Xlint:deprecation"/>
     
    300300                linksource="true"
    301301                author="false">
    302             <link href="http://docs.oracle.com/javase/7/docs/api"/>
     302            <link href="http://docs.oracle.com/javase/8/docs/api"/>
    303303            <doctitle><![CDATA[<h2>JOSM - Javadoc</h2>]]></doctitle>
    304304            <bottom><![CDATA[<a href="https://josm.openstreetmap.de/">JOSM</a>]]></bottom>
     
    353353                    <cp-elements/>
    354354                </classpath>
    355                 <javac target="1.7" source="1.7" debug="on" encoding="UTF-8">
     355                <javac target="1.8" source="1.8" debug="on" encoding="UTF-8">
    356356                    <compilerarg value="-Xlint:all"/>
    357357                    <compilerarg value="-Xlint:-serial"/>
     
    704704        <mkdir dir="${proj-build.dir}"/>
    705705        <javac sourcepath="" srcdir="${base.dir}/scripts" failonerror="true"
    706             destdir="${proj-build.dir}" target="1.7" source="1.7" debug="on"
     706            destdir="${proj-build.dir}" target="1.8" source="1.8" debug="on"
    707707            includeantruntime="false" createMissingPackageInfoClass="false"
    708708            encoding="UTF-8" classpath="${proj-classpath}">
Note: See TracChangeset for help on using the changeset viewer.