summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2014-01-24 08:07:11 -0800
committerGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2014-01-24 08:07:11 -0800
commitb75a84bedacd8588d2cf955900af80fd767a7d20 (patch)
tree6bbc1161b3bb2ec06e6607b322782e9ba0d53297 /build.xml
parent36885b0b5ae0d76ce48e49b2f7b59c55139e111f (diff)
parent947defc36115c24a782184cb154ac05259b40f95 (diff)
downloadscala-b75a84bedacd8588d2cf955900af80fd767a7d20.tar.gz
scala-b75a84bedacd8588d2cf955900af80fd767a7d20.tar.bz2
scala-b75a84bedacd8588d2cf955900af80fd767a7d20.zip
Merge pull request #3404 from gkossakowski/java8-support
Preliminary support for building and testing with Java 8
Diffstat (limited to 'build.xml')
-rwxr-xr-xbuild.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/build.xml b/build.xml
index cecac5763f..0d057e280a 100755
--- a/build.xml
+++ b/build.xml
@@ -421,8 +421,12 @@ TODO:
<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>