diff options
| author | vlad <vlad@driver.xyz> | 2017-05-17 21:15:25 -0700 |
|---|---|---|
| committer | vlad <vlad@driver.xyz> | 2017-05-17 21:15:25 -0700 |
| commit | c42d357132fccca8e3983aa103f48eb08e45b740 (patch) | |
| tree | 428eb64ef3ce54ff1504c1b4e0fed00ea0ddc8e6 | |
| parent | 74315119ffef3bc6fdc17f64af4b33ba149dd8d3 (diff) | |
| parent | bacd076105f5ba6d80c3fee153e63311a6b88c04 (diff) | |
| download | sbt-settings-c42d357132fccca8e3983aa103f48eb08e45b740.tar.gz sbt-settings-c42d357132fccca8e3983aa103f48eb08e45b740.tar.bz2 sbt-settings-c42d357132fccca8e3983aa103f48eb08e45b740.zip | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | src/main/scala/xyz.driver.sbt/SbtSettings.scala | 7 | ||||
| -rw-r--r-- | version.sbt | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/main/scala/xyz.driver.sbt/SbtSettings.scala b/src/main/scala/xyz.driver.sbt/SbtSettings.scala index f3608be..942a339 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 diff --git a/version.sbt b/version.sbt index 8d69874..ae16556 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "0.7.36-SNAPSHOT" +version in ThisBuild := "0.7.37-SNAPSHOT" |