diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-05-26 22:01:03 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-05-26 22:01:03 -0700 |
commit | 73f40564a6b19e8b15f0908c3e24f1a8fe405605 (patch) | |
tree | 7eb0868cbdde147d6ad0df41ab8a3666ab11819a /build.xml | |
parent | 7b224c57c2712994c043c749028cb2589155358f (diff) | |
parent | 8d2d3c702d2010d40ed6facb771add48999216c1 (diff) | |
download | scala-73f40564a6b19e8b15f0908c3e24f1a8fe405605.tar.gz scala-73f40564a6b19e8b15f0908c3e24f1a8fe405605.tar.bz2 scala-73f40564a6b19e8b15f0908c3e24f1a8fe405605.zip |
Merge pull request #4526 from adriaanm/rework-4523
Require and target Java 8
Diffstat (limited to 'build.xml')
-rwxr-xr-x | build.xml | 10 |
1 files changed, 1 insertions, 9 deletions
@@ -193,7 +193,7 @@ TODO: <!-- if ANT_OPTS is already set by the environment, it will be unaltered, but if it is unset it will take this default value. --> - <property name="env.ANT_OPTS" value="-Xms1536M -Xmx1536M -Xss1M -XX:MaxPermSize=192M -XX:+UseParallelGC" /> + <property name="env.ANT_OPTS" value="-Xms1536M -Xmx1536M -Xss1M -XX:+UseParallelGC" /> <property name="scalacfork.jvmargs" value="${env.ANT_OPTS} ${jvm.opts}"/> @@ -477,20 +477,12 @@ TODO: <!-- some default in case something went wrong getting the revision --> <property name="version.number" value="-unknown-"/> - <condition property="has.java6"> - <equals arg1="${ant.java.version}" arg2="1.6"/> - </condition> - <condition property="has.java7"> - <equals arg1="${ant.java.version}" arg2="1.7"/> - </condition> <condition property="has.java8"> <equals arg1="${ant.java.version}" arg2="1.8"/> </condition> <condition property="has.unsupported.jdk"> <not><or> <isset property="has.java8" /> - <isset property="has.java7" /> - <isset property="has.java6" /> </or></not> </condition> |