Merge branch 'cheeseng-3.1.0-SNAP13' into 3.1.x

Author: bvenners

.travis.yml

@@ -3,7 +3,7 @@ scala:
   - 2.10.7
   - 2.11.12
   - 2.12.8
-#  - 2.13.0-M2
+#  - 2.13.0
 
 jdk:
   - oraclejdk8

README.md

@@ -150,21 +150,21 @@ Before publishing any patch release, binary compatibility with previous version
     $ sbt ++2.12.8 scalacticJS/package scalacticJS/mimaReportBinaryIssues
     $ sbt ++2.12.8 scalatestJS/package scalatestJS/mimaReportBinaryIssues
 
-    $ sbt ++2.13.0-RC3 scalactic/package scalactic/mimaReportBinaryIssues
-    $ sbt ++2.13.0-RC3 scalatest/package scalatest/mimaReportBinaryIssues
-    $ sbt ++2.13.0-RC3 scalacticJS/package scalacticJS/mimaReportBinaryIssues
-    $ sbt ++2.13.0-RC3 scalatestJS/package scalatestJS/mimaReportBinaryIssues
+    $ sbt ++2.13.0 scalactic/package scalactic/mimaReportBinaryIssues
+    $ sbt ++2.13.0 scalatest/package scalatest/mimaReportBinaryIssues
+    $ sbt ++2.13.0 scalacticJS/package scalacticJS/mimaReportBinaryIssues
+    $ sbt ++2.13.0 scalatestJS/package scalatestJS/mimaReportBinaryIssues
 
 To publish scalactic, scalatest and scalatest-app use the following command:
 
     $ export SCALAJS_VERSION=0.6.28
     $ 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-RC3 "project scalatestApp" clean publishSigned "project scalatestAppJS" clean publishSigned    
+    $ sbt ++2.13.0 "project scalatestApp" clean publishSigned "project scalatestAppJS" clean publishSigned    
     $ sbt ++2.11.12 "project scalatestAppNative" clean publishSigned
     $ export SCALAJS_VERSION=1.0.0-M3
     $ sbt ++2.11.12 "project scalatestAppJS" clean publishSigned
     $ sbt ++2.12.6 "project scalatestAppJS" clean publishSigned
     $ export SCALAJS_VERSION=1.0.0-M8
-    $ sbt ++2.13.0-RC3 "project scalatestAppJS" clean publishSigned  
+    $ sbt ++2.13.0 "project scalatestAppJS" clean publishSigned  

project/GenScalaTestDotty.scala

@@ -162,6 +162,7 @@ object GenScalaTestDotty {
     ) ++
     copyDir("scalatest/src/main/scala/org/scalatest/path", "org/scalatest/path", targetDir, List.empty) ++
     copyDir("scalatest/src/main/scala/org/scalatest/prop", "org/scalatest/prop", targetDir, List.empty) ++
+    copyDir("scalatest/src/main/scala/org/scalatest/propspec", "org/scalatest/propspec", targetDir, List.empty) ++
     copyDir("scalatest/src/main/scala/org/scalatest/time", "org/scalatest/time", targetDir, List.empty) ++
     copyDir("scalatest/src/main/scala/org/scalatest/tools", "org/scalatest/tools", targetDir, List.empty) ++
     copyDir("scalatest/src/main/scala/org/scalatest/refspec", "org/scalatest/refspec", targetDir, List.empty) ++
@@ -172,7 +173,8 @@ object GenScalaTestDotty {
         "NotWord.scala",
         "ResultOfNotWordForAny.scala"
       )
-    )
+    ) ++ 
+    copyDir("scalatest/src/main/scala/org/scalatest/wordspec", "org/scalatest/wordspec", targetDir, List.empty)
   }
 
   def genTest(targetDir: File, version: String, scalaVersion: String): Seq[File] = {

project/plugins.sbt

@@ -14,4 +14,4 @@ addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.6")
 
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.2.0")
 
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.3.0")
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.3.3")

project/scalatest.scala

@@ -25,6 +25,8 @@ import com.typesafe.tools.mima.plugin.MimaKeys.{mimaPreviousArtifacts, mimaCurre
 import com.typesafe.tools.mima.core._
 import com.typesafe.tools.mima.core.ProblemFilters._
 
+import dotty.tools.sbtplugin.DottyPlugin.autoImport._
+
 object ScalatestBuild {
 
   // To run gentests
@@ -33,17 +35,17 @@ object ScalatestBuild {
 
   // To enable deprecation warnings on the fly
   // set scalacOptions in ThisBuild ++= Seq("-unchecked", "-deprecation")
-
   // 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-RC3")
 
-  val releaseVersion = "3.1.0-SNAP12"
+  lazy val supportedScalaVersions = List("2.13.0", "2.12.8", "2.11.12", "2.10.7")
+
+  val releaseVersion = "3.1.0-SNAP13"
 
   val previousReleaseVersion = "3.0.5"
 
-  val plusJUnitVersion = "1.0.0-SNAP8"
-  val plusTestNGVersion = "1.0.0-SNAP7"
+  val plusJUnitVersion = "1.0.0-SNAP9"
+  val plusTestNGVersion = "1.0.0-SNAP8"
   val flexmarkVersion = "0.35.10"
 
   val githubTag = "release-3.1.0" // for scaladoc source urls
@@ -174,8 +176,10 @@ 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.2.0")
-      case other => Seq.empty
+      case Some((scalaEpoch, scalaMajor)) if scalaEpoch != 2 || scalaMajor >= 11 =>
+        Seq(("org.scala-lang.modules" %% "scala-xml" % "1.2.0").withDottyCompat(theScalaVersion))
+      case other =>
+        Seq.empty
     }
 
 
@@ -212,15 +216,14 @@ object ScalatestBuild {
       // if scala 2.13+ is used, add dependency on scala-parallel-collections module
       case Some((2, scalaMajor)) if scalaMajor >= 13 =>
         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.2"
         )
 
       case Some((2, scalaMajor)) if scalaMajor >= 11 =>
         Seq("org.scala-lang.modules" %%% "scala-parser-combinators" % "1.1.1")
 
-      case other =>
+      case _ =>
         Seq.empty
     }
   }
@@ -597,6 +600,7 @@ object ScalatestBuild {
     .settings(
       projectTitle := "Scalactic",
       organization := "org.scalactic",
+      moduleName := "scalactic",
       initialCommands in console := "import org.scalactic._",
       sourceGenerators in Compile += {
         Def.task{
@@ -618,12 +622,9 @@ object ScalatestBuild {
           GenScalacticDotty.genResource((resourceManaged in Compile).value)
         }.taskValue
       },
-      // include the macro classes and resources in the main jar
-      mappings in (Compile, packageBin) ++= mappings.in(scalacticMacro, Compile, packageBin).value,
-      // include the macro sources in the main source jar
-      mappings in (Compile, packageSrc) ++= mappings.in(scalacticMacro, Compile, packageSrc).value,
-      scalacticDocSourcesSetting,
-      docTaskSetting,
+      //scalacticDocSourcesSetting,
+      //docTaskSetting,
+      publishArtifact in (Compile, packageDoc) := false, // Temporary disable publishing of doc, can't get it to build.
       mimaPreviousArtifacts := Set(organization.value %% name.value % previousReleaseVersion),
       mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (name.value + "_" + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
     ).settings(osgiSettings: _*).settings(
@@ -950,6 +951,7 @@ object ScalatestBuild {
       initialCommands in console := """|import org.scalatest._
                                        |import org.scalactic._
                                        |import Matchers._""".stripMargin,
+      libraryDependencies ++= scalaXmlDependency(scalaVersion.value),
       libraryDependencies ++= scalatestLibraryDependencies,
       sourceGenerators in Compile += {
         Def.task {
@@ -982,7 +984,8 @@ object ScalatestBuild {
           //GenSafeStyles.genMain((sourceManaged in Compile).value / "org" / "scalatest", version.value, scalaVersion.value)
         }.taskValue
       },
-      scalatestJSDocTaskSetting,
+      //scalatestJSDocTaskSetting,
+      publishArtifact in (Compile, packageDoc) := false, // Temporary disable publishing of doc, can't get it to build.
       mimaPreviousArtifacts := Set(organization.value %% name.value % previousReleaseVersion),
       mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (name.value + "_" + scalaBinaryVersion.value + "-" + releaseVersion + ".jar"),
       mimaBinaryIssueFilters ++= {
@@ -2147,7 +2150,6 @@ object ScalatestBuild {
       (resourceManaged in Compile).value,
       name.value)
 
-  import dotty.tools.sbtplugin.DottyPlugin.autoImport._
   // List of available night build at https://repo1.maven.org/maven2/ch/epfl/lamp/dotty-compiler_0.14/
   lazy val dottyVersion = dottyLatestNightlyBuild.get
   // lazy val dottyVersion = "0.15.0-bin-20190522-ffb250d-NIGHTLY"