Merge branch 'cheeseng-fix-scaladoc-source-url' into 3.2.x-new

Author: bvenners

project/BuildCommons.scala

@@ -6,7 +6,7 @@ import scala.io.Source
 trait BuildCommons {
 
   lazy val scalaVersionsSettings: Seq[Setting[_]] = Seq(
-    crossScalaVersions := Seq("2.13.5", "2.12.13", "2.11.12", "2.10.7"),
+    crossScalaVersions := Seq("2.13.4", "2.12.13", "2.11.12", "2.10.7"),
     scalaVersion := crossScalaVersions.value.head,
   )
 
@@ -20,8 +20,8 @@ trait BuildCommons {
 
   val previousReleaseVersion = "3.2.6"
 
-  val plusJUnitVersion = "3.2.6.0"
-  val plusTestNGVersion = "3.2.6.0"
+  val plusJUnitVersion = "3.2.7.0"
+  val plusTestNGVersion = "3.2.7.0"
   val flexmarkVersion = "0.36.8"
 
   def rootProject: Project

project/DottyBuild.scala

@@ -14,7 +14,7 @@ trait DottyBuild { this: BuildCommons =>
 
   // List of available night build at https://repo1.maven.org/maven2/ch/epfl/lamp/dotty-compiler_0.27/
   // lazy val dottyVersion = dottyLatestNightlyBuild.get
-  lazy val dottyVersion = System.getProperty("scalatest.dottyVersion", "3.0.0-RC1")
+  lazy val dottyVersion = System.getProperty("scalatest.dottyVersion", "3.0.0-RC2")
   lazy val dottySettings = List(
     scalaVersion := dottyVersion,
     scalacOptions ++= List("-language:implicitConversions", "-noindent", "-Xprint-suspension")
@@ -267,17 +267,18 @@ trait DottyBuild { this: BuildCommons =>
     ).settings(osgiSettings: _*).settings(
     OsgiKeys.exportPackage := Seq(
       "org.scalatest", 
-        "org.scalatest.concurrent",  
-        "org.scalatest.enablers",  
-        "org.scalatest.exceptions",  
-        "org.scalatest.events", 
-        "org.scalatest.fixture",  
-        "org.scalatest.prop", 
-        "org.scalatest.tags", 
-        "org.scalatest.tagobjects", 
-        "org.scalatest.time", 
-        "org.scalatest.tools",  
-        "org.scalatest.verbs"
+      "org.scalatest.compatible", 
+      "org.scalatest.concurrent",  
+      "org.scalatest.enablers",  
+      "org.scalatest.exceptions",  
+      "org.scalatest.events", 
+      "org.scalatest.fixture",  
+      "org.scalatest.prop", 
+      "org.scalatest.tags", 
+      "org.scalatest.tagobjects", 
+      "org.scalatest.time", 
+      "org.scalatest.tools",  
+      "org.scalatest.verbs"
     ),
     OsgiKeys.importPackage := Seq(
       "org.scalatest.*",
@@ -398,7 +399,7 @@ trait DottyBuild { this: BuildCommons =>
 
   lazy val scalatestDiagramsDottyJS = project.in(file("dotty/diagrams.js"))
     .scalatestSubModule(
-      "diagrams", 
+      "scalatest-diagrams", 
       "ScalaTest Diagrams Dotty JS", 
       (targetDir, version, scalaVersion) =>
         GenScalaTestDotty.genDiagramsScalaJS(targetDir / "org" / "scalatest", version, scalaVersion)

project/scalatest.scala

@@ -32,16 +32,6 @@ object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with
   // To temporarily switch sbt to a different Scala version:
   // > ++ 2.10.5
 
-  val githubTag = "release-3.2.7" // for scaladoc source urls
-
-  val scalatestDocSourceUrl =
-    "https://github.com/scalatest/scalatest/tree/"+ githubTag +
-    "/scalatest/€{FILE_PATH}.scala"
-
-  val scalacticDocSourceUrl =
-    "https://github.com/scalatest/scalatest/tree/"+ githubTag +
-      "/scalactic/€{FILE_PATH}.scala"
-
   def envVar(name: String): Option[String] =
     try {
       Some(sys.env(name))
@@ -143,7 +133,7 @@ object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with
   def scalaXmlDependency(theScalaVersion: String): Seq[ModuleID] =
     CrossVersion.partialVersion(theScalaVersion) match {
       case Some((scalaEpoch, scalaMajor)) if scalaEpoch == 3 =>
-        Seq(("org.scala-lang.modules" %% "scala-xml" % "2.0.0-M5"))
+        Seq(("org.scala-lang.modules" %% "scala-xml" % "2.0.0-RC1"))
       case Some((scalaEpoch, scalaMajor)) if scalaEpoch == 2 && scalaMajor >= 11 =>
         Seq(("org.scala-lang.modules" %% "scala-xml" % "1.3.0"))
       case other =>
@@ -546,6 +536,7 @@ object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with
         }.taskValue
       },
       scalatestDocSettings,
+      scalatestDocSourcesSetting,
       unmanagedResourceDirectories in Compile += baseDirectory.value / "scalatest" / "src" / "main" / "resources",
       mimaPreviousArtifacts := Set(organization.value %% name.value % previousReleaseVersion),
       mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (name.value + "_" + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
@@ -1736,6 +1727,12 @@ object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with
                          file(".").getCanonicalFile),
                      docsrcDir.value)
 
+  val scalatestDocSourceUrl =
+    s"https://github.com/scalatest/releases-source/$releaseVersion/scalatest€{FILE_PATH}.scala"
+
+  val scalacticDocSourceUrl =
+    s"https://github.com/scalatest/releases-source/$releaseVersion/scalactic€{FILE_PATH}.scala"
+
   val scalatestDocScalacOptionsSetting =
     scalacOptions in (Compile, doc) :=
       Seq[String](

publish.sh

@@ -14,6 +14,7 @@ sbt ++2.11.12 "project scalacticNative" clean publishSigned
 sbt ++2.12.13 "project scalacticNative" clean publishSigned
 sbt ++2.13.5 "project scalacticNative" clean publishSigned
 sbt "project scalacticDotty" clean publishSigned
+sbt "project scalacticDottyJS" clean publishSigned
 sbt "project scalactic" sonatypeBundleUpload
 
 sbt clean
@@ -35,6 +36,7 @@ sbt ++2.11.12 "project scalatestNative" clean publishSigned
 sbt ++2.12.13 "project scalatestNative" clean publishSigned
 sbt ++2.13.5 "project scalatestNative" clean publishSigned
 sbt "project scalatestDotty" clean publishSigned
+sbt "project scalatestDottyJS" clean publishSigned
 sbt "project scalatest" sonatypeBundleUpload
 
 sbt clean