From 7913d03b3b5773398789c247f12d8a7ff3750cd7 Mon Sep 17 00:00:00 2001 From: vlad Date: Wed, 21 Sep 2016 14:32:16 -0700 Subject: Fixed versions for current changes --- src/main/scala/com.drivergrp.sbt/SbtSettings.scala | 24 +++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'src/main/scala/com.drivergrp.sbt/SbtSettings.scala') 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 } ) -- cgit v1.2.3