mirrors
/
freecol
mirror of https://github.com/FreeCol/freecol.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bump to java 11.

This commit is contained in:
Mike Pope 2020-06-15 14:56:28 +09:30
parent 01b5a1d1ab
commit 6621e7e089
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.xml
View File

@ -9,7 +9,7 @@
the metaserver, distribution packages, running tests
and creating documentation.
</description>
<property name="java.target.version" value="1.9"/>
<property name="java.target.version" value="11"/>
<property name="freecol.name" value="freecol"/>
<property environment="env"/>
<property name="freecol.data.dir" value="${basedir}/data"/>
@ -387,7 +387,7 @@
<authors>
<author name="The FreeCol Team" email="developers@freecol.org" />
</authors>
<javaversion>1.9</javaversion>
<javaversion>1.11</javaversion>
</info>
<guiprefs width="640" height="480" resizable="no">
<laf name="looks">
@ -530,7 +530,7 @@
mainclass="${freecol.main.class}"
version="${freecol.version}"
vmoptions="-Xmx1G -Dapple.awt.fakefullscreen=true"
jvmversion="1.9+"
jvmversion="1.11+"
arguments="--windowed --freecol-data FreeCol.app/Contents/Resources/"
stubfile="${freecol.build.dir}/skeletons/universalJavaApplicationStub"
useJavaXKey="true"

2
src/net/sf/freecol/FreeCol.java
View File

@ -156,7 +156,7 @@ public final class FreeCol {
private static final int GUI_SCALE_STEP_PCT = 25;
public static final float GUI_SCALE_STEP = GUI_SCALE_STEP_PCT / 100.0f;
private static final Level LOGLEVEL_DEFAULT = Level.INFO;
private static final String JAVA_VERSION_MIN = "1.8";
private static final String JAVA_VERSION_MIN = "11";
private static final long MEMORY_MIN = 512000000; // 512M
private static final String META_SERVER_ADDRESS = "meta.freecol.org";
private static final int META_SERVER_PORT = 3540;