Merge pull request #170 from dwijnand/fix-coherence

Fix tagPrefix/vTagPrefix coherence
sbt · Jun 30, 2020 · bf36558 · bf36558
2 parents 2fde6e8 + 1fa500d
commit bf36558
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/src/main/scala/sbtdynver/DynVerPlugin.scala b/src/main/scala/sbtdynver/DynVerPlugin.scala
@@ -55,8 +55,8 @@ object DynVerPlugin extends AutoPlugin {
     previousStableVersion   := dynverGitPreviousStableVersion.value.previousVersion,
 
     dynverInstance := {
-      val tagPrefix = dynverTagPrefix.value
       val vTagPrefix = dynverVTagPrefix.value
+      val tagPrefix = dynverTagPrefix.?.value.getOrElse(if (vTagPrefix) "v" else "")
       assert(vTagPrefix ^ tagPrefix != "v", s"Incoherence: dynverTagPrefix=$tagPrefix vs dynverVTagPrefix=$vTagPrefix")
       DynVer(Some(buildBase.value), dynverSeparator.value, tagPrefix)
     },
@@ -66,8 +66,7 @@ object DynVerPlugin extends AutoPlugin {
     dynverSonatypeSnapshots        := false,
     dynverGitPreviousStableVersion := dynverInstance.value.getGitPreviousStableTag,
     dynverSeparator                := DynVer.separator,
-    dynverTagPrefix                := DynVer.tagPrefix,
-    dynverVTagPrefix               := dynverTagPrefix.value == "v",
+    dynverVTagPrefix               := dynverTagPrefix.??(DynVer.tagPrefix).value == "v",
 
     dynver                  := {
       val dynver = dynverInstance.value

diff --git a/src/sbt-test/dynver/no-v-tag-prefix/build.sbt b/src/sbt-test/dynver/no-v-tag-prefix/build.sbt
@@ -0,0 +1 @@
+dynverVTagPrefix in ThisBuild := false
diff --git a/src/sbt-test/dynver/no-v-tag-prefix/project/plugins.sbt b/src/sbt-test/dynver/no-v-tag-prefix/project/plugins.sbt
@@ -0,0 +1,5 @@
+sys.props.get("plugin.version") match {
+  case Some(x) => addSbtPlugin("com.dwijnand" % "sbt-dynver" % x)
+  case _       => sys.error("""|The system property 'plugin.version' is not defined.
+                               |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
+}
diff --git a/src/sbt-test/dynver/no-v-tag-prefix/test b/src/sbt-test/dynver/no-v-tag-prefix/test
@@ -0,0 +1 @@
+> about