diff options
author | vlad <vlad@drivergrp.com> | 2016-09-20 17:36:54 -0700 |
---|---|---|
committer | vlad <vlad@drivergrp.com> | 2016-09-20 17:36:54 -0700 |
commit | 85ec868dc4525304b839eec2674d3dce8a9c2a03 (patch) | |
tree | 83b18184bd5b100a7094fdbe629cdb2a61bf58f6 /src | |
parent | 7f3358d4595b669a54cc436ddc25d6c80aca45f0 (diff) | |
download | sbt-settings-85ec868dc4525304b839eec2674d3dce8a9c2a03.tar.gz sbt-settings-85ec868dc4525304b839eec2674d3dce8a9c2a03.tar.bz2 sbt-settings-85ec868dc4525304b839eec2674d3dce8a9c2a03.zip |
Putting back git version plugin conf, seems like it is working
Diffstat (limited to 'src')
-rw-r--r-- | src/main/scala/com.drivergrp.sbt/SbtSettings.scala | 19 |
1 files changed, 17 insertions, 2 deletions
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" } } } |