diff options
| author | ilovehao <huanghao19866@gmail.com> | 2017-05-09 19:39:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-09 19:39:43 -0700 |
| commit | a70cc51bc99f45c2755edf7eb4a385b8587ca400 (patch) | |
| tree | 41d05e8c2535c6329c8ab29b124d1befc9d7db53 /src | |
| parent | 725f495a01adfb7885be65a47dd8003a60e4aea8 (diff) | |
| parent | ee0b0852c95d5b690a2428347821af9e93b0435b (diff) | |
| download | sbt-settings-a70cc51bc99f45c2755edf7eb4a385b8587ca400.tar.gz sbt-settings-a70cc51bc99f45c2755edf7eb4a385b8587ca400.tar.bz2 sbt-settings-a70cc51bc99f45c2755edf7eb4a385b8587ca400.zip | |
Merge pull request #16 from drivergroup/hao/PDS-959
Fix the release version bump for snapshot version
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/scala/xyz.driver.sbt/SbtSettings.scala | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/main/scala/xyz.driver.sbt/SbtSettings.scala b/src/main/scala/xyz.driver.sbt/SbtSettings.scala index 5f052f1..2bb8def 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 |