Introduce separate variable for next commit message of the next devel…

…opment cycle

src/main/scala/ReleaseExtra.scala

@@ -132,16 +132,17 @@ object ReleaseStateTransformations {
 
   lazy val commitReleaseVersion = ReleaseStep(commitReleaseVersionAction, initialVcsChecks)
   private[sbtrelease] lazy val commitReleaseVersionAction = { st: State =>
-    val newState = commitVersion(st)
+    val newState = commitVersion(st, releaseCommitMessage)
     reapply(Seq[Setting[_]](
       packageOptions += ManifestAttributes(
         "Vcs-Release-Hash" -> vcs(st).currentHash
       )
     ), newState)
   }
 
-  lazy val commitNextVersion = ReleaseStep(commitVersion)
-  private[sbtrelease] def commitVersion = { st: State =>
+  lazy val commitNextVersion = {st: State => commitVersion(st, releaseNextCommitMessage)}
+
+  private[sbtrelease] def commitVersion = { (st: State, commitMessage: TaskKey[String]) =>
     val log = toProcessLogger(st)
     val file = st.extract.get(releaseVersionFile).getCanonicalFile
     val base = vcs(st).baseDir.getCanonicalFile
@@ -153,7 +154,7 @@ object ReleaseStateTransformations {
     val status = (vcs(st).status !!) trim
 
     val newState = if (status.nonEmpty) {
-      val (state, msg) = st.extract.runTask(releaseCommitMessage, st)
+      val (state, msg) = st.extract.runTask(commitMessage, st)
       vcs(state).commit(msg, sign, signOff) ! log
       state
     } else {

src/main/scala/ReleasePlugin.scala

@@ -18,6 +18,7 @@ object ReleasePlugin extends AutoPlugin {
     val releaseTagName = taskKey[String]("The name of the tag")
     val releaseTagComment = taskKey[String]("The comment to use when tagging")
     val releaseCommitMessage = taskKey[String]("The commit message to use when tagging")
+    val releaseNextCommitMessage = taskKey[String]("The commit message to use for next iteration")
     val releaseCrossBuild = settingKey[Boolean]("Whether the release should be cross built")
     val releaseVersionFile = settingKey[File]("The file to write the version to")
     val releaseUseGlobalVersion = settingKey[Boolean]("Whether to use a global version")
@@ -234,6 +235,7 @@ object ReleasePlugin extends AutoPlugin {
     releaseTagComment := s"Releasing ${runtimeVersion.value}",
 
     releaseCommitMessage := s"Setting version to ${runtimeVersion.value}",
+    releaseNextCommitMessage := s"Setting version to ${runtimeVersion.value}",
 
     releaseVcs := Vcs.detect(baseDirectory.value),
     releaseVcsSign := false,