Merge branch 'master' of ssh://github.com/MegaMek/megamek

MegaMek · Sep 1, 2016 · e81f75f · e81f75f
2 parents 171a71a + f1f11aa
commit e81f75f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/megamek/build.xml b/megamek/build.xml
@@ -86,7 +86,7 @@
 
     <target name="compile" depends="init" description="Compile java sources into class files">
         <!-- compile -->
-        <javac debug="true" debuglevel="lines,source" target="1.7" source="1.7" destdir="${builddir}" srcdir="${srcdir}" memoryInitialSize="512m" memoryMaximumSize="512m" fork="true" encoding="UTF-8">
+        <javac debug="true" debuglevel="lines,source" target="1.8" source="1.8" destdir="${builddir}" srcdir="${srcdir}" memoryInitialSize="512m" memoryMaximumSize="512m" fork="true" encoding="UTF-8">
             <classpath>
                 <pathelement location="${basedir}" />
                 <fileset dir="${libdir}" includes="*.jar" />

diff --git a/megamek/packaging.xml b/megamek/packaging.xml
@@ -123,7 +123,7 @@
 
 		<!-- compile -->
 		<echo message="building MegaMek from git sources" />
-		<javac debug="true" debuglevel="lines,source" target="1.7" source="1.7" destdir="${pkgbuilddir}" srcdir="${pkgdir}/${srcdir}" memoryInitialSize="512m" memoryMaximumSize="512m" fork="true" encoding="UTF-8">
+		<javac debug="true" debuglevel="lines,source" target="1.8" source="1.8" destdir="${pkgbuilddir}" srcdir="${pkgdir}/${srcdir}" memoryInitialSize="512m" memoryMaximumSize="512m" fork="true" encoding="UTF-8">
 			<classpath>
 				<pathelement location="${pkgdir}" />
 				<fileset dir="${pkgdir}/${libdir}" includes="*.jar" />

diff --git a/megamek/packaging_local.xml b/megamek/packaging_local.xml
@@ -120,7 +120,7 @@
 
 		<!-- compile -->
 		<echo message="building MegaMek from local sources" />
-		<javac debug="true" debuglevel="lines,source" target="1.7" source="1.7" destdir="${localbuilddir}" srcdir="${localdir}/${srcdir}" memoryInitialSize="512m" memoryMaximumSize="512m" fork="true" encoding="UTF-8">
+		<javac debug="true" debuglevel="lines,source" target="1.8" source="1.8" destdir="${localbuilddir}" srcdir="${localdir}/${srcdir}" memoryInitialSize="512m" memoryMaximumSize="512m" fork="true" encoding="UTF-8">
 			<classpath>
 				<pathelement location="${localdir}" />
 				<fileset dir="${localdir}/${libdir}" includes="*.jar" />