Merge pull request #131 from SethTisue/bump-scala-versions

be 2.12.0-RC2 compatible

Author: SethTisue

.sbtopts

@@ -0,0 +1,2 @@
+-J-XX:ReservedCodeCacheSize=256M
+-J-Xmx3072M

.travis.yml

@@ -19,11 +19,11 @@ env:
     - TEST_COMMAND="test"
     - TEST_COMMAND="scripted"
     - TEST_COMMAND="testFunctional"
-    - TEST_COMMAND="-Dmima.testScalaVersion=2.11.7 testFunctional"
-    - TEST_COMMAND="-Dmima.testScalaVersion=2.12.0-RC1 testFunctional"
+    - TEST_COMMAND="-Dmima.testScalaVersion=2.11.8 testFunctional"
+    - TEST_COMMAND="-Dmima.testScalaVersion=2.12.0-RC2 testFunctional"
 
 script:
-  - sbt -J-XX:ReservedCodeCacheSize=256M -J-Xmx3072M $TEST_COMMAND
+  - sbt $TEST_COMMAND
 
   # Tricks to avoid unnecessary cache updates
   - find $HOME/.sbt -name "*.lock" | xargs rm

reporter/functional-tests/src/test/abstract-class-added-abstract-method-nok/v2/A.scala

@@ -1,3 +1,3 @@
 abstract class A {
-  def foo: Unit
-}
+  def foo(): Unit
+}

reporter/functional-tests/src/test/abstract-class-extending-new-trait-with-abstract-method-ok/v1/A.scala

@@ -1,3 +1,3 @@
 abstract class A {
-  def foo: Unit
+  def foo(): Unit
 }

reporter/functional-tests/src/test/added-abstract-class-in-new-version-ok/v2/A.scala

@@ -1,4 +1,4 @@
 class A
 abstract class B {
-  def foo: Unit
-}
+  def foo(): Unit
+}

reporter/functional-tests/src/test/added-trait-in-new-version-ok/v2/A.scala

@@ -1,5 +1,5 @@
 class A
 trait B {
-  def foo: Unit
-  def bar: Unit = ()
-}
+  def foo(): Unit
+  def bar(): Unit = ()
+}

reporter/functional-tests/src/test/class-added-abstract-method-in-new-version-nok/v2/A.scala

@@ -1,3 +1,3 @@
 abstract class A {
-  def foo: Unit
-}
+  def foo(): Unit
+}

reporter/functional-tests/src/test/class-method-abstract-override-of-concrete-supertrait-method-nok/problems-2.12.txt

@@ -1,3 +1,3 @@
 trait A {
-  def foo: Unit
-}
+  def foo(): Unit
+}

reporter/functional-tests/src/test/trait-added-abstract-method-nok/v2/A.scala

@@ -1,3 +1,5 @@
+import scala.language.higherKinds
+
 trait Foldable[F[_]]{
   def foldLeft[A, B](fa: F[A], z: B)(f: (B, A) => B): B
 }

reporter/functional-tests/src/test/trait-extending-new-trait-with-concrete-method-nok/v1/Foldable.scala

@@ -1,3 +1,5 @@
+import scala.language.higherKinds
+
 trait FoldableToList[F[_]] { self: Foldable[F] =>
   def toList[A](fa: F[A]): List[A] =
     self.foldLeft(fa, List.empty[A])((xs, x) => x :: xs).reverse