Update after scalacenter/sbt-version-policy#187

julienrf · Nov 30, 2023 · be1559f · be1559f
1 parent 81f17e5
commit be1559f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 64 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,5 +1,4 @@
 import ReleaseTransformations.*
-import sbtversionpolicy.SbtVersionPolicyPlugin.aggregatedAssessedCompatibilityWithLatestRelease
 import sbtversionpolicy.withsbtrelease.ReleaseVersion
 
 ThisBuild / scalaVersion := "2.13.12"
@@ -56,7 +55,11 @@ lazy val `etag-caching-root` = (project in file("."))
   ).settings(baseSettings).settings(
     publish / skip := true,
     releaseCrossBuild := true, // true if you cross-build the project for multiple Scala versions
-    releaseVersion := ReleaseVersion.fromAggregatedAssessedCompatibility.value,
+    releaseVersion := {
+      ReleaseVersion.fromAggregatedAssessedCompatibilityWithLatestRelease(
+        qualifier = sys.env.getOrElse("RELEASE_VERSION_QUALIFIER", "")
+      ).value
+    },
     releaseProcess := Seq[ReleaseStep](
       checkSnapshotDependencies,
       inquireVersions,

diff --git a/project/Versioning.scala b/project/Versioning.scala
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -4,4 +4,4 @@ addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
 
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21")
 
-addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "2.1.3+16-9c3dded3+20231129-1538-SNAPSHOT")
+addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "2.1.3+18-6e335734-SNAPSHOT")