Skip to content

Commit 1270912

Browse files
pdalprajroper
authored andcommitted
Make version control keys Tasks instead of Settings, close #189 (#194)
1 parent d0f7c29 commit 1270912

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/main/scala/ReleaseExtra.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,13 @@ object ReleaseStateTransformations {
6060
val useDefs = st.get(useDefaults).getOrElse(false)
6161
val currentV = extracted.get(version)
6262

63-
val releaseFunc = extracted.get(releaseVersion)
63+
val releaseFunc = extracted.runTask(releaseVersion, st)._2
6464
val suggestedReleaseV = releaseFunc(currentV)
6565

6666
//flatten the Option[Option[String]] as the get returns an Option, and the value inside is an Option
6767
val releaseV = readVersion(suggestedReleaseV, "Release version [%s] : ", useDefs, st.get(commandLineReleaseVersion).flatten)
6868

69-
val nextFunc = extracted.get(releaseNextVersion)
69+
val nextFunc = extracted.runTask(releaseNextVersion, st)._2
7070
val suggestedNextV = nextFunc(releaseV)
7171
//flatten the Option[Option[String]] as the get returns an Option, and the value inside is an Option
7272
val nextV = readVersion(suggestedNextV, "Next version [%s] : ", useDefs, st.get(commandLineNextVersion).flatten)

src/main/scala/ReleasePlugin.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ object ReleasePlugin extends AutoPlugin {
1313
object autoImport {
1414
val releaseSnapshotDependencies = taskKey[Seq[ModuleID]]("Calculate the snapshot dependencies for a build")
1515
val releaseProcess = settingKey[Seq[ReleaseStep]]("The release process")
16-
val releaseVersion = settingKey[String => String]("The release version")
17-
val releaseNextVersion = settingKey[String => String]("The next release version")
18-
val releaseVersionBump = settingKey[Version.Bump]("How the version should be incremented")
16+
val releaseVersion = taskKey[String => String]("The release version")
17+
val releaseNextVersion = taskKey[String => String]("The next release version")
18+
val releaseVersionBump = taskKey[Version.Bump]("How the version should be incremented")
1919
val releaseTagName = taskKey[String]("The name of the tag")
2020
val releaseTagComment = taskKey[String]("The comment to use when tagging")
2121
val releaseCommitMessage = taskKey[String]("The commit message to use when tagging")

0 commit comments

Comments
 (0)