From 616866cc9ef3f2f84110a31ea4f40679bb919af6 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Fri, 27 Jun 2014 13:57:43 +0000
Subject: [PATCH] Build: Move remaining jars to Java 6, as we will require API
 9 in the next Android release.

---
 apps/i2ptunnel/java/build.xml     | 5 +++--
 apps/ministreaming/java/build.xml | 6 ++++--
 apps/streaming/java/build.xml     | 8 ++++++--
 core/java/build.xml               | 7 +++++--
 installer/java/build.xml          | 5 ++++-
 router/java/build.xml             | 7 +++++--
 6 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/apps/i2ptunnel/java/build.xml b/apps/i2ptunnel/java/build.xml
index 25a5f79c7..c7bd9af95 100644
--- a/apps/i2ptunnel/java/build.xml
+++ b/apps/i2ptunnel/java/build.xml
@@ -25,6 +25,7 @@
         <isfalse value="${require.gettext}" />
     </condition>
 
+    <!-- only used if not set by a higher build.xml -->
     <property name="javac.compilerargs" value="" />
     <property name="javac.version" value="1.6" />
     <property name="require.gettext" value="true" />
@@ -34,7 +35,7 @@
         <mkdir dir="./build/obj" />
         <javac 
             srcdir="./src" 
-            debug="true" deprecation="on" source="1.5" target="1.5" 
+            debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
             destdir="./build/obj" 
             includeAntRuntime="false"
             classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" >
@@ -281,7 +282,7 @@
         <mkdir dir="./build" />
         <mkdir dir="./build/obj" />
         <!-- We need the ant runtime, as it includes junit -->
-        <javac srcdir="./src:./test/junit" debug="true" source="1.5" target="1.5"
+        <javac srcdir="./src:./test/junit" debug="true" source="${javac.version}" target="${javac.version}"
                includeAntRuntime="true"
                deprecation="on" destdir="./build/obj" >
             <compilerarg line="${javac.compilerargs}" />
diff --git a/apps/ministreaming/java/build.xml b/apps/ministreaming/java/build.xml
index 86cf02c26..4d9ebf2bb 100644
--- a/apps/ministreaming/java/build.xml
+++ b/apps/ministreaming/java/build.xml
@@ -20,7 +20,9 @@
         </depend>
     </target>
 
+    <!-- only used if not set by a higher build.xml -->
     <property name="javac.compilerargs" value="" />
+    <property name="javac.version" value="1.6" />
     <property name="require.gettext" value="true" />
 
     <condition property="no.bundle">
@@ -31,7 +33,7 @@
         <mkdir dir="./build" />
         <mkdir dir="./build/obj" />
         <!-- half of this is deprecated classes so turn deprecation off -->
-        <javac srcdir="./src" debug="true" deprecation="off" source="1.5" target="1.5"
+        <javac srcdir="./src" debug="true" deprecation="off" source="${javac.version}" target="${javac.version}"
                includeAntRuntime="false"
                destdir="./build/obj" classpath="../../../core/java/build/i2p.jar" >
             <compilerarg line="${javac.compilerargs}" />
@@ -43,7 +45,7 @@
 	<mkdir dir="./buildTest/obj" />
         <javac
             srcdir="./test/junit"
-            debug="true" deprecation="on" source="1.5" target="1.5"
+            debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
             includeAntRuntime="false"
             destdir="./buildTest/obj"
             classpath="../../../core/java/build/i2p.jar:./build/mstreaming.jar" >
diff --git a/apps/streaming/java/build.xml b/apps/streaming/java/build.xml
index abffdc30b..73cbeb9fa 100644
--- a/apps/streaming/java/build.xml
+++ b/apps/streaming/java/build.xml
@@ -20,13 +20,17 @@
             </classpath>
         </depend>
     </target>
+
+    <!-- only used if not set by a higher build.xml -->
     <property name="javac.compilerargs" value="" />
+    <property name="javac.version" value="1.6" />
+
     <target name="compile" depends="depend">
         <mkdir dir="./build" />
         <mkdir dir="./build/obj" />
         <javac 
             srcdir="./src" 
-            debug="true" deprecation="on" source="1.5" target="1.5" 
+            debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
             includeAntRuntime="false"
             destdir="./build/obj" 
             classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" >
@@ -51,7 +55,7 @@
  
        <javac 
             srcdir="./test/junit" 
-            debug="true" deprecation="on" source="1.5" target="1.5" 
+            debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
             includeAntRuntime="false"
             destdir="./build/obj" >
 	   <classpath>
diff --git a/core/java/build.xml b/core/java/build.xml
index 0d3f10dec..032d400d9 100644
--- a/core/java/build.xml
+++ b/core/java/build.xml
@@ -15,13 +15,16 @@
             destdir="./build/obj" >
         </depend>
     </target>
+
     <!-- only used if not set by a higher build.xml -->
     <property name="javac.compilerargs" value="" />
     <property name="javac.classpath" value="" />
+    <property name="javac.version" value="1.6" />
+
     <target name="compile" depends="depend">
         <mkdir dir="./build" />
         <mkdir dir="./build/obj" />
-        <javac srcdir="./src" debug="true" source="1.5" target="1.5" deprecation="on"
+        <javac srcdir="./src" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
                debuglevel="lines,vars,source"
                includeAntRuntime="false"
                destdir="./build/obj" classpath="${javac.classpath}" >
@@ -103,7 +106,7 @@
         <!-- set hamcrest and junit homes to the old default unless overridden elsewhere -->
         <property name="hamcrest.home" value="${ant.home}/lib/" />
         <property name="junit.home" value="${ant.home}/lib/" />
-        <javac srcdir="./test/junit" debug="true" source="1.5" target="1.5" deprecation="on"
+        <javac srcdir="./test/junit" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
                debuglevel="lines,vars,source"
                includeAntRuntime="true"
                destdir="./build/obj" >
diff --git a/installer/java/build.xml b/installer/java/build.xml
index be911236a..89a4ff6cc 100644
--- a/installer/java/build.xml
+++ b/installer/java/build.xml
@@ -15,13 +15,16 @@
             destdir="./build/obj" >
         </depend>
     </target>
+
     <!-- only used if not set by a higher build.xml -->
     <property name="javac.compilerargs" value="" />
     <property name="javac.classpath" value="" />
+    <property name="javac.version" value="1.6" />
+
     <target name="compile" depends="depend">
         <mkdir dir="./build" />
         <mkdir dir="./build/obj" />
-        <javac srcdir="./src" debug="true" source="1.5" target="1.5" deprecation="on"
+        <javac srcdir="./src" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
             includeAntRuntime="false"
             destdir="./build/obj" classpath="${javac.classpath}:../../core/java/build/obj" >
             <compilerarg line="${javac.compilerargs}" />
diff --git a/router/java/build.xml b/router/java/build.xml
index 46ec22e49..01f7148fd 100644
--- a/router/java/build.xml
+++ b/router/java/build.xml
@@ -27,12 +27,15 @@
              <targetfilelist dir="." files="build/obj/net/i2p/router/StatisticsManager.class" />
         </dependset>
     </target>
+
     <!-- only used if not set by a higher build.xml -->
     <property name="javac.compilerargs" value="" />
+    <property name="javac.version" value="1.6" />
+
     <target name="compile" depends="depend, dependVersion">
         <mkdir dir="./build" />
         <mkdir dir="./build/obj" />
-        <javac srcdir="./src" debug="true" source="1.5" target="1.5" deprecation="on"
+        <javac srcdir="./src" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
                debuglevel="lines,vars,source"
                includeAntRuntime="false"
                destdir="./build/obj" classpath="../../core/java/build/obj:../../core/java/build/i2p.jar" >
@@ -127,7 +130,7 @@
         <!-- set hamcrest and junit homes to the old default unless overridden elsewhere -->
         <property name="hamcrest.home" value="${ant.home}/lib/" />
         <property name="junit.home" value="${ant.home}/lib/" />
-        <javac srcdir="./test/junit" debug="true" source="1.5" target="1.5" deprecation="on"
+        <javac srcdir="./test/junit" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
             debuglevel="lines,vars,source"
             includeAntRuntime="true"
             destdir="./build/obj">