Changeset 616866c


Ignore:
Timestamp:
Jun 27, 2014 1:57:43 PM (7 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
f3180b3
Parents:
58512b8
Message:

Build: Move remaining jars to Java 6, as we will require
API 9 in the next Android release.

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • apps/i2ptunnel/java/build.xml

    r58512b8 r616866c  
    2626    </condition>
    2727
     28    <!-- only used if not set by a higher build.xml -->
    2829    <property name="javac.compilerargs" value="" />
    2930    <property name="javac.version" value="1.6" />
     
    3536        <javac
    3637            srcdir="./src"
    37             debug="true" deprecation="on" source="1.5" target="1.5"
     38            debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
    3839            destdir="./build/obj"
    3940            includeAntRuntime="false"
     
    282283        <mkdir dir="./build/obj" />
    283284        <!-- We need the ant runtime, as it includes junit -->
    284         <javac srcdir="./src:./test/junit" debug="true" source="1.5" target="1.5"
     285        <javac srcdir="./src:./test/junit" debug="true" source="${javac.version}" target="${javac.version}"
    285286               includeAntRuntime="true"
    286287               deprecation="on" destdir="./build/obj" >
  • apps/ministreaming/java/build.xml

    r58512b8 r616866c  
    2121    </target>
    2222
     23    <!-- only used if not set by a higher build.xml -->
    2324    <property name="javac.compilerargs" value="" />
     25    <property name="javac.version" value="1.6" />
    2426    <property name="require.gettext" value="true" />
    2527
     
    3234        <mkdir dir="./build/obj" />
    3335        <!-- half of this is deprecated classes so turn deprecation off -->
    34         <javac srcdir="./src" debug="true" deprecation="off" source="1.5" target="1.5"
     36        <javac srcdir="./src" debug="true" deprecation="off" source="${javac.version}" target="${javac.version}"
    3537               includeAntRuntime="false"
    3638               destdir="./build/obj" classpath="../../../core/java/build/i2p.jar" >
     
    4446        <javac
    4547            srcdir="./test/junit"
    46             debug="true" deprecation="on" source="1.5" target="1.5"
     48            debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
    4749            includeAntRuntime="false"
    4850            destdir="./buildTest/obj"
  • apps/streaming/java/build.xml

    r58512b8 r616866c  
    2121        </depend>
    2222    </target>
     23
     24    <!-- only used if not set by a higher build.xml -->
    2325    <property name="javac.compilerargs" value="" />
     26    <property name="javac.version" value="1.6" />
     27
    2428    <target name="compile" depends="depend">
    2529        <mkdir dir="./build" />
     
    2731        <javac
    2832            srcdir="./src"
    29             debug="true" deprecation="on" source="1.5" target="1.5"
     33            debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
    3034            includeAntRuntime="false"
    3135            destdir="./build/obj"
     
    5256       <javac
    5357            srcdir="./test/junit"
    54             debug="true" deprecation="on" source="1.5" target="1.5"
     58            debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
    5559            includeAntRuntime="false"
    5660            destdir="./build/obj" >
  • core/java/build.xml

    r58512b8 r616866c  
    1616        </depend>
    1717    </target>
     18
    1819    <!-- only used if not set by a higher build.xml -->
    1920    <property name="javac.compilerargs" value="" />
    2021    <property name="javac.classpath" value="" />
     22    <property name="javac.version" value="1.6" />
     23
    2124    <target name="compile" depends="depend">
    2225        <mkdir dir="./build" />
    2326        <mkdir dir="./build/obj" />
    24         <javac srcdir="./src" debug="true" source="1.5" target="1.5" deprecation="on"
     27        <javac srcdir="./src" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
    2528               debuglevel="lines,vars,source"
    2629               includeAntRuntime="false"
     
    104107        <property name="hamcrest.home" value="${ant.home}/lib/" />
    105108        <property name="junit.home" value="${ant.home}/lib/" />
    106         <javac srcdir="./test/junit" debug="true" source="1.5" target="1.5" deprecation="on"
     109        <javac srcdir="./test/junit" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
    107110               debuglevel="lines,vars,source"
    108111               includeAntRuntime="true"
  • installer/java/build.xml

    r58512b8 r616866c  
    1616        </depend>
    1717    </target>
     18
    1819    <!-- only used if not set by a higher build.xml -->
    1920    <property name="javac.compilerargs" value="" />
    2021    <property name="javac.classpath" value="" />
     22    <property name="javac.version" value="1.6" />
     23
    2124    <target name="compile" depends="depend">
    2225        <mkdir dir="./build" />
    2326        <mkdir dir="./build/obj" />
    24         <javac srcdir="./src" debug="true" source="1.5" target="1.5" deprecation="on"
     27        <javac srcdir="./src" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
    2528            includeAntRuntime="false"
    2629            destdir="./build/obj" classpath="${javac.classpath}:../../core/java/build/obj" >
  • router/java/build.xml

    r58512b8 r616866c  
    2828        </dependset>
    2929    </target>
     30
    3031    <!-- only used if not set by a higher build.xml -->
    3132    <property name="javac.compilerargs" value="" />
     33    <property name="javac.version" value="1.6" />
     34
    3235    <target name="compile" depends="depend, dependVersion">
    3336        <mkdir dir="./build" />
    3437        <mkdir dir="./build/obj" />
    35         <javac srcdir="./src" debug="true" source="1.5" target="1.5" deprecation="on"
     38        <javac srcdir="./src" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
    3639               debuglevel="lines,vars,source"
    3740               includeAntRuntime="false"
     
    128131        <property name="hamcrest.home" value="${ant.home}/lib/" />
    129132        <property name="junit.home" value="${ant.home}/lib/" />
    130         <javac srcdir="./test/junit" debug="true" source="1.5" target="1.5" deprecation="on"
     133        <javac srcdir="./test/junit" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
    131134            debuglevel="lines,vars,source"
    132135            includeAntRuntime="true"
Note: See TracChangeset for help on using the changeset viewer.