From c985264622b5b6783b9503ec2fc81f83831468f3 Mon Sep 17 00:00:00 2001
From: Chris Birchall <chris.birchall@47deg.com>
Date: Tue, 21 Jan 2020 10:11:55 +0000
Subject: [PATCH] Fix release process

The steps were in the wrong order, so it was trying to do a bundle
release after setting the version to `-SNAPSHOT`.
---
 project/ProjectPlugin.scala                     | 17 +++++++++++++++++
 .../sbtorgpolicies/settings/AllSettings.scala   |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala
index 5d888b4..561ce0c 100644
--- a/project/ProjectPlugin.scala
+++ b/project/ProjectPlugin.scala
@@ -7,6 +7,8 @@ import sbtorgpolicies.OrgPoliciesPlugin.autoImport._
 import sbtorgpolicies.model.scalac
 import sbtorgpolicies.runnable.syntax._
 import sbtorgpolicies.templates.badges._
+import sbtrelease.ReleasePlugin.autoImport.ReleaseTransformations._
+import sbtrelease.ReleasePlugin.autoImport._
 
 object ProjectPlugin extends AutoPlugin {
 
@@ -61,6 +63,21 @@ object ProjectPlugin extends AutoPlugin {
           )
       },
       scriptedBufferLog := false,
+      // TODO this custom release process can be removed when the cyclic dependency is upgraded to 0.12.3 or newer
+      releaseProcess := Seq[ReleaseStep](
+        orgInitialVcsChecks,
+        checkSnapshotDependencies,
+        orgInquireVersions,
+        if (sbtPlugin.value) releaseStepCommandAndRemaining("^ clean") else runClean,
+        if (sbtPlugin.value) releaseStepCommandAndRemaining("^ test") else runTest,
+        orgTagRelease,
+        orgUpdateChangeLog,
+        if (sbtPlugin.value) releaseStepCommandAndRemaining("^ publishSigned") else publishArtifacts,
+        releaseStepCommandAndRemaining("sonatypeBundleRelease"),
+        setNextVersion,
+        orgCommitNextVersion,
+        orgPostRelease
+      )
     )
 
     lazy val coreSettings: Seq[Def.Setting[_]] = commonSettings ++ Seq(
diff --git a/src/main/scala/sbtorgpolicies/settings/AllSettings.scala b/src/main/scala/sbtorgpolicies/settings/AllSettings.scala
index f567324..6c7d1ee 100644
--- a/src/main/scala/sbtorgpolicies/settings/AllSettings.scala
+++ b/src/main/scala/sbtorgpolicies/settings/AllSettings.scala
@@ -80,9 +80,9 @@ trait AllSettings
       orgTagRelease,
       orgUpdateChangeLog,
       if (sbtPlugin.value) releaseStepCommandAndRemaining("^ publishSigned") else publishArtifacts,
+      releaseStepCommandAndRemaining("sonatypeBundleRelease"),
       setNextVersion,
       orgCommitNextVersion,
-      ReleaseStep(action = "sonatypeBundleRelease" :: _),
       orgPostRelease
     )
   )