Make source compatible to build with Scala 2.10, 2.11, 2.12 and 2.13.0-M2.

Author: cheeseng

common-test/src/main/scala/org/scalatest/CompatParColls.scala

@@ -0,0 +1,20 @@
+package org.scalatest
+
+/**
+  * This compatibility workaround is taken from https://github.com/scala/scala-parallel-collections/issues/22
+  */
+private[org] object CompatParColls {
+  val Converters = {
+    import Compat._
+
+    {
+      import scala.collection.parallel._
+
+      CollectionConverters
+    }
+  }
+
+  object Compat {
+    object CollectionConverters
+  }
+}

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.9
+sbt.version=0.13.16

project/plugins.sbt

@@ -2,4 +2,4 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.7.0")
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.16")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.20")

project/scalatest.scala

@@ -23,7 +23,7 @@ object ScalatestBuild extends Build {
 
   val releaseVersion = "3.0.4"
 
-  val scalacheckVersion = "1.13.4"
+  val scalacheckVersion = "1.13.5"
 
   val githubTag = "release-3.0.3" // for scaladoc source urls
 
@@ -150,8 +150,8 @@ object ScalatestBuild extends Build {
       // if scala 2.11+ is used, add dependency on scala-xml module
       case Some((2, scalaMajor)) if scalaMajor >= 11 =>
         Seq(
-          "org.scala-lang.modules" %% "scala-xml" % "1.0.5",
-          "org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.4",
+          "org.scala-lang.modules" %% "scala-xml" % "1.0.6",
+          "org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.6",
           scalacheckDependency("optional")
         )
       case _ =>
@@ -179,7 +179,17 @@ object ScalatestBuild extends Build {
       "org.pegdown" % "pegdown" % "1.4.2" % "optional"
     )
 
-  def scalatestTestLibraryDependencies =
+  def crossBuildTestLibraryDependencies(theScalaVersion: String) =
+    CrossVersion.partialVersion(theScalaVersion) match {
+      // if scala 2.13+ is used, add dependency on scala-parallel-collections module
+      case Some((2, scalaMajor)) if scalaMajor >= 13 =>
+        Seq("org.scala-lang.modules" %% "scala-parallel-collections" % "0.1.2")
+
+      case other =>
+        Seq.empty
+    }
+
+  def scalatestTestLibraryDependencies(theScalaVersion: String) =
     Seq(
       "commons-io" % "commons-io" % "1.3.2" % "test",
       "org.eclipse.jetty" % "jetty-server" % "8.1.18.v20150929" % "test",
@@ -188,7 +198,7 @@ object ScalatestBuild extends Build {
 
   def scalatestJSLibraryDependencies =
     Seq(
-      "org.scala-js" %% "scalajs-test-interface" % "0.6.16"
+      "org.scala-js" %% "scalajs-test-interface" % "0.6.20"
     )
 
   def scalatestTestOptions =
@@ -252,14 +262,16 @@ object ScalatestBuild extends Build {
     .settings(sharedSettings: _*)
     .settings(
       projectTitle := "Common test classes used by scalactic and scalatest",
-      libraryDependencies += scalacheckDependency("optional")
+      libraryDependencies += scalacheckDependency("optional"),
+      libraryDependencies ++= crossBuildTestLibraryDependencies(scalaVersion.value)
     ).dependsOn(scalacticMacro, LocalProject("scalatest"))
 
   lazy val commonTestJS = Project("commonTestJS", file("common-test.js"))
     .settings(sharedSettings: _*)
     .settings(
       projectTitle := "Common test classes used by scalactic.js and scalatest.js",
       libraryDependencies += scalacheckDependency("optional"),
+      libraryDependencies ++= crossBuildTestLibraryDependencies(scalaVersion.value),
       sourceGenerators in Compile += {
         Def.task{
           GenCommonTestJS.genMain((sourceManaged in Compile).value / "scala" / "org" / "scalatest", version.value, scalaVersion.value)
@@ -507,7 +519,7 @@ object ScalatestBuild extends Build {
       organization := "org.scalatest",
       libraryDependencies ++= crossBuildLibraryDependencies(scalaVersion.value),
       libraryDependencies ++= scalatestLibraryDependencies,
-      libraryDependencies ++= scalatestTestLibraryDependencies,
+      libraryDependencies ++= scalatestTestLibraryDependencies(scalaVersion.value),
       testOptions in Test := scalatestTestOptions,
       logBuffered in Test := false,
       //fork in Test := true,

scalactic-test/src/test/scala/org/scalactic/ChainSpec.scala

@@ -18,6 +18,9 @@ package org.scalactic
 import scala.collection.GenTraversable
 import scala.collection.mutable.Buffer
 import scala.collection.mutable.ListBuffer
+// SKIP-SCALATESTJS-START
+import org.scalatest.CompatParColls.Converters._
+// SKIP-SCALATESTJS-END
 
 class ChainSpec extends UnitSpec {
   "A Chain" can "be constructed with one element" in {

scalactic-test/src/test/scala/org/scalactic/EverySpec.scala

@@ -21,6 +21,7 @@ import scala.collection.mutable.Buffer
 import scala.collection.mutable.ListBuffer
 // SKIP-SCALATESTJS-START
 import SharedHelpers.serializeRoundtrip
+import org.scalatest.CompatParColls.Converters._
 // SKIP-SCALATESTJS-END
 
 class EverySpec extends UnitSpec {

scalatest-test/src/test/scala/org/scalatest/InspectorShorthandsSpec.scala

@@ -30,6 +30,9 @@ import matchers.BePropertyMatchResult
 import matchers.BePropertyMatcher
 import matchers.HavePropertyMatchResult
 import matchers.HavePropertyMatcher
+// SKIP-SCALATESTJS-START
+import org.scalatest.CompatParColls.Converters._
+// SKIP-SCALATESTJS-END
 
 class InspectorShorthandsSpec extends FunSpec with TableDrivenPropertyChecks {
 

scalatest-test/src/test/scala/org/scalatest/InspectorsForMapSpec.scala

@@ -23,6 +23,9 @@ import SharedHelpers._
 import FailureMessages._
 import Matchers._
 import org.scalactic.Prettifier
+// SKIP-SCALATESTJS-START
+import org.scalatest.CompatParColls.Converters._
+// SKIP-SCALATESTJS-END
 
 class InspectorsForMapSpec extends FunSpec with Inspectors with TableDrivenPropertyChecks {
 

scalatest-test/src/test/scala/org/scalatest/InspectorsSpec.scala

@@ -27,6 +27,9 @@ import org.scalatest.prop.TableDrivenPropertyChecks
 import scala.annotation.tailrec
 import scala.collection.GenTraversable
 import FailureMessages.decorateToStringValue
+// SKIP-SCALATESTJS-START
+import org.scalatest.CompatParColls.Converters._
+// SKIP-SCALATESTJS-END
 
 class InspectorsSpec extends FunSpec with Inspectors with TableDrivenPropertyChecks {
 

scalatest-test/src/test/scala/org/scalatest/ShouldContainElementSpec.scala

@@ -23,6 +23,9 @@ import Prop._
 import org.scalactic.Prettifier
 import org.scalatest.prop.Checkers
 import org.scalatest.exceptions.TestFailedException
+// SKIP-SCALATESTJS-START
+import org.scalatest.CompatParColls.Converters._
+// SKIP-SCALATESTJS-END
 
 class ShouldContainElementSpec extends FunSpec with Checkers with ReturnsNormallyThrowsAssertion {
 

scalatest-test/src/test/scala/org/scalatest/ShouldContainKeySpec.scala

@@ -20,6 +20,9 @@ import Matchers._
 import org.scalactic.Prettifier
 import org.scalatest.prop.Checkers
 import org.scalatest.exceptions.TestFailedException
+// SKIP-SCALATESTJS-START
+import org.scalatest.CompatParColls.Converters._
+// SKIP-SCALATESTJS-END
 
 class ShouldContainKeySpec extends FunSpec with Checkers with ReturnsNormallyThrowsAssertion {
 

scalatest-test/src/test/scala/org/scalatest/ShouldContainValueSpec.scala

@@ -20,6 +20,9 @@ import Matchers._
 import org.scalactic.Prettifier
 import org.scalatest.prop.Checkers
 import org.scalatest.exceptions.TestFailedException
+// SKIP-SCALATESTJS-START
+import org.scalatest.CompatParColls.Converters._
+// SKIP-SCALATESTJS-END
 
 class ShouldContainValueSpec extends FunSpec with Checkers with ReturnsNormallyThrowsAssertion {
 

scalatest-test/src/test/scala/org/scalatest/ShouldLengthSizeSpec.scala

@@ -22,6 +22,9 @@ import org.scalatest.enablers.Length
 import org.scalatest.enablers.Size
 import Matchers._
 import org.scalactic.Prettifier
+// SKIP-SCALATESTJS-START
+import org.scalatest.CompatParColls.Converters._
+// SKIP-SCALATESTJS-END
 
 class ShouldLengthSizeSpec extends FunSpec with Checkers with ReturnsNormallyThrowsAssertion {
 

scalatest-test/src/test/scala/org/scalatest/ShouldLengthSpec.scala

@@ -25,6 +25,9 @@ import Integer.MIN_VALUE
 import org.scalatest.enablers.Length
 import org.scalatest.enablers.Size
 import org.scalatest.exceptions.TestFailedException
+// SKIP-SCALATESTJS-START
+import org.scalatest.CompatParColls.Converters._
+// SKIP-SCALATESTJS-END
 
 class ShouldLengthSpec extends FunSpec with Checkers with ReturnsNormallyThrowsAssertion {
 

scalatest-test/src/test/scala/org/scalatest/ShouldSizeSpec.scala

@@ -25,6 +25,9 @@ import org.scalatest.prop.Checkers
 import Integer.MIN_VALUE
 import org.scalatest.enablers.Size
 import org.scalatest.exceptions.TestFailedException
+// SKIP-SCALATESTJS-START
+import org.scalatest.CompatParColls.Converters._
+// SKIP-SCALATESTJS-END
 
 class ShouldSizeSpec extends FunSpec with Checkers with ReturnsNormallyThrowsAssertion {
 

scalatest-test/src/test/scala/org/scalatest/concurrent/JavaFuturesSpec.scala

@@ -24,6 +24,7 @@ import org.scalatest.exceptions.TestPendingException
 import org.scalatest.exceptions.TestCanceledException
 import org.scalatest.exceptions.StackDepthException
 import org.scalactic.source
+import scala.compat.Platform.EOL
 
 class JavaFuturesSpec extends FunSpec with Matchers with OptionValues with JavaFutures with SeveredStackTraces {
 
@@ -74,7 +75,7 @@ class JavaFuturesSpec extends FunSpec with Matchers with OptionValues with JavaF
             canceledFuture.isReadyWithin(Span(1, Millisecond))
           }
           caught.message.value should be(Resources.futureWasCanceled)
-          withClue(caught.getStackTraceString) {
+          withClue(caught.getStackTrace().mkString("", EOL, EOL)) {
             caught.failedCodeLineNumber.value should equal(thisLineNumber - 4)
           }
           caught.failedCodeFileName.value should be("JavaFuturesSpec.scala")
@@ -153,7 +154,7 @@ class JavaFuturesSpec extends FunSpec with Matchers with OptionValues with JavaF
             canceledFuture.futureValue
           }
           caught.message.value should be(Resources.futureWasCanceled)
-          withClue(caught.getStackTraceString) {
+          withClue(caught.getStackTrace().mkString("", EOL, EOL)) {
             caught.failedCodeLineNumber.value should equal(thisLineNumber - 4)
           }
           caught.failedCodeFileName.value should be("JavaFuturesSpec.scala")
@@ -287,7 +288,7 @@ class JavaFuturesSpec extends FunSpec with Matchers with OptionValues with JavaF
             }
           }
           caught.message.value should be(Resources.futureWasCanceled)
-          withClue(caught.getStackTraceString) {
+          withClue(caught.getStackTrace().mkString("", EOL, EOL)) {
             caught.failedCodeLineNumber.value should equal(thisLineNumber - 6)
           }
           caught.failedCodeFileName.value should be("JavaFuturesSpec.scala")