Merge branch 'cheeseng-3.1-scala-2.13.0-RC1' into 3.1.x

bvenners · bvenners · commit 8e8f9b2aecca · 2019-04-11T20:21:52.000-07:00
diff --git a/README.md b/README.md
@@ -150,21 +150,22 @@ Before publishing any patch release, binary compatibility with previous version
     $ sbt ++2.12.6 scalacticJS/package scalacticJS/mimaReportBinaryIssues
     $ sbt ++2.12.6 scalatestJS/package scalatestJS/mimaReportBinaryIssues
 
-    $ sbt ++2.13.0-M5 scalactic/package scalactic/mimaReportBinaryIssues
-    $ sbt ++2.13.0-M5 scalatest/package scalatest/mimaReportBinaryIssues
-    $ sbt ++2.13.0-M5 scalacticJS/package scalacticJS/mimaReportBinaryIssues
-    $ sbt ++2.13.0-M5 scalatestJS/package scalatestJS/mimaReportBinaryIssues
+    $ sbt ++2.13.0-RC1 scalactic/package scalactic/mimaReportBinaryIssues
+    $ sbt ++2.13.0-RC1 scalatest/package scalatest/mimaReportBinaryIssues
+    $ sbt ++2.13.0-RC1 scalacticJS/package scalacticJS/mimaReportBinaryIssues
+    $ sbt ++2.13.0-RC1 scalatestJS/package scalatestJS/mimaReportBinaryIssues
 
 To publish scalactic, scalatest and scalatest-app use the following command:
 
-    $ export SCALAJS_VERSION=0.6.26
+    $ export SCALAJS_VERSION=0.6.27
     $ sbt ++2.10.7 clean publishSigned "project scalatestAppJS" clean publishSigned
     $ sbt ++2.11.12 clean publishSigned "project scalatestAppJS" clean publishSigned
     $ sbt ++2.12.8 "project scalatestApp" clean publishSigned "project scalatestAppJS" clean publishSigned
-    $ sbt ++2.13.0-M5 "project scalatestApp" clean publishSigned "project scalatestAppJS" clean publishSigned    
-    $ export SCALAJS_VERSION=1.0.0-M3
+    $ sbt ++2.13.0-RC1 "project scalatestApp" clean publishSigned "project scalatestAppJS" clean publishSigned    
+    $ export SCALAJS_VERSION=1.0.0-M7
     $ sbt ++2.11.12 "project scalatestAppJS" clean publishSigned
-    $ sbt ++2.12.6 "project scalatestAppJS" clean publishSigned  
+    $ sbt ++2.12.8 "project scalatestAppJS" clean publishSigned
+    $ sbt ++2.13.0-RC1 "project scalatestAppJS" clean publishSigned  
 
 To publish scalactic, scalatest and scalatest-app (for Scala-native version 2.11, and make sure you're on Java 8) to Sonatype, use the following command: 
 
diff --git a/common-test.js/src/main/scala/org/scalatest/TestConcurrentDistributor.scala b/common-test.js/src/main/scala/org/scalatest/TestConcurrentDistributor.scala
@@ -18,5 +18,5 @@ class TestConcurrentDistributor(poolSize: Int) extends Distributor {
     status
   }
 
-  def waitUntilDone() = Unit
+  def waitUntilDone() = ()
 }
diff --git a/common-test/src/main/scala/org/scalatest/LineNumberHelper.scala b/common-test/src/main/scala/org/scalatest/LineNumberHelper.scala
@@ -4,6 +4,6 @@ private[scalatest] trait LineNumberHelper {
 
   import scala.language.experimental.macros
 
-  def thisLineNumber = macro LineNumberMacro.thisLineNumberImpl
+  def thisLineNumber: Int = macro LineNumberMacro.thisLineNumberImpl
 
 }
diff --git a/project/GenConfigMap.scala b/project/GenConfigMap.scala
@@ -130,7 +130,8 @@ object GenConfigMap {
           |
           |  override def +[A >: Any](kv: (String, A)): ConfigMap = new ConfigMap(underlying + kv)
           |
-          |  def remove(key: String): ConfigMap = new ConfigMap(underlying - key)
+          |  //def remove(key: String): ConfigMap = new ConfigMap(underlying - key)
+          |  def removed(key: String): ConfigMap = new ConfigMap(underlying - key)
           |
           |  override def empty: ConfigMap = new ConfigMap(Map.empty[String, Any])
           |
@@ -213,25 +214,6 @@ object GenConfigMap {
           |    }
           |  }
           |
-          |  // https://github.com/scala/scala-dev/issues/562
-          |  // TODO: This is to fix the serialization problem in 2.13.0-M5, we should try to remove this when newer 2.13 release is available.
-          |
-          |  override protected[this] def writeReplace(): AnyRef = new java.io.Serializable {
-          |    @throws(classOf[java.io.IOException])
-          |    private def writeObject(out: java.io.ObjectOutputStream): Unit = {
-          |      out.writeObject(underlying)
-          |    }
-          |
-          |    var map: Map[String, Any] = _
-          |
-          |    @throws(classOf[java.io.IOException])
-          |    private def readObject(in: java.io.ObjectInputStream): Unit = {
-          |      map = in.readObject().asInstanceOf[Map[String, Any]]
-          |    }
-          |
-          |    protected[this] def readResolve(): Any = new ConfigMap(map)
-          |  }
-          |
           |}
           |
           |/**
diff --git a/project/GenFactories.scala b/project/GenFactories.scala
@@ -1518,7 +1518,7 @@ $endif$
      *                         ^
      * </pre>
      */
-     def matchPattern(right: PartialFunction[Any, _]) = macro MatchPatternMacro.andNotMatchPatternMatcher
+     def matchPattern(right: PartialFunction[Any, _]): Matcher[Any] = macro MatchPatternMacro.andNotMatchPatternMatcher
   }
                     """
 
@@ -2812,7 +2812,7 @@ $endif$
      *                        ^
      * </pre>
      */
-    def matchPattern(right: PartialFunction[Any, _]) = macro MatchPatternMacro.orNotMatchPatternMatcher
+    def matchPattern(right: PartialFunction[Any, _]): Matcher[Any] = macro MatchPatternMacro.orNotMatchPatternMatcher
   }
 
   /**
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -2,7 +2,7 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.4")
 
-val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.26")
+val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.27")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
 
diff --git a/project/scalatest.scala b/project/scalatest.scala
@@ -36,14 +36,14 @@ object ScalatestBuild {
 
   // To temporarily switch sbt to a different Scala version:
   // > ++ 2.10.5
-  lazy val supportedScalaVersions = List("2.12.8", "2.11.12", "2.10.7", "2.13.0-M5")
+  lazy val supportedScalaVersions = List("2.12.8", "2.11.12", "2.10.7", "2.13.0-RC1")
 
-  val releaseVersion = "3.1.0-SNAP8"
+  val releaseVersion = "3.1.0-SNAP9"
 
   val previousReleaseVersion = "3.0.5"
 
-  val plusJUnitVersion = "1.0.0-SNAP4"
-  val plusTestNGVersion = "1.0.0-SNAP3"
+  val plusJUnitVersion = "1.0.0-SNAP5"
+  val plusTestNGVersion = "1.0.0-SNAP4"
   val pegdownVersion = "1.4.2"
 
   val githubTag = "release-3.1.0" // for scaladoc source urls
@@ -174,7 +174,7 @@ object ScalatestBuild {
 
   def scalaXmlDependency(theScalaVersion: String): Seq[ModuleID] =
     CrossVersion.partialVersion(theScalaVersion) match {
-      case Some((2, scalaMajor)) if scalaMajor >= 11 => Seq("org.scala-lang.modules" %% "scala-xml" % "1.1.0")
+      case Some((2, scalaMajor)) if scalaMajor >= 11 => Seq("org.scala-lang.modules" %% "scala-xml" % "1.2.0")
       case other => Seq.empty
     }
 
@@ -214,7 +214,7 @@ object ScalatestBuild {
         Seq(
           // We'll do without scala-parallel-collections until it catches up with Scala 2.13.0-M4.
           //"org.scala-lang.modules" %% "scala-parallel-collections" % "0.1.2",
-          "org.scala-lang.modules" %%% "scala-parser-combinators" % "1.1.1"
+          "org.scala-lang.modules" %%% "scala-parser-combinators" % "1.1.2"
         )
 
       case Some((2, scalaMajor)) if scalaMajor >= 11 =>
@@ -231,7 +231,7 @@ object ScalatestBuild {
       "org.scalatestplus" %% "scalatestplus-junit" % plusJUnitVersion % "test"
     )
 
-  val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.25")
+  val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.27")
 
   def scalatestJSLibraryDependencies =
     Seq(
diff --git a/scalactic-test/src/test/scala/org/scalactic/EverySpec.scala b/scalactic-test/src/test/scala/org/scalactic/EverySpec.scala
@@ -133,9 +133,12 @@ class EverySpec extends UnitSpec {
     Every(1, 2, 3)(1) shouldEqual 2 
     One("hi")(0) shouldEqual "hi"
     Many(7, 8, 9)(2) shouldEqual 9
+    val vectorOutOfBoundsException = intercept[IndexOutOfBoundsException] {
+      Vector(1, 2, 3)(3)
+    }
     the [IndexOutOfBoundsException] thrownBy {
       Every(1, 2, 3)(3)
-    } should have message "3"
+    } should have message vectorOutOfBoundsException.getMessage
   }
   it should "have an length method" in {
     One(1).length shouldBe 1
diff --git a/scalactic-test/src/test/scala/org/scalactic/anyvals/NonEmptyArraySpec.scala b/scalactic-test/src/test/scala/org/scalactic/anyvals/NonEmptyArraySpec.scala
@@ -1470,7 +1470,7 @@ class NonEmptyArraySpec extends UnitSpec {
     NonEmptyArray(1).updated(0, 2) shouldBe NonEmptyArray(2)
     def willThrowIndexOutOfBoundsException(): Unit = {
       NonEmptyArray(1).updated(1, 2)
-      Unit
+      ()
     }
     an [IndexOutOfBoundsException] should be thrownBy {
       willThrowIndexOutOfBoundsException()
diff --git a/scalactic-test/src/test/scala/org/scalactic/anyvals/NonEmptyVectorSpec.scala b/scalactic-test/src/test/scala/org/scalactic/anyvals/NonEmptyVectorSpec.scala
@@ -135,9 +135,12 @@ class NonEmptyVectorSpec extends UnitSpec {
     NonEmptyVector(1, 2, 3)(1) shouldEqual 2
     NonEmptyVector("hi")(0) shouldEqual "hi"
     NonEmptyVector(7, 8, 9)(2) shouldEqual 9
+    val vectorOutOfBoundException = intercept[IndexOutOfBoundsException] {
+      Vector(1, 2, 3)(3)
+    }
     the [IndexOutOfBoundsException] thrownBy {
       NonEmptyVector(1, 2, 3)(3)
-    } should have message "3"
+    } should have message vectorOutOfBoundException.getMessage
   }
   it should "have a length method" in {
     NonEmptyVector(1).length shouldBe 1
diff --git a/scalatest-test/src/test/scala/org/scalatest/time/DurationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/time/DurationSpec.scala
@@ -20,6 +20,8 @@ import scala.concurrent.duration._
 
 class DurationSpec extends FunSpec with Matchers {
 
+  import scala.language.postfixOps
+
   def span(passed: Span): Span = passed
   def duration(passed: Duration): Duration = passed
   def finiteDuration(passed: FiniteDuration): FiniteDuration = passed
diff --git a/scalatest-test/src/test/scala/org/scalatest/words/ResultOfAfterWordApplicationSpec.scala b/scalatest-test/src/test/scala/org/scalatest/words/ResultOfAfterWordApplicationSpec.scala
@@ -23,7 +23,7 @@ class ResultOfAfterWordApplicationSpec extends FunSpec {
   describe("ResultOfAfterWordApplication ") {
     
     it("should have pretty toString") {
-      val result = new ResultOfAfterWordApplication("some description", () => Unit)
+      val result = new ResultOfAfterWordApplication("some description", () => ())
       result.toString should be ("some description")
     }
   }
diff --git a/scalatest.js/src/main/scala/org/scalatest/tools/TaskRunner.scala b/scalatest.js/src/main/scala/org/scalatest/tools/TaskRunner.scala
@@ -26,7 +26,7 @@ import org.scalatest.events.{TestFailed,
                              SeeStackDepthException}
 import org.scalatest.tools.StringReporter._
 import sbt.testing._
-import org.scalajs.testinterface.TestUtils
+import scala.scalajs.reflect.Reflect
 import org.scalatest._
 import java.util.concurrent.atomic.AtomicInteger
 import scala.concurrent.Promise
@@ -78,7 +78,7 @@ println("GOT TO THIS RECOVER CALL")
 
   def executionFuture(eventHandler: EventHandler, loggers: Array[Logger]): Future[Unit] = {
     val suiteStartTime = Platform.currentTime
-    val suite = TestUtils.newInstance(task.fullyQualifiedName, cl, Seq.empty)(Seq.empty).asInstanceOf[Suite]
+    val suite = Reflect.lookupInstantiatableClass(task.fullyQualifiedName).getOrElse(throw new RuntimeException("Cannot load suite class: " + task.fullyQualifiedName)).newInstance().asInstanceOf[Suite]
     val sbtLogInfoReporter = new SbtLogInfoReporter(
       loggers,
       presentAllDurations,
diff --git a/scalatest/src/main/scala/org/scalatest/matchers/MatchPatternMacro.scala b/scalatest/src/main/scala/org/scalatest/matchers/MatchPatternMacro.scala
@@ -191,7 +191,7 @@ private[scalatest] object MatchPatternMacro {
    *
    * org.scalatest.matchers.MatchPatternHelper.checkPatternMatcher(left, right)
    */
-  def matchPattern(context: Context)(right: context.Expr[PartialFunction[Any, _]]): context.Expr[_] = {
+  def matchPattern(context: Context)(right: context.Expr[PartialFunction[Any, _]]): context.Expr[Unit] = {
     import context.universe._
 
     val tree = right.tree
diff --git a/scalatest/src/main/scala/org/scalatest/matchers/Matcher.scala b/scalatest/src/main/scala/org/scalatest/matchers/Matcher.scala
@@ -1847,7 +1847,7 @@ trait Matcher[-T] extends Function1[T, MatchResult] { outerInstance =>
      *                  ^
      * </pre>
      **/
-    def matchPattern(right: PartialFunction[Any, _]) = macro MatchPatternMacro.andNotMatchPatternMatcher
+    def matchPattern(right: PartialFunction[Any, _]): Matcher[Any] = macro MatchPatternMacro.andNotMatchPatternMatcher
   }
 
   /**
@@ -3128,7 +3128,7 @@ trait Matcher[-T] extends Function1[T, MatchResult] { outerInstance =>
      *                 ^
      * </pre>
      **/
-    def matchPattern(right: PartialFunction[Any, _]) = macro MatchPatternMacro.orNotMatchPatternMatcher
+    def matchPattern(right: PartialFunction[Any, _]): Matcher[Any] = macro MatchPatternMacro.orNotMatchPatternMatcher
   }
 
   /**
diff --git a/scalatest/src/main/scala/org/scalatest/tools/HtmlReporter.scala b/scalatest/src/main/scala/org/scalatest/tools/HtmlReporter.scala
@@ -80,7 +80,7 @@ private[scalatest] class HtmlReporter(
     try {
       val outputStream = new FileOutputStream(new File(toDir, targetFileName))
       try {
-        outputStream getChannel() transferFrom(Channels.newChannel(inputStream), 0, Long.MaxValue)
+        outputStream.getChannel().transferFrom(Channels.newChannel(inputStream), 0, Long.MaxValue)
       }
       finally {
         outputStream.flush()
diff --git a/scalatest/src/main/scala/org/scalatest/words/MatchPatternWord.scala b/scalatest/src/main/scala/org/scalatest/words/MatchPatternWord.scala
@@ -37,7 +37,7 @@ final class MatchPatternWord {
    *               ^
    * </pre>
    */
-  def apply(right: PartialFunction[Any, _]) = macro MatchPatternMacro.matchPatternMatcher
+  def apply(right: PartialFunction[Any, _]): Matcher[Any] = macro MatchPatternMacro.matchPatternMatcher
 
   /**
    * Overrides toString to return "matchPattern"
diff --git a/scalatest/src/main/scala/org/scalatest/words/NotWord.scala b/scalatest/src/main/scala/org/scalatest/words/NotWord.scala
@@ -793,7 +793,7 @@ final class NotWord {
    *                    ^
    * </pre>
    **/
-  def be(aType: ResultOfATypeInvocation[_]) = macro TypeMatcherMacro.notATypeMatcher
+  def be(aType: ResultOfATypeInvocation[_]): Matcher[Any] = macro TypeMatcherMacro.notATypeMatcher
   
   /**
    * This method enables the following syntax:
@@ -803,7 +803,7 @@ final class NotWord {
    *                    ^
    * </pre>
    **/
-  def be(anType: ResultOfAnTypeInvocation[_]) = macro TypeMatcherMacro.notAnTypeMatcher
+  def be(anType: ResultOfAnTypeInvocation[_]): Matcher[Any] = macro TypeMatcherMacro.notAnTypeMatcher
 
   /**
    * This method enables the following syntax: 
diff --git a/scalatest/src/main/scala/org/scalatest/words/ResultOfNotWordForAny.scala b/scalatest/src/main/scala/org/scalatest/words/ResultOfNotWordForAny.scala
@@ -1091,7 +1091,7 @@ final class ResultOfNotWordForAny[T](val left: T, val shouldBeTrue: Boolean, val
    *                   ^
    * </pre>
    **/
-  def matchPattern(right: PartialFunction[Any, _]) = macro MatchPatternMacro.matchPattern
+  def matchPattern(right: PartialFunction[Any, _]): Unit = macro MatchPatternMacro.matchPattern
   
   /**
    * Overrides toString to return pretty text.

Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,5 @@ class TestConcurrentDistributor(poolSize: Int) extends Distributor {`
`18`	`18`	`status`
`19`	`19`	`}`
`20`	`20`
`21`		`- def waitUntilDone() = Unit`
	`21`	`+ def waitUntilDone() = ()`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@ private[scalatest] trait LineNumberHelper {`
`4`	`4`
`5`	`5`	`import scala.language.experimental.macros`
`6`	`6`
`7`		`- def thisLineNumber = macro LineNumberMacro.thisLineNumberImpl`
	`7`	`+ def thisLineNumber: Int = macro LineNumberMacro.thisLineNumberImpl`
`8`	`8`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1470,7 +1470,7 @@ class NonEmptyArraySpec extends UnitSpec {`
`1470`	`1470`	`NonEmptyArray(1).updated(0, 2) shouldBe NonEmptyArray(2)`
`1471`	`1471`	`def willThrowIndexOutOfBoundsException(): Unit = {`
`1472`	`1472`	`NonEmptyArray(1).updated(1, 2)`
`1473`		`- Unit`
	`1473`	`+ ()`
`1474`	`1474`	`}`
`1475`	`1475`	`an [IndexOutOfBoundsException] should be thrownBy {`
`1476`	`1476`	`willThrowIndexOutOfBoundsException()`