From ee0b0852c95d5b690a2428347821af9e93b0435b Mon Sep 17 00:00:00 2001 From: Hao Huang Date: Tue, 9 May 2017 14:09:26 -0700 Subject: Fix the release version bump for snapshot version --- src/main/scala/xyz.driver.sbt/SbtSettings.scala | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/scala/xyz.driver.sbt/SbtSettings.scala b/src/main/scala/xyz.driver.sbt/SbtSettings.scala index 539a5a4..cc15406 100644 --- a/src/main/scala/xyz.driver.sbt/SbtSettings.scala +++ b/src/main/scala/xyz.driver.sbt/SbtSettings.scala @@ -187,7 +187,12 @@ object SbtSettings extends AutoPlugin { // Check http://blog.byjean.eu/2015/07/10/painless-release-with-sbt.html for details releaseVersionBump := sbtrelease.Version.Bump.Bugfix, releaseVersion := { ver => - Version(ver).map(_.bumpBugfix.withoutQualifier.string).getOrElse(versionFormatError) + ver match { + case snapshotVersion if snapshotVersion.endsWith("-SNAPSHOT") => + Version(ver).map(_.withoutQualifier.string).getOrElse(versionFormatError) + case _ => + Version(ver).map(_.bumpBugfix.withoutQualifier.string).getOrElse(versionFormatError) + } }, showReleaseVersion <<= (version, releaseVersion)((v, f) => f(v)), releaseProcess := releaseProcessSteps -- cgit v1.2.3 From 3208d36b4889cc8ba0dd43fc65dd4c10a1635d5f Mon Sep 17 00:00:00 2001 From: Hao Huang Date: Wed, 10 May 2017 10:07:01 -0700 Subject: Setting version to 0.7.36 --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index 8d69874..0bbaecf 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "0.7.36-SNAPSHOT" +version in ThisBuild := "0.7.36" -- cgit v1.2.3 From bacd076105f5ba6d80c3fee153e63311a6b88c04 Mon Sep 17 00:00:00 2001 From: Hao Huang Date: Wed, 10 May 2017 10:07:09 -0700 Subject: Setting version to 0.7.37-SNAPSHOT --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index 0bbaecf..ae16556 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "0.7.36" +version in ThisBuild := "0.7.37-SNAPSHOT" -- cgit v1.2.3