From d573c4ad6a128d41db1dc84d6e49c98bde6b28aa Mon Sep 17 00:00:00 2001 From: vlad Date: Wed, 16 Nov 2016 20:49:54 -0800 Subject: Fix -SNAPSHOT-SNAPSHOT in sbt version --- src/main/scala/xyz.driver.sbt/SbtSettings.scala | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/main') 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 ) } -- cgit v1.2.3