From 94c09d4fa65d6f65d88558b0e5c0c14066c176ec Mon Sep 17 00:00:00 2001 From: vlad Date: Wed, 21 Sep 2016 14:06:55 -0700 Subject: Fixed versions for releases --- src/main/scala/com.drivergrp.sbt/SbtSettings.scala | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/main/scala/com.drivergrp.sbt/SbtSettings.scala') diff --git a/src/main/scala/com.drivergrp.sbt/SbtSettings.scala b/src/main/scala/com.drivergrp.sbt/SbtSettings.scala index 59020ff..d11746f 100644 --- a/src/main/scala/com.drivergrp.sbt/SbtSettings.scala +++ b/src/main/scala/com.drivergrp.sbt/SbtSettings.scala @@ -218,6 +218,7 @@ object SbtSettings extends AutoPlugin { credentials += Credentials("Artifactory Realm", "drivergrp.jfrog.io", "sbt-publisher", "***REMOVED***")) lazy val releaseSettings = { + def setVersionOnly(selectVersion: Versions => String): ReleaseStep = { st: State => val vs = st.get(ReleaseKeys.versions).getOrElse( sys.error("No versions are set! Was this release part executed before inquireVersions?")) @@ -233,15 +234,19 @@ object SbtSettings extends AutoPlugin { lazy val setReleaseVersion: ReleaseStep = setVersionOnly(_._1) + val showNextVersion = settingKey[String]("the future version once releaseNextVersion has been applied to it") + val showReleaseVersion = settingKey[String]("the future version once releaseNextVersion has been applied to it") Seq( releaseIgnoreUntrackedFiles := true, // Check http://blog.byjean.eu/2015/07/10/painless-release-with-sbt.html for details - releaseVersionBump := sbtrelease.Version.Bump.Minor, - releaseVersion <<= releaseVersionBump(bumper => { - ver => Version(ver) + releaseVersionBump := sbtrelease.Version.Bump.Bugfix, + releaseNextVersion <<= releaseVersionBump(bumper => { ver => + Version(ver) .map(_.withoutQualifier) - .map(_.bump(bumper).string).getOrElse(versionFormatError) + .map(_.bump(bumper).string + "-SNAPSHOT").getOrElse(versionFormatError) }), + showReleaseVersion <<= (version, releaseVersion)((v,f) => f(v)), + showNextVersion <<= (version, releaseNextVersion)((v,f) => f(v)), releaseProcess := Seq[ReleaseStep]( checkSnapshotDependencies, inquireVersions, -- cgit v1.2.3