From c7d68c2a6cea3b629f6373134a2f401403b755cf Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 19 Nov 2015 17:48:56 +0000
Subject: [PATCH] Require Java 7 for SAM separate option javac.compilerargs7
 for Java 7

---
 apps/sam/java/build.xml | 12 +++++++-----
 build.properties        |  3 +++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/apps/sam/java/build.xml b/apps/sam/java/build.xml
index 5d93ae476..9ecc58b8c 100644
--- a/apps/sam/java/build.xml
+++ b/apps/sam/java/build.xml
@@ -21,7 +21,9 @@
         </depend>
     </target>
 
-    <property name="javac.compilerargs" value="" />
+    <!-- ignored for now, we require java 7 here -->
+    <property name="javac.compilerargs7" value="" />
+    <!-- ignored for now, we require java 7 here -->
     <property name="javac.version" value="1.6" />
 
     <!-- compile everything including client classes -->
@@ -30,22 +32,22 @@
         <mkdir dir="./build/obj" />
         <javac 
             srcdir="./src" 
-            debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
+            debug="true" deprecation="on" source="1.7" target="1.7" 
             includeAntRuntime="false"
             destdir="./build/obj" 
             classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" >
-            <compilerarg line="${javac.compilerargs}" />
+            <compilerarg line="${javac.compilerargs7}" />
         </javac>
     </target>
 
     <target name="compileTest" depends="compile">
         <javac 
             srcdir="./test" 
-            debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
+            debug="true" deprecation="on" source="1.7" target="1.7" 
             includeAntRuntime="false"
             destdir="./build/obj" 
             classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" >
-            <compilerarg line="${javac.compilerargs}" />
+            <compilerarg line="${javac.compilerargs7}" />
         </javac>
     </target>
 
diff --git a/build.properties b/build.properties
index 195a13c6b..897e3c24e 100644
--- a/build.properties
+++ b/build.properties
@@ -43,8 +43,11 @@ javac.version=1.6
 #javac.classpath=/PATH/TO/pack200.jar
 
 # Optional compiler args
+# This one is for subsystems requiring Java 6
 # This one keeps gcj a lot quieter
 #javac.compilerargs=-warn:-unchecked,raw,unused,serial
+# This one is for subsystems requiring Java 7
+#javac.compilerargs7=
 
 #
 # Note to packagers, embedders, distributors: