From 85ec868dc4525304b839eec2674d3dce8a9c2a03 Mon Sep 17 00:00:00 2001
From: vlad <vlad@drivergrp.com>
Date: Tue, 20 Sep 2016 17:36:54 -0700
Subject: Putting back git version plugin conf, seems like it is working

---
 src/main/scala/com.drivergrp.sbt/SbtSettings.scala | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 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 dccb36b..19fc934 100644
--- a/src/main/scala/com.drivergrp.sbt/SbtSettings.scala
+++ b/src/main/scala/com.drivergrp.sbt/SbtSettings.scala
@@ -247,8 +247,11 @@ object SbtSettings extends AutoPlugin {
           inquireVersions,
           setReleaseVersion,
           runTest,
+          // commitReleaseVersion, // performs the initial git checks
           tagRelease,
           publishArtifacts,
+          // setNextVersion,
+          // commitNextVersion,
           pushChanges // also checks that an upstream branch is properly configured
         )
       )
@@ -262,9 +265,20 @@ object SbtSettings extends AutoPlugin {
     implicit class driverConfigurations(project: Project) {
 
       def gitPluginConfiguration: Project = {
+        val VersionRegex = "v([0-9]+.[0-9]+.[0-9]+)-?(.*)?".r
+
         project
           .enablePlugins(GitVersioning, GitBranchPrompt)
-          .settings(git.useGitDescribe := true, git.baseVersion := "0.0.0")
+          .settings(
+            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")
+              case _ => None
+            }
+          )
       }
 
       def buildInfoConfiguration: Project = {
@@ -305,6 +319,7 @@ object SbtSettings extends AutoPlugin {
         project
           .enablePlugins(DockerPlugin, JavaAppPackaging)
           .settings(
+            // Settings reference http://www.scala-sbt.org/sbt-native-packager/formats/docker.html
             packageName in Docker := imageName,
             dockerRepository := Some(repository),
             maintainer := "Direct Inc. <info@driver.xyz>",
@@ -318,7 +333,7 @@ object SbtSettings extends AutoPlugin {
             aggregate in Docker := aggregateSubprojects // to include subprojects
           )
 
-        // And then you can run "sbt docker:publishLocal"
+        // And then you can run "sbt docker:publish"
       }
     }
   }
-- 
cgit v1.2.3