Merge branch 'cheeseng-feature-3.1.0-M1-adjustments' into 3.1.x

Author: bvenners

README.md

@@ -168,3 +168,30 @@ To publish scalactic, scalatest and scalatest-app use the following command:
     $ sbt ++2.12.6 "project scalatestAppJS" clean publishSigned
     $ export SCALAJS_VERSION=1.0.0-M8
     $ sbt ++2.13.0 "project scalatestAppJS" clean publishSigned
+
+To publish scalatest modules for jvm, use the following commands: 
+
+    $ sbt scalatestCompatible/clean scalatestCompatible/publishSigned
+    $ sbt scalatestModules/clean
+    $ sbt +scalatestModules/publishSigned
+
+To publish scalatest modules for js, use the following commands: 
+
+    $ export SCALAJS_VERSION=0.6.28
+    $ sbt scalatestModulesJS/clean
+    $ sbt +scalatestModulesJS/publishSigned
+    $ export SCALAJS_VERSION=1.0.0-M3
+    $ sbt ++2.11.12 "project scalatestModulesJS" clean publishSigned
+    $ sbt ++2.12.6 "project scalatestModulesJS" clean publishSigned
+    $ export SCALAJS_VERSION=1.0.0-M8
+    $ sbt ++2.13.0 "project scalatestModulesJS" clean publishSigned
+
+To publish scalatest modules for native, use the following commands: 
+
+    $ sbt ++2.11.12 scalatestModulesNative/clean
+    $ sbt ++2.11.12 scalatestModulesNative/publishSigned
+
+To publish scalatest modules for Dotty, use the following commands: 
+
+    $ sbt scalatestModulesDotty/clean
+    $ sbt scalatestModulesDotty/publishSigned    

project/BuildCommons.scala

@@ -7,9 +7,9 @@ trait BuildCommons {
 
   lazy val supportedScalaVersions = List("2.13.0", "2.12.8", "2.11.12", "2.10.7")
 
-  val releaseVersion = "3.1.0-SNAP13"
+  val releaseVersion = "3.1.0-M1"
 
-  val previousReleaseVersion = "3.0.5"
+  val previousReleaseVersion = "3.0.8"
 
   def rootProject: Project
 

project/JavaTagDocumenter.scala

@@ -49,7 +49,7 @@ object JavaTagDocumenter {
 
     topDocMat.find()
 
-    val bodyPat = Pattern.compile("""(?sm)(.*? @interface """ + className +
+    val bodyPat = Pattern.compile("""(?sm)(.*? @?interface """ + className +
                                   """) *(\{.*\})""")
     val bodyMat = bodyPat.matcher(topDocMat.group(2))
 
@@ -137,10 +137,14 @@ object JavaTagDocumenter {
       fileContents.contains(
         "Note: This is actually an annotation defined in Java")
 
+    def isMarkerAssertion(fileContents: String): Boolean =
+      fileContents.contains(
+        "Marker trait for ScalaTest-compatible assertion types")  
+
     for {
       srcFile <- javaSources
       val contents = Source.fromFile(srcFile).mkString
-      if isAnnotation(contents)
+      if isAnnotation(contents) || isMarkerAssertion(contents)
     } yield {
       val filename = srcFile.getName
       val className = filename.replaceFirst("""\.java$""", "")
@@ -155,11 +159,14 @@ object JavaTagDocumenter {
       val newTop = genNewTop(top)
       val newBody = genNewBody(body)
       val newContents =
-        newTop
-          .replaceFirst(className + "$",
-                        "trait "+ className +
-                        " extends java.lang.annotation.Annotation "+ newBody +
-                        "\n")
+        if (isMarkerAssertion(contents))
+          newTop.replaceAllLiterally("public interface ", "trait ")
+        else
+          newTop
+            .replaceFirst(className + "$",
+                          "trait "+ className +
+                          " extends java.lang.annotation.Annotation "+ newBody +
+                          "\n")
 
       if (!destFile.exists || (srcFile.lastModified > destFile.lastModified)) {
         createDirectory(file(destFile.getParent))

project/scalatest.scala

@@ -1093,7 +1093,6 @@ object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with
       publishLocal := {},
       scalacOptions in (Compile, doc) := List.empty
     ).aggregate(
-      scalatestCompatible, 
       scalatestCore, 
       scalatestFeatureSpec, 
       scalatestFlatSpec, 

scalatest/src/main/scala/org/scalatest/package.scala

@@ -83,7 +83,7 @@ package object scalatest {
    * trait <code>Assertions</code>, which return its only instance, the <code>Succeeded</code> singleton, or throw
    * an exception that indicates a failed, canceled, or pending test.
    */
-  type Assertion = compatible.Assertion
+  type Assertion = org.scalatest.compatible.Assertion
 
   /**
    * <strong>The name <code>org.scalatest.FunSuiteLike</code> has been deprecated and will be removed in a future version of ScalaTest. Please use