Merge branch 'cheeseng-fix-cannot-close-release-problem' into 3.1.x

Author: bvenners

build.sbt

@@ -101,4 +101,5 @@ lazy val scalatestDiagramsDotty = ScalatestBuild.scalatestDiagramsDotty
 lazy val scalatestMatchersCoreDotty = ScalatestBuild.scalatestMatchersCoreDotty
 lazy val scalatestShouldMatchersDotty = ScalatestBuild.scalatestShouldMatchersDotty
 lazy val scalatestMustMatchersDotty = ScalatestBuild.scalatestMustMatchersDotty
-lazy val scalatestModulesDotty = ScalatestBuild.scalatestModulesDotty
+lazy val scalatestModulesDotty = ScalatestBuild.scalatestModulesDotty
+lazy val rootProject = ScalatestBuild.rootProject

project/JsBuild.scala

@@ -276,7 +276,7 @@ trait JsBuild { this: BuildCommons =>
         "Bundle-Vendor" -> "Artima, Inc.",
         "Main-Class" -> "org.scalatest.tools.Runner"
       )
-    ).dependsOn(scalacticMacroJS % "compile-internal, test-internal", scalacticJS % "compile-internal", scalatestJS % "compile-internal").aggregate(scalacticMacroJS, scalacticJS, scalatestJS, commonTestJS, scalacticTestJS, scalatestTestJS).enablePlugins(ScalaJSPlugin)  
+    ).dependsOn(scalacticMacroJS % "compile-internal, test-internal", scalacticJS % "compile-internal", scalatestJS % "compile-internal").enablePlugins(ScalaJSPlugin)  
 
   def scalatestTestJSOptions =
     Seq(Tests.Argument(TestFrameworks.ScalaTest,

project/NativeBuild.scala

@@ -210,7 +210,7 @@ trait NativeBuild { this: BuildCommons =>
             (new File(crossTarget.value, "classes")).mkdirs()
             Seq.empty[File]
           }.taskValue
-        }
+        }, 
       ).settings(osgiSettings: _*).settings(
         OsgiKeys.exportPackage := Seq(
           "org.scalatest",
@@ -262,7 +262,7 @@ trait NativeBuild { this: BuildCommons =>
           "Bundle-Vendor" -> "Artima, Inc.",
           "Main-Class" -> "org.scalatest.tools.Runner"
         )
-      ).dependsOn(scalacticMacroNative % "compile-internal, test-internal", scalacticNative % "compile-internal", scalatestNative % "compile-internal").aggregate(scalacticMacroNative, scalacticNative, scalatestNative, commonTestNative, scalacticTestNative, scalatestTestNative).enablePlugins(ScalaNativePlugin)
+      ).dependsOn(scalacticMacroNative % "compile-internal, test-internal", scalacticNative % "compile-internal", scalatestNative % "compile-internal").enablePlugins(ScalaNativePlugin)
 
   lazy val scalatestCoreNative = Project("scalatestCoreNative", file("modules/native/scalatest-core.native"))
     .enablePlugins(SbtOsgi)

project/scalatest.scala

@@ -514,7 +514,7 @@ object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with
       scalacOptions ++= (if (scalaBinaryVersion.value == "2.10" || scalaVersion.value.startsWith("2.13")) Seq.empty[String] else Seq("-Ypartial-unification"))
     ).dependsOn(scalatest % "test", commonTest % "test")
 
-  lazy val scalatestApp = Project("scalatestApp", file("."))
+  lazy val scalatestApp = Project("scalatestApp", file("scalatest-app"))
     .enablePlugins(SbtOsgi)
     .settings(sharedSettings: _*)
     .settings(scalatestDocSettings: _*)
@@ -594,9 +594,9 @@ 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 % "compile-internal", scalatest % "compile-internal").aggregate(scalacticMacro, scalactic, scalatest, commonTest, scalacticTest, scalatestTest)
+    ).dependsOn(scalacticMacro % "compile-internal, test-internal", scalactic % "compile-internal", scalatest % "compile-internal")
 
-  lazy val rootProject = scalatestApp
+  lazy val rootProject = Project("root", file(".")).aggregate(scalacticMacro, scalactic, scalatest, commonTest, scalacticTest, scalatestTest)
 
   lazy val scalatestCompatible = Project("scalatestCompatible", file("scalatest-compatible"))
     .enablePlugins(SbtOsgi)

publish.sh

@@ -1,12 +1,35 @@
+sbt clean
+sbt "project scalactic" clean +publishSigned
+export SCALAJS_VERSION=0.6.31
+sbt "project scalacticJS" clean +publishSigned
+export SCALAJS_VERSION=1.0.0-M8
+sbt ++2.11.12 "project scalacticJS" clean publishSigned
+sbt ++2.12.10 "project scalacticJS" clean publishSigned
+sbt ++2.13.1 "project scalacticJS" clean publishSigned
+sbt ++2.11.12 "project scalacticNative" clean publishSigned
+sbt "project scalacticDotty" clean publishSigned
+sbt "project scalactic" sonatypeBundleUpload
+
+sbt clean
 sbt scalatestCompatible/clean scalatestCompatible/publishSigned
+sbt "project scalatest" clean +publishSigned
+export SCALAJS_VERSION=0.6.31
+sbt "project scalatestJS" clean +publishSigned
+export SCALAJS_VERSION=1.0.0-M8
+sbt ++2.11.12 "project scalatestJS" clean publishSigned
+sbt ++2.12.10 "project scalatestJS" clean publishSigned
+sbt ++2.13.1 "project scalatestJS" clean publishSigned
+sbt ++2.11.12 "project scalatestNative" clean publishSigned
+sbt "project scalatestDotty" clean publishSigned
+sbt "project scalatest" sonatypeBundleUpload
+
+sbt clean
+sbt "project scalatestApp" clean +publishSigned
 export SCALAJS_VERSION=0.6.31
-sbt "project scalatestApp" clean +publishSigned 
 sbt "project scalatestAppJS" clean +publishSigned
 export SCALAJS_VERSION=1.0.0-M8
 sbt ++2.11.12 "project scalatestAppJS" clean publishSigned
 sbt ++2.12.10 "project scalatestAppJS" clean publishSigned
 sbt ++2.13.1 "project scalatestAppJS" clean publishSigned
 sbt ++2.11.12 "project scalatestAppNative" clean publishSigned
-sbt scalacticDotty/clean scalacticDotty/publishSigned
-sbt scalatestDotty/clean scalatestDotty/publishSigned
 sbt sonatypeBundleUpload