Merge branch 'feature-3.1.1-release-adjustments' into 3.1.x

Author: bvenners

README.md

@@ -145,15 +145,15 @@ Before publishing any patch release, binary compatibility with previous version
     $ sbt ++2.10.7 scalacticJS/package scalacticJS/mimaReportBinaryIssues
     $ sbt ++2.10.7 scalatestJS/package scalatestJS/mimaReportBinaryIssues
 
-    $ sbt ++2.12.9 scalactic/package scalactic/mimaReportBinaryIssues
-    $ sbt ++2.12.9 scalatest/package scalatest/mimaReportBinaryIssues
-    $ sbt ++2.12.9 scalacticJS/package scalacticJS/mimaReportBinaryIssues
-    $ sbt ++2.12.9 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
+    $ sbt ++2.12.10 scalactic/package scalactic/mimaReportBinaryIssues
+    $ sbt ++2.12.10 scalatest/package scalatest/mimaReportBinaryIssues
+    $ sbt ++2.12.10 scalacticJS/package scalacticJS/mimaReportBinaryIssues
+    $ sbt ++2.12.10 scalatestJS/package scalatestJS/mimaReportBinaryIssues
+
+    $ sbt ++2.13.1 scalactic/package scalactic/mimaReportBinaryIssues
+    $ sbt ++2.13.1 scalatest/package scalatest/mimaReportBinaryIssues
+    $ sbt ++2.13.1 scalacticJS/package scalacticJS/mimaReportBinaryIssues
+    $ sbt ++2.13.1 scalatestJS/package scalatestJS/mimaReportBinaryIssues
 
 To publish scalactic, scalatest and scalatest-app use the following command:
 

project/BuildCommons.scala

@@ -7,9 +7,9 @@ trait BuildCommons {
 
   lazy val supportedScalaVersions = List("2.13.1", "2.12.10", "2.11.12", "2.10.7")
 
-  val releaseVersion = "3.1.0"
+  val releaseVersion = "3.1.1"
 
-  val previousReleaseVersion = "3.0.8"
+  val previousReleaseVersion = "3.1.0"
 
   def rootProject: Project
 

project/DottyBuild.scala

@@ -180,7 +180,7 @@ trait DottyBuild { this: BuildCommons =>
       "Bundle-Vendor" -> "Artima, Inc.",
       "Main-Class" -> "org.scalatest.tools.Runner"
     )
-  ).dependsOn(scalatestCompatible, scalacticDotty)
+  ).dependsOn(scalacticDotty)
 
   lazy val scalatestCoreDotty = Project("scalatestCoreDotty", file("modules/dotty/scalatest-core"))
     .enablePlugins(SbtOsgi)

project/GenModules.scala

@@ -34,6 +34,10 @@ object GenModules {
     }
   }
 
+  def genScalaTestCompatible(targetDir: File, version: String, scalaVersion: String): Seq[File] = { 
+    copyDir("scalatest/src/main/java/org/scalatest/compatible", "org/scalatest/compatible", targetDir,List.empty)
+  }
+
   def genScalaTestCore(targetDir: File, version: String, scalaVersion: String): Seq[File] = {
     copyDir("scalatest/src/main/scala/org/scalatest", "org/scalatest", targetDir, 
       List("package.scala")

project/GenScalaTestDotty.scala

@@ -117,6 +117,7 @@ object GenScalaTestDotty {
         "DoNotDiscover.java",
         "Ignore.java"
       )) ++ 
+    copyDir("scalatest/src/main/java/org/scalatest/compatible", "org/scalatest/compatible", targetDir, List.empty) ++   
     copyDir("scalatest/src/main/java/org/scalatest/tags", "org/scalatest/tags", targetDir, List.empty)  
   }
 

project/scalatest.scala

@@ -453,6 +453,7 @@ object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with
    ).settings(osgiSettings: _*).settings(
       OsgiKeys.exportPackage := Seq(
         "org.scalatest",
+        "org.scalatest.compatible",
         "org.scalatest.concurrent",
         "org.scalatest.check",
         "org.scalatest.diagrams",
@@ -498,7 +499,7 @@ object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with
         "Bundle-Vendor" -> "Artima, Inc.",
         "Main-Class" -> "org.scalatest.tools.Runner"
       )
-   ).dependsOn(scalatestCompatible, scalacticMacro % "compile-internal, test-internal", scalactic)
+   ).dependsOn(scalacticMacro % "compile-internal, test-internal", scalactic)
 
   lazy val scalatestTest = Project("scalatest-test", file("scalatest-test"))
     .settings(sharedSettings: _*)
@@ -603,7 +604,7 @@ object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with
 
   lazy val rootProject = Project("root", file(".")).aggregate(scalacticMacro, scalactic, scalatest, commonTest, scalacticTest, scalatestTest)
 
-  lazy val scalatestCompatible = Project("scalatestCompatible", file("scalatest-compatible"))
+  lazy val scalatestCompatible = Project("scalatestCompatible", file("modules/jvm/scalatest-compatible"))
     .enablePlugins(SbtOsgi)
     .settings(commonSharedSettings: _*)
     .settings(scalatestDocSettings: _*)
@@ -621,6 +622,11 @@ object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with
           Seq.empty[File]
         }.taskValue
       },
+      sourceGenerators in Compile += {
+        Def.task{
+          GenModules.genScalaTestCompatible((javaSourceManaged in Compile).value, version.value, scalaVersion.value)
+        }.taskValue
+      },
       scalatestDocSettings,
       mimaPreviousArtifacts := Set(organization.value %% name.value % previousReleaseVersion),
       mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (name.value + "_" + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")

publish.sh

@@ -1,8 +1,10 @@
 sbt clean
 sbt "project scalactic" clean +publishSigned
 export SCALAJS_VERSION=0.6.32
+sbt "project scalacticMacroJS" clean
 sbt "project scalacticJS" clean +publishSigned
 export SCALAJS_VERSION=1.0.0
+sbt "project scalacticMacroJS" clean
 sbt ++2.11.12 "project scalacticJS" clean publishSigned
 sbt ++2.12.10 "project scalacticJS" clean publishSigned
 sbt ++2.13.1 "project scalacticJS" clean publishSigned