From 417ffa6375991dd3325697bdd8c93c437e290468 Mon Sep 17 00:00:00 2001
From: Pat Garrity <pfm@garrity.co>
Date: Fri, 8 Mar 2024 22:00:00 -0600
Subject: [PATCH] Fixing some bugs.

---
 build.sbt                            |  2 +-
 src/main/scala/gs/CalVerPlugin.scala | 40 ++++++++++++++--------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/build.sbt b/build.sbt
index 9276ce8..53e5e40 100644
--- a/build.sbt
+++ b/build.sbt
@@ -28,7 +28,7 @@ lazy val IsRelease: Boolean =
 lazy val Modifier: String =
   if (IsRelease) "" else "-SNAPSHOT"
 
-val DefaultVersion: String = "0.1.0-SNAPSHOT"
+val DefaultVersion: String = "0.1.2-SNAPSHOT"
 
 lazy val SelectedVersion: String =
   InputVersion
diff --git a/src/main/scala/gs/CalVerPlugin.scala b/src/main/scala/gs/CalVerPlugin.scala
index 58397ff..0c74304 100644
--- a/src/main/scala/gs/CalVerPlugin.scala
+++ b/src/main/scala/gs/CalVerPlugin.scala
@@ -11,22 +11,27 @@ object CalVerPlugin extends AutoPlugin {
 
   // Perform all version calculations and expose as a variable.
   lazy val calVerDefaults: Seq[Setting[_]] = {
-    val isRelease = PluginProperties.isRelease()
     Seq(
-      calVerReleasePattern := calVerReleasePattern.value.orElse(
-        Some(CalVer.Defaults.ReleasePattern)
-      ), 
-      calVerPreReleasePattern := calVerPreReleasePattern.value.orElse(
-        Some(CalVer.Defaults.PreReleasePattern)
-      ),
-      calVerPattern := { 
-        if (isRelease) {
-          calVerReleasePattern.value.getOrElse(CalVer.Defaults.ReleasePattern)
-        } else {
-          calVerPreReleasePattern.value.getOrElse(CalVer.Defaults.PreReleasePattern)
-        }
-      } ,
-      calVer := CalVer.render(calVerPattern.value).value
+      calVerReleasePattern := Some(CalVer.Defaults.ReleasePattern), 
+      calVerPreReleasePattern := Some(CalVer.Defaults.PreReleasePattern),
+    )
+  }
+
+  override lazy val projectSettings: Seq[Setting[_]] = {
+    val isRelease = PluginProperties.isRelease()
+      
+    Seq(
+      calVerPattern := { if (isRelease) {
+        calVerReleasePattern.value.getOrElse(CalVer.Defaults.ReleasePattern)
+      } else {
+        calVerPreReleasePattern.value.getOrElse(CalVer.Defaults.PreReleasePattern)
+      }},
+      calVer := CalVer.render(calVerPattern.value).value,
+      calVerInfo := {
+        val log = Keys.streams.value.log
+        log.info(s"[CalVer] Version: ${calVer.value}")
+        log.info(s"[CalVer] Pattern: ${calVerPattern.value}")
+      }
     )
   }
 
@@ -35,11 +40,6 @@ object CalVerPlugin extends AutoPlugin {
 
   // Add the custom task.
   override lazy val buildSettings: Seq[Setting[_]] = Seq(
-    calVerInfo := {
-      val log = Keys.streams.value.log
-      log.info(s"[CalVer] Version: ${calVer.value}")
-      log.info(s"[CalVer] Pattern: ${calVerPattern.value}")
-    }
   )
 
 }