Upgrade sbt-sonatype, sbt-pgp

The new sbt-sonatype adds a command to publish all modules in one
step (`sonatypeBundleRelease`) which should avoid getting into
inconsistent states (#7190, #6922).

Author: smarter

.drone.yml

@@ -135,7 +135,7 @@ steps:
   - test_java11
   commands:
   - ./project/scripts/sbt dist-bootstrapped/packArchive
-  - ./project/scripts/sbtPublish ";dotty-bootstrapped/publishSigned ;sonatypeRelease"
+  - ./project/scripts/sbtPublish ";dotty-bootstrapped/publishSigned ;sonatypeBundleRelease"
   environment:
     PGP_PW:
       from_secret: pgp_pw
@@ -177,7 +177,7 @@ steps:
   - test_sbt
   - test_java11
   commands:
-  - ./project/scripts/sbtPublish ";sbt-dotty/publishSigned ;sonatypeRelease"
+  - ./project/scripts/sbtPublish ";sbt-dotty/publishSigned ;sonatypeBundleRelease"
   environment:
     PGP_PW:
       from_secret: pgp_pw

project/Build.scala

@@ -13,6 +13,7 @@ import sbt.plugins.SbtPlugin
 import sbt.ScriptedPlugin.autoImport._
 import xerial.sbt.pack.PackPlugin
 import xerial.sbt.pack.PackPlugin.autoImport._
+import xerial.sbt.Sonatype.autoImport._
 
 import dotty.tools.sbtplugin.DottyPlugin.autoImport._
 import dotty.tools.sbtplugin.DottyPlugin.makeScalaInstance
@@ -1150,12 +1151,7 @@ object Build {
   lazy val publishSettings = Seq(
     publishMavenStyle := true,
     isSnapshot := version.value.contains("SNAPSHOT"),
-    publishTo := Some(
-      if (isSnapshot.value)
-        Opts.resolver.sonatypeSnapshots
-      else
-        Opts.resolver.sonatypeStaging
-    ),
+    publishTo := sonatypePublishToBundle.value,
     publishArtifact in Test := false,
     homepage := Some(url(dottyGithubUrl)),
     licenses += ("BSD New",

project/plugins.sbt

@@ -4,9 +4,9 @@
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0-M8")
 
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.1")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.6")
 
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0-M2")
 
 addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.10.1")