Fixing some bugs.

This commit is contained in:
Pat Garrity 2024-03-08 22:00:00 -06:00
parent 73f35a406d
commit 417ffa6375
Signed by: pfm
GPG key ID: 5CA5D21BAB7F3A76
2 changed files with 21 additions and 21 deletions

View file

@ -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

View file

@ -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 := 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}")
}
} ,
calVer := CalVer.render(calVerPattern.value).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}")
}
)
}