branch-merge-2.8.x (76a04740a)

.travis.yml

@@ -9,6 +9,8 @@ addons:
     packages:
       # Install xmllint used to get Akka HTTP version
       - libxml2-utils
+git:
+  depth: false # Avoid sbt-dynver not seeing the tag
 
 env:
   global:

build.sbt

@@ -13,6 +13,20 @@ import sbt._
 import sbt.io.Path._
 import org.scalafmt.sbt.ScalafmtPlugin
 
+// Customise sbt-dynver's behaviour to make it work with tags which aren't v-prefixed
+dynverVTagPrefix in ThisBuild := false
+
+// Sanity-check: assert that version comes from a tag (e.g. not a too-shallow clone)
+// https://github.com/dwijnand/sbt-dynver/#sanity-checking-the-version
+Global / onLoad := (Global / onLoad).value.andThen { s =>
+  val v = version.value
+  if (dynverGitDescribeOutput.value.hasNoTags)
+    throw new MessageOnlyException(
+      s"Failed to derive version from git tags. Maybe run `git fetch --unshallow`? Version: $v"
+    )
+  s
+}
+
 lazy val BuildLinkProject = PlayNonCrossBuiltProject("Build-Link", "dev-mode/build-link")
   .dependsOn(PlayExceptionsProject)
 

project/BuildSettings.scala

@@ -60,14 +60,7 @@ object BuildSettings {
 
   private val VersionPattern = """^(\d+).(\d+).(\d+)(-.*)?""".r
 
-  // Versions of previous minor releases being checked for binary compatibility
-  val mimaPreviousMinorReleaseVersions: Seq[String] = Seq("2.8.0")
-  def mimaPreviousPatchVersions(version: String): Seq[String] = version match {
-    case VersionPattern(epoch, major, minor, rest) => (0 until minor.toInt).map(v => s"$epoch.$major.$v")
-    case _                                         => sys.error(s"Cannot find previous versions for $version")
-  }
-  def mimaPreviousVersions(version: String): Set[String] =
-    mimaPreviousMinorReleaseVersions.toSet ++ mimaPreviousPatchVersions(version)
+  def mimaPreviousVersions(version: String): Set[String] = Set("2.8.0")
 
   def evictionSettings: Seq[Setting[_]] = Seq(
     // This avoids a lot of dependency resolution warnings to be showed.

project/Release.scala

@@ -21,16 +21,10 @@ object Release {
     releaseCrossBuild := false,
     releaseProcess := Seq[ReleaseStep](
       checkSnapshotDependencies,
-      inquireVersions,
       runClean,
-      setReleaseVersion,
-      commitReleaseVersion,
-      tagRelease,
       releaseStepCommandAndRemaining("+publishSigned"),
       releaseStepTask(bintrayRelease in thisProjectRef.value),
       releaseStepCommand("sonatypeBundleRelease"),
-      setNextVersion,
-      commitNextVersion,
       pushChanges
     )
   )

project/plugins.sbt

@@ -33,6 +33,7 @@ addSbtPlugin("com.lightbend.sbt"  % "sbt-java-formatter" % sbtJavaFormatter)
 addSbtPlugin("pl.project13.scala" % "sbt-jmh"            % sbtJmh)
 addSbtPlugin("de.heikoseeberger"  % "sbt-header"         % sbtHeader)
 addSbtPlugin("org.scalameta"      % "sbt-scalafmt"       % scalafmt)
+addSbtPlugin("com.dwijnand"       % "sbt-dynver"         % "4.0.0")
 
 libraryDependencies ++= Seq(
   "org.webjars" % "webjars-locator-core" % webjarsLocatorCore