X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=89c3d24368b5b218086ccd359cacb4f57b3e154f;hb=19b1c75919e4d2f255cbaf811dc15d26850490e6;hp=c965bc963a99d0e0d9260a63770a5132347433b5;hpb=88a657057e4c12dfabe2f77aac5c62b5108d3ad2;p=jalview.git

diff --git a/build.xml b/build.xml
index c965bc9..89c3d24 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="${j2sev}" initial_heap_size="${inih}" max_heap_size="${maxh}" />
-          <j2se version="9+" initial_heap_size="${inih}" max_heap_size="${maxh}" java-vm-args="--add-modules java.rmi,java.xml,java.xml.bind,java.xml.ws"/>
+          <j2se version="1.8+" />
           <jar main="true" href="jalview.jar"/>
           <fileset dir="${packageDir}">
             <exclude name="jalview.jar" />
@@ -451,7 +450,10 @@
     </presetdef>
 
     <jnlpf toFile="${jnlpFile}" />
-
+    <!-- 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 --illegal-access=warn&quot;">
+          <replacetoken>j2se version="1.8+"</replacetoken>
+    </replace>
   </target>
 
   <target name="-dofakejnlpfileassoc" depends="-generatejnlpf" if="nojnlpfileassocs">
@@ -621,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" />