From d5d44f9c4c0502b9d9067f034b92f2362d4e7c69 Mon Sep 17 00:00:00 2001 From: vlad Date: Thu, 15 Sep 2016 16:54:37 -0700 Subject: Removed redundant git plugin settings --- src/main/scala/com.drivergrp.sbt/SbtSettings.scala | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/main/scala/com.drivergrp.sbt/SbtSettings.scala b/src/main/scala/com.drivergrp.sbt/SbtSettings.scala index 926cb44..baa4265 100644 --- a/src/main/scala/com.drivergrp.sbt/SbtSettings.scala +++ b/src/main/scala/com.drivergrp.sbt/SbtSettings.scala @@ -266,19 +266,9 @@ 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", - 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 _ => None - }) + .settings(git.useGitDescribe := true, git.baseVersion := "0.0.0") } def buildInfoConfiguration: Project = { @@ -323,6 +313,7 @@ object SbtSettings extends AutoPlugin { dockerRepository := Some(repository), maintainer := "Direct Inc. ", dockerUpdateLatest := true, // to automatic update the latest tag + dockerAlias := DockerAlias(None, None, "docker-alias-test", Some("0.1.0")), dockerExposedPorts := exposedPorts, dockerBaseImage := "java:openjdk-8-jre-alpine", dockerCommands := dockerCommands.value.flatMap { // @see http://blog.codacy.com/2015/07/16/dockerizing-scala/ -- cgit v1.2.3