diff --git a/build.sbt b/build.sbt index e0b9b55..9965e5a 100644 --- a/build.sbt +++ b/build.sbt @@ -9,7 +9,10 @@ scalacOptions ++= Seq( "-Ywarn-unused" ) incOptions := incOptions.value.withLogRecompileOnMacro(false) -libraryDependencies ++= Dependencies.scalaLogging(scalaVersion.value, isDotty.value) +val isScala3 = Def.setting { + CrossVersion.partialVersion(scalaVersion.value).exists(_._1 != 2) +} +libraryDependencies ++= Dependencies.scalaLogging(scalaVersion.value, isScala3.value) initialCommands := """|import com.typesafe.scalalogging._ |import org.slf4j.{ Logger => Underlying, _ }""".stripMargin diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 0d44ad5..2eab22a 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -18,8 +18,8 @@ object Library { object Dependencies { import Library._ - def scalaLogging(scalaVersion: String, isDotty: Boolean) = { - List(scalaReflect(scalaVersion)).filter(_ => !isDotty) ++ + def scalaLogging(scalaVersion: String, isScala3: Boolean) = { + List(scalaReflect(scalaVersion)).filter(_ => !isScala3) ++ List( slf4jApi, logbackClassic % "test", diff --git a/project/plugins.sbt b/project/plugins.sbt index 524fab7..edc4a9f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,4 +3,3 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.6") addSbtPlugin("com.scalapenos" % "sbt-prompt" % "1.0.2") addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7") addSbtPlugin("com.dwijnand" % "sbt-travisci" % "1.2.0") -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.4")