X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=e28ea5c63969ac15e1c31741878b69de11bd3047;hb=refs%2Fheads%2Fkjvdh%2Ffeatures%2FPhylogenyViewer;hp=6ed340d07edd2e0a4e5cba6d164a6622eee17368;hpb=400bd5b638505ca91c3ce4f3b4a9d048bdaacaf5;p=jalview.git

diff --git a/build.xml b/build.xml
index 6ed340d..e28ea5c 100755
--- a/build.xml
+++ b/build.xml
@@ -106,8 +106,8 @@
     <!-- Anne's version needs 1.7 - should rebuild VARNA to java 1.6 for release -->
     <property name="j2sev" value="1.7+" />
     <!-- Java Compilation settings - source and target javac version -->
-    <property name="javac.source" value="1.7" />
-    <property name="javac.target" value="1.7" />
+    <property name="javac.source" value="1.8" />
+    <property name="javac.target" value="1.8" />
 
     <!-- Permissions for running Java applets and applications. -->
     <!-- Defaults are those suitable for deploying jalview webstart www.jalview.org -->
@@ -425,8 +425,7 @@
           <offline_allowed />
         </information>
         <resources>
-          <j2se version="9+" />
-          <j2se version="7,8" initial-heap-size="${inih}" max-heap-size="${maxh}" />
+          <j2se version="1.8+" />
           <jar main="true" href="jalview.jar"/>
           <fileset dir="${packageDir}">
             <exclude name="jalview.jar" />
@@ -451,10 +450,9 @@
     </presetdef>
 
     <jnlpf toFile="${jnlpFile}" />
-    <!-- add a j2se entry for java 9 -->
-    <replace file="${jnlpFile}" value="j2se version=&quot;9+&quot; initial-heap-size=&quot;${inih}&quot; max-heap-size=&quot;${maxh}&quot; java-vm-args=&quot;--add-modules=java.se.ee&quot;">
-          <replacetoken>j2se version="9+"</replacetoken>
-           
+    <!-- add the add-modules j2se attribute for java 9 -->
+    <replace file="${jnlpFile}" value="j2se version=&quot;1.8+&quot; initial-heap-size=&quot;${inih}&quot; max-heap-size=&quot;${maxh}&quot; java-vm-args=&quot;--add-modules=java.se.ee&quot;">
+          <replacetoken>j2se version="1.8+"</replacetoken>
         </replace>
   </target>
 
@@ -625,7 +623,7 @@
       <include name="plugin.jar" />
     </fileset>
   </path>
-  <taskdef resource="proguard/ant/task.properties" classpath="utils/proguard.jar" />
+  <taskdef resource="proguard/ant/task.properties" classpath="utils/proguard_5.3.3.jar" />
 
   <proguard verbose="true" >
     <injar file="in.jar" />