Skip to content

Commit 57e344d

Browse files
authored
Merge pull request #275 from SethTisue/no-sbt-dotty
remove sbt-dotty from build
2 parents 9c1f8b1 + f4a25d1 commit 57e344d

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

build.sbt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ scalacOptions ++= Seq(
99
"-Ywarn-unused"
1010
)
1111
incOptions := 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)
1316
initialCommands := """|import com.typesafe.scalalogging._
1417
|import org.slf4j.{ Logger => Underlying, _ }""".stripMargin
1518

project/Dependencies.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ object Library {
1818
object 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",

project/plugins.sbt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.6")
33
addSbtPlugin("com.scalapenos" % "sbt-prompt" % "1.0.2")
44
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
55
addSbtPlugin("com.dwijnand" % "sbt-travisci" % "1.2.0")
6-
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.4")

0 commit comments

Comments
 (0)