Fixed error when running MiMa comparing 3.0.4 to 3.0.5, it is good to go in now.

Author: cheeseng

README.md

@@ -119,17 +119,27 @@ With Sonatype credentials and GPG file in place, you can now publish to Sonatype
 
 Before publishing any patch release, binary compatibility with previous version should be checked, using Java 6 (for Scala 2.10 and 2.11):
 
-    $ sbt ++2.11.11 mimaReportBinaryIssues
-    $ sbt ++2.11.11 scalatestAppJS/mimaReportBinaryIssues
-    $ sbt ++2.10.6 mimaReportBinaryIssues
-    $ sbt ++2.10.6 scalatestAppJS/mimaReportBinaryIssues
+    $ sbt ++2.11.11 scalactic/package scalactic/mimaReportBinaryIssues
+    $ sbt ++2.11.11 scalatest/package scalatest/mimaReportBinaryIssues
+    $ sbt ++2.11.11 scalacticJS/package scalacticJS/mimaReportBinaryIssues
+    $ sbt ++2.11.11 scalatestJS/package scalatestJS/mimaReportBinaryIssues
+
+    $ sbt ++2.10.6 scalactic/package scalactic/mimaReportBinaryIssues
+    $ sbt ++2.10.6 scalatest/package scalatest/mimaReportBinaryIssues
+    $ sbt ++2.10.6 scalacticJS/package scalacticJS/mimaReportBinaryIssues
+    $ sbt ++2.10.6 scalatestJS/package scalatestJS/mimaReportBinaryIssues
 
 and using Java 8 (for Scala 2.12 and 2.13): 
 
-    $ sbt ++2.12.4 mimaReportBinaryIssues
-    $ sbt ++2.12.4 scalatestAppJS/mimaReportBinaryIssues
-    $ sbt ++2.13.0-M2 mimaReportBinaryIssues
-    $ sbt ++2.13.0-M2 scalatestAppJS/mimaReportBinaryIssues
+    $ sbt ++2.12.4 scalactic/package scalactic/mimaReportBinaryIssues
+    $ sbt ++2.12.4 scalatest/package scalatest/mimaReportBinaryIssues
+    $ sbt ++2.12.4 scalacticJS/package scalacticJS/mimaReportBinaryIssues
+    $ sbt ++2.12.4 scalatestJS/package scalatestJS/mimaReportBinaryIssues
+
+    $ sbt ++2.13.0-M2 scalactic/package scalactic/mimaReportBinaryIssues
+    $ sbt ++2.13.0-M2 scalatest/package scalatest/mimaReportBinaryIssues
+    $ sbt ++2.13.0-M2 scalacticJS/package scalacticJS/mimaReportBinaryIssues
+    $ sbt ++2.13.0-M2 scalatestJS/package scalatestJS/mimaReportBinaryIssues
 
 To publish scalactic, scalatest and scalatest-app (for Scala and Scala-js, version 2.11 and 2.10, and make sure you're on Java 6) to Sonatype, use the following command:
 

project/plugins.sbt

@@ -4,4 +4,4 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.7.0")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.20")
 
-addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.14")
+addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.18")

project/scalatest.scala

@@ -325,12 +325,15 @@ object ScalatestBuild extends Build {
       publishLocal := {}
     )
 
+  lazy val deleteJsDependenciesTask = taskKey[Unit]("Delete JS_DEPENDENCIES")
+
   lazy val scalacticMacroJS = Project("scalacticMacroJS", file("scalactic-macro.js"))
     .settings(sharedSettings: _*)
     .settings(
       projectTitle := "Scalactic Macro.js",
       organization := "org.scalactic",
       sourceGenerators in Compile += {
+        // We'll delete JS_DEPENDENCIES in scalactic-macro.js
         Def.task{
           GenScalacticJS.genMacroScala((sourceManaged in Compile).value, version.value, scalaVersion.value) ++
           ScalacticGenResourcesJSVM.genResources((sourceManaged in Compile).value / "org" / "scalactic", version.value, scalaVersion.value) ++
@@ -339,7 +342,13 @@ object ScalatestBuild extends Build {
       },
       // Disable publishing macros directly, included in scalactic main jar
       publish := {},
-      publishLocal := {}
+      publishLocal := {}, 
+      deleteJsDependenciesTask <<= (classDirectory in Compile) map { jsDependenciesFile =>
+        (jsDependenciesFile/ "JS_DEPENDENCIES").delete()
+        ()
+        //val loader: ClassLoader = ClasspathUtilities.toLoader(classpath.map(_.data).map(_.getAbsoluteFile))
+        //loader.loadClass("your.class.Here").newInstance()
+      } triggeredBy(compile in Compile)
     ).enablePlugins(ScalaJSPlugin)
 
   lazy val scalactic = Project("scalactic", file("scalactic"))
@@ -403,6 +412,10 @@ object ScalatestBuild extends Build {
           GenScalacticJS.genResource((resourceManaged in Compile).value, version.value, scalaVersion.value)
         }.taskValue
       },
+      // include the macro classes and resources in the main jar
+      mappings in (Compile, packageBin) ++= mappings.in(scalacticMacroJS, Compile, packageBin).value,
+      // include the macro sources in the main source jar
+      mappings in (Compile, packageSrc) ++= mappings.in(scalacticMacroJS, Compile, packageSrc).value,
       mimaPreviousArtifacts := Set(organization.value %%% moduleName.value % previousReleaseVersion),
       mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (moduleName.value + "_" + "sjs0.6_" + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
     ).settings(osgiSettings: _*).settings(
@@ -510,7 +523,13 @@ object ScalatestBuild extends Build {
      },
      docTaskSetting,
      mimaPreviousArtifacts := Set(organization.value %% name.value % previousReleaseVersion),
-     mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (name.value + "_" + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
+     mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (name.value + "_" + scalaBinaryVersion.value + "-" + releaseVersion + ".jar"), 
+     mimaBinaryIssueFilters ++= {
+       Seq(
+         exclude[MissingClassProblem]("org.scalatest.tools.SbtCommandParser$"),
+         exclude[MissingClassProblem]("org.scalatest.tools.SbtCommandParser")
+       )
+     }
    ).settings(osgiSettings: _*).settings(
       OsgiKeys.exportPackage := Seq(
         "org.scalatest",