W/A for xerial/sbt-sonatype#109

plokhotnyuk · Sep 27, 2019 · 854f69c · 854f69c
1 parent 8846f73
commit 854f69c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/build.sbt b/build.sbt
@@ -17,7 +17,7 @@ lazy val commonSettings = Seq(
       url = url("https://twitter.com/aplokhotnyuk")
     )
   ),
-  resolvers += "Sonatype OSS Staging" at "https://oss.sonatype.org/content/repositories/staging",
+  resolvers += Opts.resolver.sonatypeStaging,
   scalaVersion := "2.13.0",
   javacOptions ++= Seq("-source", "1.8", "-target", "1.8"),
   scalacOptions ++= Seq(
@@ -44,12 +44,12 @@ lazy val commonSettings = Seq(
 
 lazy val noPublishSettings = Seq(
   skip in publish := true,
-  publishTo := sonatypePublishToBundle.value,
+  publishTo := Some(if (isSnapshot.value) Opts.resolver.sonatypeSnapshots else Opts.resolver.sonatypeStaging),
   mimaPreviousArtifacts := Set()  
 )
 
 lazy val publishSettings = Seq(
-  publishTo := sonatypePublishToBundle.value,
+  publishTo := Some(if (isSnapshot.value) Opts.resolver.sonatypeSnapshots else Opts.resolver.sonatypeStaging),
   sonatypeProfileName := "com.github.plokhotnyuk",
   scmInfo := Some(
     ScmInfo(

diff --git a/release.sbt b/release.sbt
@@ -34,7 +34,7 @@ releaseProcess := Seq[ReleaseStep](
   commitReleaseVersion,
   tagRelease,
   releaseStepCommandAndRemaining("+publishSigned"),
-  releaseStepCommand("sonatypeBundleRelease"),
+  releaseStepCommand("sonatypeReleaseAll"),
   setNextVersion,
   commitNextVersion,
   pushChanges