raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Fix patch versin for scala when overriding

Browse source 
To remain compatible with silencer, chop off the patch to not break
downstream builds
This commit is contained in:
Christopher Batey 2020-08-18 07:46:06 +01:00
parent 94dc84d5d0
commit 207b89224f
1 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

32
project/Dependencies.scala
View file

@ -35,17 +35,27 @@ object Dependencies {
val scalaTestVersion = "3.1.1"
val scalaCheckVersion = "1.14.3"
val Versions = Seq(
crossScalaVersions := Seq(scala212Version, scala213Version),
scalaVersion := System.getProperty("akka.build.scalaVersion", crossScalaVersions.value.head),
java8CompatVersion := {
CrossVersion.partialVersion(scalaVersion.value) match {
// java8-compat is only used in a couple of places for 2.13,
// it is probably possible to remove the dependency if needed.
case Some((2, n)) if n >= 13 => "0.9.0"
case _ => "0.8.0"
}
})
val Versions =
Seq(
crossScalaVersions := Seq(scala212Version, scala213Version),
scalaVersion := {
// don't allow full override to keep compatible with the version of silencer
// don't mandate patch not specified to allow builds to migrate
System.getProperty("akka.build.scalaVersion", "default") match {
case twoThirteen if twoThirteen.startsWith("2.13") => scala213Version
case twoTwelve if twoTwelve.startsWith("2.12") => scala212Version
case "default" => crossScalaVersions.value.head
case other => throw new IllegalArgumentException(s"Unsupported scala version [$other]. Must be 2.12 or 2.13.")
}
},
java8CompatVersion := {
CrossVersion.partialVersion(scalaVersion.value) match {
// java8-compat is only used in a couple of places for 2.13,
// it is probably possible to remove the dependency if needed.
case Some((2, n)) if n >= 13 => "0.9.0"
case _ => "0.8.0"
}
})
object Compile {
// Compile