diff --git a/.travis.yml b/.travis.yml index 7b7b852..af4730b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ jobs: - scala: 2.10.7 - scala: 2.11.12 - scala: 2.12.8 - - scala: 2.13.0-RC1 + - scala: 2.13.0 - stage: release script: sbt ci-release branches: diff --git a/project/Deps.scala b/project/Deps.scala index 6f2c166..4228d6e 100644 --- a/project/Deps.scala +++ b/project/Deps.scala @@ -1,4 +1,5 @@ import sbt._ +import sbt.Keys.scalaVersion import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._ @@ -8,5 +9,11 @@ object Deps { def scalacheck = setting("org.scalacheck" %%% "scalacheck" % "1.14.0") def shapeless = setting("com.chuusai" %%% "shapeless" % "2.3.3") - def utest = setting("com.lihaoyi" %%% "utest" % "0.6.7") + def utest = setting { + val sv = scalaVersion.value + val ver = + if (sv.startsWith("2.10.") || sv.startsWith("2.11.")) "0.6.7" + else "0.6.9" + "com.lihaoyi" %%% "utest" % ver + } } diff --git a/project/Settings.scala b/project/Settings.scala index bd81e9e..4814473 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -8,7 +8,7 @@ object Settings { private def scala210 = "2.10.7" private def scala211 = "2.11.12" private def scala212 = "2.12.8" - private def scala213 = "2.13.0-RC1" + private def scala213 = "2.13.0" lazy val shared = Seq( scalaVersion := scala212,