diff options
| author | vlad <vlad@drivergrp.com> | 2016-11-16 20:49:54 -0800 |
|---|---|---|
| committer | vlad <vlad@drivergrp.com> | 2016-11-16 20:49:54 -0800 |
| commit | d573c4ad6a128d41db1dc84d6e49c98bde6b28aa (patch) | |
| tree | 0d711630e69caf990c37f412d42aab73d6008c83 | |
| parent | e3c20c0df6a7289871a477d8b3534408bfac7639 (diff) | |
| download | sbt-settings-d573c4ad6a128d41db1dc84d6e49c98bde6b28aa.tar.gz sbt-settings-d573c4ad6a128d41db1dc84d6e49c98bde6b28aa.tar.bz2 sbt-settings-d573c4ad6a128d41db1dc84d6e49c98bde6b28aa.zip | |
Fix -SNAPSHOT-SNAPSHOT in sbt version
| -rw-r--r-- | src/main/scala/xyz.driver.sbt/SbtSettings.scala | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/main/scala/xyz.driver.sbt/SbtSettings.scala b/src/main/scala/xyz.driver.sbt/SbtSettings.scala index 1942b85..981c29e 100644 --- a/src/main/scala/xyz.driver.sbt/SbtSettings.scala +++ b/src/main/scala/xyz.driver.sbt/SbtSettings.scala @@ -387,7 +387,12 @@ object SbtSettings extends AutoPlugin { "org.scalaz" %% "scalaz-core" % "7.2.4", "com.lihaoyi" %% "acyclic" % "0.1.4" % "provided" ), - + version <<= version(v => { + // Sbt release versioning based on git given double -SNAPSHOT suffix + // if current commit is not tagged AND there are uncommitted changes (e.g., some file is modified), + // this setting fixes that, by just removing double -SNAPSHOT if it happened somehow + Option(v).map(vv => vv.replaceAll("-SNAPSHOT-SNAPSHOT", "-SNAPSHOT")).getOrElse("0.0.0") + }), fork := true ) } |