Trying this out as the other PR isn't running in travis (#27129)
* Update to Scala 2.13.0 * Update scalatest
This commit is contained in:
parent
ced96413d3
commit
a568afd895
3 changed files with 4 additions and 4 deletions
|
|
@ -4,7 +4,7 @@ sudo: false
|
||||||
|
|
||||||
scala:
|
scala:
|
||||||
- "2.12.8"
|
- "2.12.8"
|
||||||
- "2.13.0-RC2"
|
- "2.13.0"
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
# using jabba for custom jdk management
|
# using jabba for custom jdk management
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@ object AkkaDisciplinePlugin extends AutoPlugin with ScalafixSupport {
|
||||||
Seq(coverageMinimum := 70, coverageFailOnMinimum := false, coverageOutputHTML := true, coverageHighlighting := true)
|
Seq(coverageMinimum := 70, coverageFailOnMinimum := false, coverageOutputHTML := true, coverageHighlighting := true)
|
||||||
|
|
||||||
lazy val silencerSettings = {
|
lazy val silencerSettings = {
|
||||||
val silencerVersion = "1.3.3"
|
val silencerVersion = "1.4.1"
|
||||||
Seq(
|
Seq(
|
||||||
libraryDependencies ++= Seq(
|
libraryDependencies ++= Seq(
|
||||||
compilerPlugin("com.github.ghik" %% "silencer-plugin" % silencerVersion),
|
compilerPlugin("com.github.ghik" %% "silencer-plugin" % silencerVersion),
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ object Dependencies {
|
||||||
val jacksonVersion = "2.9.9"
|
val jacksonVersion = "2.9.9"
|
||||||
|
|
||||||
val scala212Version = "2.12.8"
|
val scala212Version = "2.12.8"
|
||||||
val scala213Version = "2.13.0-RC2"
|
val scala213Version = "2.13.0"
|
||||||
|
|
||||||
val Versions = Seq(
|
val Versions = Seq(
|
||||||
crossScalaVersions := Seq(scala212Version, scala213Version),
|
crossScalaVersions := Seq(scala212Version, scala213Version),
|
||||||
|
|
@ -33,7 +33,7 @@ object Dependencies {
|
||||||
scalaCheckVersion := sys.props.get("akka.build.scalaCheckVersion").getOrElse("1.14.0"),
|
scalaCheckVersion := sys.props.get("akka.build.scalaCheckVersion").getOrElse("1.14.0"),
|
||||||
scalaTestVersion := {
|
scalaTestVersion := {
|
||||||
CrossVersion.partialVersion(scalaVersion.value) match {
|
CrossVersion.partialVersion(scalaVersion.value) match {
|
||||||
case Some((2, n)) if n >= 13 => "3.0.8-RC4"
|
case Some((2, n)) if n >= 13 => "3.0.8"
|
||||||
case _ => "3.0.7"
|
case _ => "3.0.7"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue