Separated org.scalatest.compatible.Assertion java class from scalatest jar, for JVM and dotty.

Author: cheeseng

README.md

@@ -157,6 +157,7 @@ Before publishing any patch release, binary compatibility with previous version
 
 To publish scalactic, scalatest and scalatest-app use the following command:
 
+    $ sbt scalatestCompatible/clean scalatestCompatible/publishSigned
     $ 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
@@ -173,7 +174,6 @@ To publish scalactic, scalatest and scalatest-app use the following command:
 
 To publish scalatest modules for jvm, use the following commands: 
 
-    $ sbt scalatestCompatible/clean scalatestCompatible/publishSigned
     $ sbt scalatestModules/clean
     $ sbt +scalatestModules/publishSigned
 

project/DottyBuild.scala

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

project/GenModules.scala

@@ -34,10 +34,6 @@ 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,7 +117,6 @@ 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

@@ -89,7 +89,67 @@ object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with
     }
   }
 
-  def sharedSettings: Seq[Setting[_]] = Seq(
+  def commonSharedSettings: Seq[Setting[_]] = Seq(
+    javaHome := getJavaHome(scalaBinaryVersion.value),
+    version := releaseVersion,
+    resolvers += "Sonatype Public" at "https://oss.sonatype.org/content/groups/public",
+    publishTo := {
+      val nexus = "https://oss.sonatype.org/"
+      if (version.value.trim.endsWith("SNAPSHOT"))
+        Some("publish-snapshots" at nexus + "content/repositories/snapshots")
+      else
+        Some("publish-releases" at nexus + "service/local/staging/deploy/maven2")
+    },
+    publishMavenStyle := true,
+    publishArtifact in Test := false,
+    pomIncludeRepository := { _ => false },
+    pomExtra := (
+      <url>http://www.scalatest.org</url>
+        <licenses>
+          <license>
+            <name>the Apache License, ASL Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+            <distribution>repo</distribution>
+          </license>
+        </licenses>
+        <scm>
+          <url>https://github.com/scalatest/scalatest</url>
+          <connection>scm:git:git@github.com:scalatest/scalatest.git</connection>
+          <developerConnection>
+            scm:git:git@github.com:scalatest/scalatest.git
+          </developerConnection>
+        </scm>
+        <developers>
+          <developer>
+            <id>bvenners</id>
+            <name>Bill Venners</name>
+            <email>bill@artima.com</email>
+          </developer>
+          <developer>
+            <id>gcberger</id>
+            <name>George Berger</name>
+            <email>george.berger@gmail.com</email>
+          </developer>
+          <developer>
+            <id>cheeseng</id>
+            <name>Chua Chee Seng</name>
+            <email>cheeseng@amaseng.com</email>
+          </developer>
+        </developers>
+      ),
+    credentials += getNexusCredentials,
+    pgpSecretRing := file(getGPGFilePath),
+    pgpPassphrase := getGPGPassphase
+  )
+
+  def sharedSettings: Seq[Setting[_]] = 
+    commonSharedSettings ++ Seq(
+      scalaVersion := "2.13.0",
+      crossScalaVersions := supportedScalaVersions,
+      libraryDependencies ++= scalaLibraries(scalaVersion.value)  
+    )
+  
+  /*Seq(
     javaHome := getJavaHome(scalaBinaryVersion.value),
     scalaVersion := "2.13.0",
     crossScalaVersions := supportedScalaVersions,
@@ -149,7 +209,7 @@ object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with
     credentials += getNexusCredentials,
     pgpSecretRing := file(getGPGFilePath),
     pgpPassphrase := getGPGPassphase
-  )
+  )*/
 
   lazy val scalatestDocSettings = Seq(
     docsrcDirSetting,
@@ -392,7 +452,6 @@ 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",
@@ -438,7 +497,7 @@ object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with
         "Bundle-Vendor" -> "Artima, Inc.",
         "Main-Class" -> "org.scalatest.tools.Runner"
       )
-   ).dependsOn(scalacticMacro % "compile-internal, test-internal", scalactic)
+   ).dependsOn(scalatestCompatible, scalacticMacro % "compile-internal, test-internal", scalactic)
 
   lazy val scalatestTest = Project("scalatest-test", file("scalatest-test"))
     .settings(sharedSettings: _*)
@@ -543,9 +602,9 @@ object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with
 
   lazy val rootProject = scalatestApp
 
-  lazy val scalatestCompatible = Project("scalatestCompatible", file("modules/jvm/scalatest-compatible"))
+  lazy val scalatestCompatible = Project("scalatestCompatible", file("scalatest-compatible"))
     .enablePlugins(SbtOsgi)
-    .settings(sharedSettings: _*)
+    .settings(commonSharedSettings: _*)
     .settings(scalatestDocSettings: _*)
     .settings(
       projectTitle := "ScalaTest Compatible",
@@ -561,11 +620,6 @@ 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")