Skip to content

Commit 32e4635

Browse files
committed
Print offending version in version format error
When versions are derived/generated, this can be helpful for figuring out what the failing version number was.
1 parent 065b3db commit 32e4635

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/main/scala/ReleaseExtra.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ object ReleaseStateTransformations {
281281
else if (useDef) ver
282282
else SimpleReader.readLine(prompt format ver) match {
283283
case Some("") => ver
284-
case Some(input) => Version(input).map(_.string).getOrElse(versionFormatError)
284+
case Some(input) => Version(input).map(_.string).getOrElse(versionFormatError(input))
285285
case None => sys.error("No version provided!")
286286
}
287287
}

src/main/scala/ReleasePlugin.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,10 @@ object ReleasePlugin extends AutoPlugin {
222222
snapshots
223223
},
224224

225-
releaseVersion := { ver => Version(ver).map(_.withoutQualifier.string).getOrElse(versionFormatError) },
225+
releaseVersion := { ver => Version(ver).map(_.withoutQualifier.string).getOrElse(versionFormatError(ver)) },
226226
releaseVersionBump := Version.Bump.default,
227227
releaseNextVersion := {
228-
ver => Version(ver).map(_.bump(releaseVersionBump.value).asSnapshot.string).getOrElse(versionFormatError)
228+
ver => Version(ver).map(_.bump(releaseVersionBump.value).asSnapshot.string).getOrElse(versionFormatError(ver))
229229
},
230230
releaseUseGlobalVersion := true,
231231
releaseCrossBuild := false,

src/main/scala/package.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package object sbtrelease {
22
type Versions = (String, String)
33

4-
def versionFormatError = sys.error("Version format is not compatible with " + Version.VersionR.pattern.toString)
4+
def versionFormatError(version: String) = sys.error(s"Version [$version] format is not compatible with " + Version.VersionR.pattern.toString)
55
}

0 commit comments

Comments
 (0)