Merge branch 'cheeseng-3.1-sbt-sonatype' into 3.1.x

Author: bvenners

README.md

@@ -157,17 +157,4 @@ 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
-    $ sbt ++2.12.10 "project scalatestApp" clean publishSigned "project scalatestAppJS" clean publishSigned
-    $ sbt ++2.13.0 "project scalatestApp" clean publishSigned "project scalatestAppJS" clean publishSigned    
-    $ sbt ++2.11.12 "project scalatestAppNative" clean publishSigned
-    $ export SCALAJS_VERSION=1.0.0-M3
-    $ sbt ++2.11.12 "project scalatestAppJS" clean publishSigned
-    $ sbt ++2.12.6 "project scalatestAppJS" clean publishSigned
-    $ export SCALAJS_VERSION=1.0.0-M8
-    $ sbt ++2.13.0 "project scalatestAppJS" clean publishSigned
-    $ sbt scalacticDotty/clean scalacticDotty/publishSigned
-    $ sbt scalatestDotty/clean scalatestDotty/publishSigned   
+    $ ./publish.sh

project/BuildCommons.scala

@@ -7,7 +7,7 @@ trait BuildCommons {
 
   lazy val supportedScalaVersions = List("2.13.0", "2.12.10", "2.11.12", "2.10.7")
 
-  val releaseVersion = "3.1.0-RC3"
+  val releaseVersion = "3.1.0-RC4"
 
   val previousReleaseVersion = "3.0.8"
 
@@ -133,4 +133,4 @@ trait BuildCommons {
     doc in Compile := docTask((doc in Compile).value,
                               (sourceDirectory in Compile).value,
                               name.value)
-}
+}

project/plugins.sbt

@@ -1,3 +1,5 @@
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8")
+
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.4")

project/scalatest.scala

@@ -19,6 +19,8 @@ import com.typesafe.tools.mima.core.ProblemFilters._
 
 import dotty.tools.sbtplugin.DottyPlugin.autoImport._
 
+import xerial.sbt.Sonatype.autoImport.sonatypePublishToBundle
+
 object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with JsBuild {
 
   // To run gentests
@@ -93,13 +95,7 @@ object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with
     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")
-    },
+    publishTo := sonatypePublishToBundle.value, 
     publishMavenStyle := true,
     publishArtifact in Test := false,
     pomIncludeRepository := { _ => false },

publish.sh

@@ -0,0 +1,10 @@
+sbt scalatestCompatible/clean scalatestCompatible/publishSigned
+export SCALAJS_VERSION=0.6.29
+sbt "project scalatestApp" clean +publishSigned 
+sbt "project scalatestAppJS" clean +publishSigned
+export SCALAJS_VERSION=1.0.0-M8
+sbt "project scalatestAppJS" clean +publishSigned
+sbt ++2.11.12 "project scalatestAppNative" clean publishSigned
+sbt scalacticDotty/clean scalacticDotty/publishSigned
+sbt scalatestDotty/clean scalatestDotty/publishSigned
+sbt sonatypeBundleUpload