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

Author: bvenners

README.md

@@ -150,22 +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-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
+    $ sbt ++2.13.0-RC2 scalactic/package scalactic/mimaReportBinaryIssues
+    $ sbt ++2.13.0-RC2 scalatest/package scalatest/mimaReportBinaryIssues
+    $ sbt ++2.13.0-RC2 scalacticJS/package scalacticJS/mimaReportBinaryIssues
+    $ sbt ++2.13.0-RC2 scalatestJS/package scalatestJS/mimaReportBinaryIssues
 
 To publish scalactic, scalatest and scalatest-app use the following command:
 
     $ 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-RC1 "project scalatestApp" clean publishSigned "project scalatestAppJS" clean publishSigned    
+    $ sbt ++2.13.0-RC2 "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.8 "project scalatestAppJS" clean publishSigned
-    $ sbt ++2.13.0-RC1 "project scalatestAppJS" clean publishSigned  
+    $ sbt ++2.13.0-RC2 "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: 
 

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-RC1")
+  lazy val supportedScalaVersions = List("2.12.8", "2.11.12", "2.10.7", "2.13.0-RC2")
 
-  val releaseVersion = "3.1.0-SNAP10"
+  val releaseVersion = "3.1.0-SNAP11"
 
   val previousReleaseVersion = "3.0.5"
 
-  val plusJUnitVersion = "1.0.0-SNAP5"
-  val plusTestNGVersion = "1.0.0-SNAP4"
+  val plusJUnitVersion = "1.0.0-SNAP7"
+  val plusTestNGVersion = "1.0.0-SNAP6"
   val pegdownVersion = "1.4.2"
 
   val githubTag = "release-3.1.0" // for scaladoc source urls

scalactic/src/main/scala/org/scalactic/Accumulation.scala

@@ -60,6 +60,25 @@ trait AccumulationLowPriorityImplicits {
       }
     }
 
+  implicit def convertGenTraversableOnceToCombinable3[E, TRAVONCE[+e] <: GenTraversableOnce[e]](xs: TRAVONCE[Bad[Every[E]]]): Combinable[Nothing, E, TRAVONCE] =
+    new Combinable[Nothing, E, TRAVONCE] {
+      override def combined: Or[TRAVONCE[Nothing], Every[E]] = {
+        val either: Either[Every[E], TRAVONCE[Nothing]] =
+          if (xs.isEmpty)
+            Right(Vector.empty[Nothing].asInstanceOf[TRAVONCE[Nothing]])
+          else {
+            val i = xs.toIterable
+            Left(
+              (i.tail.foldLeft(i.head.b) { case (res, ele) =>
+                res ++ ele.b
+              }.asInstanceOf[Every[E]])
+            )
+          }
+
+        Or.from(either)
+      }
+    }
+
 }
 
 /**
@@ -148,25 +167,6 @@ trait Accumulation extends AccumulationLowPriorityImplicits {
 
     }
 
-  implicit def convertGenTraversableOnceToCombinable3[E, TRAVONCE[+e] <: GenTraversableOnce[e]](xs: TRAVONCE[Bad[Every[E]]]): Combinable[Nothing, E, TRAVONCE] =
-    new Combinable[Nothing, E, TRAVONCE] {
-      override def combined: Or[TRAVONCE[Nothing], Every[E]] = {
-        val either: Either[Every[E], TRAVONCE[Nothing]] =
-          if (xs.isEmpty)
-            Right(Vector.empty[Nothing].asInstanceOf[TRAVONCE[Nothing]])
-          else {
-            val i = xs.toIterable
-            Left(
-              (i.tail.foldLeft(i.head.b) { case (res, ele) =>
-                res ++ ele.b
-              }.asInstanceOf[Every[E]])
-            )
-          }
-
-        Or.from(either)
-      }
-    }
-
   // Must have another one for Sets, because they are not covariant. Will need to handle Good/Nothing case specially therefore, and plan to do that
   // with another implicit here. Or just don't support Nothing.