File tree Expand file tree Collapse file tree 3 files changed +6
-4
lines changed Expand file tree Collapse file tree 3 files changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -9,7 +9,10 @@ scalacOptions ++= Seq(
99 " -Ywarn-unused"
1010)
1111incOptions := incOptions.value.withLogRecompileOnMacro(false )
12- libraryDependencies ++= Dependencies .scalaLogging(scalaVersion.value, isDotty.value)
12+ val isScala3 = Def .setting {
13+ CrossVersion .partialVersion(scalaVersion.value).exists(_._1 != 2 )
14+ }
15+ libraryDependencies ++= Dependencies .scalaLogging(scalaVersion.value, isScala3.value)
1316initialCommands := """ |import com.typesafe.scalalogging._
1417 |import org.slf4j.{ Logger => Underlying, _ }""" .stripMargin
1518
Original file line number Diff line number Diff line change @@ -18,8 +18,8 @@ object Library {
1818object Dependencies {
1919 import Library ._
2020
21- def scalaLogging (scalaVersion : String , isDotty : Boolean ) = {
22- List (scalaReflect(scalaVersion)).filter(_ => ! isDotty ) ++
21+ def scalaLogging (scalaVersion : String , isScala3 : Boolean ) = {
22+ List (scalaReflect(scalaVersion)).filter(_ => ! isScala3 ) ++
2323 List (
2424 slf4jApi,
2525 logbackClassic % " test" ,
Original file line number Diff line number Diff line change @@ -3,4 +3,3 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.6")
33addSbtPlugin(" com.scalapenos" % " sbt-prompt" % " 1.0.2" )
44addSbtPlugin(" com.geirsson" % " sbt-ci-release" % " 1.5.7" )
55addSbtPlugin(" com.dwijnand" % " sbt-travisci" % " 1.2.0" )
6- addSbtPlugin(" ch.epfl.lamp" % " sbt-dotty" % " 0.5.4" )
You can’t perform that action at this time.
0 commit comments