diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2015-01-29 14:40:45 +1000 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-05-26 18:04:55 -0700 |
| commit | 8d2d3c702d2010d40ed6facb771add48999216c1 (patch) | |
| tree | 7eb0868cbdde147d6ad0df41ab8a3666ab11819a /build-ant-macros.xml | |
| parent | 7b224c57c2712994c043c749028cb2589155358f (diff) | |
| download | scala-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-ant-macros.xml')
| -rw-r--r-- | build-ant-macros.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build-ant-macros.xml b/build-ant-macros.xml index c44a361374..d0c9c4d310 100644 --- a/build-ant-macros.xml +++ b/build-ant-macros.xml @@ -105,7 +105,7 @@ <then> <stopwatch name="@{project}.timer"/> <mkdir dir="${@{project}-classes}"/> - <javac debug="true" srcdir="${src.dir}/@{project}" destdir="${@{project}-classes}" classpath="${@{project}-classes}" includes="**/*.java" target="1.6" source="1.5" compiler="javac1.6"> + <javac debug="true" srcdir="${src.dir}/@{project}" destdir="${@{project}-classes}" classpath="${@{project}-classes}" includes="**/*.java" target="1.8" source="1.8" compiler="javac1.8"> <compilerarg line="${javac.args} @{args}"/> </javac> <if> @@ -132,7 +132,7 @@ <attribute name="args" default=""/> <attribute name="excludes" default=""/> <sequential> - <javac debug="true" srcdir="${src.dir}/@{project}" destdir="${build-@{stage}.dir}/classes/@{destproject}" includes="**/*.java" excludes="@{excludes}" target="1.6" source="1.5"> + <javac debug="true" srcdir="${src.dir}/@{project}" destdir="${build-@{stage}.dir}/classes/@{destproject}" includes="**/*.java" excludes="@{excludes}" target="1.8" source="1.8"> <compilerarg line="${javac.args} @{args}"/> <classpath refid="@{stage}.@{destproject}.build.path"/> </javac> |