diff options
| author | vlad <vlad@drivergrp.com> | 2016-09-21 14:32:16 -0700 |
|---|---|---|
| committer | vlad <vlad@drivergrp.com> | 2016-09-21 14:32:16 -0700 |
| commit | 7913d03b3b5773398789c247f12d8a7ff3750cd7 (patch) | |
| tree | 5cf477ce47e324922bc2acc3d578aa2f76d00e28 | |
| parent | cd757767cab291aaf7de483684f93eda7a0077d9 (diff) | |
| download | sbt-settings-7913d03b3b5773398789c247f12d8a7ff3750cd7.tar.gz sbt-settings-7913d03b3b5773398789c247f12d8a7ff3750cd7.tar.bz2 sbt-settings-7913d03b3b5773398789c247f12d8a7ff3750cd7.zip | |
Fixed versions for current changes
| -rw-r--r-- | src/main/scala/com.drivergrp.sbt/SbtSettings.scala | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/src/main/scala/com.drivergrp.sbt/SbtSettings.scala b/src/main/scala/com.drivergrp.sbt/SbtSettings.scala index d11746f..96462b6 100644 --- a/src/main/scala/com.drivergrp.sbt/SbtSettings.scala +++ b/src/main/scala/com.drivergrp.sbt/SbtSettings.scala @@ -278,9 +278,27 @@ object SbtSettings extends AutoPlugin { git.useGitDescribe := true, git.baseVersion := "0.0.0", git.gitTagToVersionNumber := { - case VersionRegex(v, "SNAPSHOT") => Some(s"$v-SNAPSHOT") - case VersionRegex(v, "") => Some(v) - case VersionRegex(v, s) => Some(s"$v-$s-SNAPSHOT") + case VersionRegex(v, "SNAPSHOT") => + val ver = Version(v) + .map(_.withoutQualifier) + .map(_.bump(sbtrelease.Version.Bump.Bugfix).string).getOrElse(versionFormatError) + + Some(s"$ver-SNAPSHOT") + + case VersionRegex(v, "") => + val ver = Version(v) + .map(_.withoutQualifier) + .map(_.bump(sbtrelease.Version.Bump.Bugfix).string).getOrElse(versionFormatError) + + Some(ver) + + case VersionRegex(v, s) => + val ver = Version(v) + .map(_.withoutQualifier) + .map(_.bump(sbtrelease.Version.Bump.Bugfix).string).getOrElse(versionFormatError) + + Some(s"$ver-$s-SNAPSHOT") + case _ => None } ) |