From 9a74342975552f2baf806583acf7de50b87dd1c9 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 7 Apr 2021 15:13:35 -0700 Subject: [PATCH] bump Scala versions (2.13.5, 3.0.0-RC2) --- .travis.yml | 4 ++-- build.sbt | 4 ++-- project/Dependencies.scala | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4d49d23..e96eeb9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,8 @@ language: scala scala: - 2.11.12 - 2.12.13 - - 2.13.4 - - 3.0.0-RC1 + - 2.13.5 + - 3.0.0-RC2 env: - ADOPTOPENJDK=8 - ADOPTOPENJDK=11 diff --git a/build.sbt b/build.sbt index e0b9b55..8004207 100644 --- a/build.sbt +++ b/build.sbt @@ -13,8 +13,8 @@ libraryDependencies ++= Dependencies.scalaLogging(scalaVersion.value, isDotty.va initialCommands := """|import com.typesafe.scalalogging._ |import org.slf4j.{ Logger => Underlying, _ }""".stripMargin -unmanagedSourceDirectories in Compile ++= { - val sourceDir = (sourceDirectory in Compile).value +Compile / unmanagedSourceDirectories ++= { + val sourceDir = (Compile / sourceDirectory).value val extraFilesOpt = CrossVersion.partialVersion(scalaVersion.value) match { case Some((2, _)) => Some(sourceDir / "scala-2.x") case Some((3, _)) => Some(sourceDir / "scala-3.x") diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 0d44ad5..9df7b2c 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -2,8 +2,8 @@ import sbt._ object Version { val logback = "1.2.3" - val mockito = "3.2.6.0" - val scalaTest = "3.2.6" + val mockito = "3.2.7.0" + val scalaTest = "3.2.7" val slf4j = "1.7.30" }