summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2015-01-29 14:40:45 +1000
committerAdriaan Moors <adriaan.moors@typesafe.com>2015-05-26 18:04:55 -0700
commit8d2d3c702d2010d40ed6facb771add48999216c1 (patch)
tree7eb0868cbdde147d6ad0df41ab8a3666ab11819a /build.xml
parent7b224c57c2712994c043c749028cb2589155358f (diff)
downloadscala-8d2d3c702d2010d40ed6facb771add48999216c1.tar.gz
scala-8d2d3c702d2010d40ed6facb771add48999216c1.tar.bz2
scala-8d2d3c702d2010d40ed6facb771add48999216c1.zip
Require and target Java 8
- Require Java 8 in ant build - use -source 1.8 and -target 1.8 for javac - Default scalac's -target to `jvm-1.8`, ignore and deprecate attempts to use `jvm-1.{6.7}` - Remove fragile javap-app test. The feature itself is slated for removal. - Remove obsolete Java6 checkfile - Adapt DCE tests - Remove deprecated/redundant -target:jvm-1.6 from flags where the intent was to trigger generation of stack map frames. - Remove tests with -target:jvm-1.5 that tested without stack map frames - Ignore OpenJDK JVM warnings (via test/[files|scaladoc]/filters).
Diffstat (limited to 'build.xml')
-rwxr-xr-xbuild.xml10
1 files changed, 1 insertions, 9 deletions
diff --git a/build.xml b/build.xml
index bd9de04790..73a2533ade 100755
--- a/build.xml
+++ b/build.xml
@@ -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>