diff options
author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-01-24 08:07:11 -0800 |
---|---|---|
committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-01-24 08:07:11 -0800 |
commit | b75a84bedacd8588d2cf955900af80fd767a7d20 (patch) | |
tree | 6bbc1161b3bb2ec06e6607b322782e9ba0d53297 | |
parent | 36885b0b5ae0d76ce48e49b2f7b59c55139e111f (diff) | |
parent | 947defc36115c24a782184cb154ac05259b40f95 (diff) | |
download | scala-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
-rwxr-xr-x | build.xml | 4 | ||||
-rw-r--r-- | test/files/filters | 2 | ||||
-rw-r--r-- | test/files/neg/abstract-report2.check | 8 | ||||
-rw-r--r-- | test/files/neg/abstract-report2.scala | 6 |
4 files changed, 15 insertions, 5 deletions
@@ -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> diff --git a/test/files/filters b/test/files/filters index 70d7dcff70..51a7507848 100644 --- a/test/files/filters +++ b/test/files/filters @@ -4,3 +4,5 @@ Java HotSpot\(TM\) .* warning: # Hotspot receiving VM options through the $_JAVA_OPTIONS # env variable outputs them on stderr Picked up _JAVA_OPTIONS: +# Filter out a message caused by this bug: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=8021205 +objc\[\d+\]: Class JavaLaunchHelper is implemented in both .* and .*\. One of the two will be used\. Which one is undefined\. diff --git a/test/files/neg/abstract-report2.check b/test/files/neg/abstract-report2.check index 6ea949353a..9be3d822f2 100644 --- a/test/files/neg/abstract-report2.check +++ b/test/files/neg/abstract-report2.check @@ -61,7 +61,7 @@ it has 13 unimplemented members. class Baz[T] extends Collection[T] ^ -abstract-report2.scala:11: error: class Dingus needs to be abstract, since: +abstract-report2.scala:15: error: class Dingus needs to be abstract, since: it has 24 unimplemented members. /** As seen from class Dingus, the missing signatures are as follows. * For convenience, these are usable as stub implementations. @@ -84,9 +84,6 @@ it has 24 unimplemented members. def toIterator: Iterator[(Set[Int], String)] = ??? def toStream: Stream[(Set[Int], String)] = ??? - // Members declared in scala.math.Ordering - def compare(x: List[Int],y: List[Int]): Int = ??? - // Members declared in scala.collection.TraversableOnce def copyToArray[B >: (Set[Int], String)](xs: Array[B],start: Int,len: Int): Unit = ??? def exists(p: ((Set[Int], String)) => Boolean): Boolean = ??? @@ -98,6 +95,9 @@ it has 24 unimplemented members. def seq: scala.collection.TraversableOnce[(Set[Int], String)] = ??? def toTraversable: Traversable[(Set[Int], String)] = ??? + // Members declared in Xyz + def foo(x: List[Int]): Boolean = ??? + class Dingus extends Bippy[String, Set[Int], List[Int]] ^ four errors found diff --git a/test/files/neg/abstract-report2.scala b/test/files/neg/abstract-report2.scala index b6327b0766..8825340d4a 100644 --- a/test/files/neg/abstract-report2.scala +++ b/test/files/neg/abstract-report2.scala @@ -6,6 +6,10 @@ class Bar extends Collection[List[_ <: String]] class Baz[T] extends Collection[T] -trait Bippy[T1, T2, T3] extends Collection[T1] with TraversableOnce[(T2, String)] with Ordering[T3] +trait Xyz[T] { + def foo(x: T): Boolean +} + +trait Bippy[T1, T2, T3] extends Collection[T1] with TraversableOnce[(T2, String)] with Xyz[T3] class Dingus extends Bippy[String, Set[Int], List[Int]]
\ No newline at end of file |