Upgrade to scala 3.0.0-M3

amumurst · amumurst · commit 07bf64ee13d9 · 2021-02-17T18:15:08.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,8 @@
 lib_managed/
 project/project
 target/
+.bloop
+.bsp
 
 # Worksheets (Eclipse or IntelliJ)
 *.sc
diff --git a/build.sbt b/build.sbt
@@ -35,7 +35,7 @@ unmanagedSourceDirectories in Compile ++= {
   val sourceDir = (sourceDirectory in Compile).value
   val extraFilesOpt = CrossVersion.partialVersion(scalaVersion.value) match {
     case Some((2, _)) => Some(sourceDir / "scala-2.x")
-    case Some((0, _)) => Some(sourceDir / "scala-3.x")
+    case Some((3, _)) => Some(sourceDir / "scala-3.x")
     case _ => None
   }
   extraFilesOpt.toSeq
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -2,11 +2,11 @@ import sbt._
 
 object Version {
   val logback   = "1.2.3"
-  val mockito   = "3.2.1.0"
-  val dotty     = "0.26.0-RC1"
+  val mockito   = "3.2.4.0-M1"
+  val dotty     = "3.0.0-M3"
   val scala     = "2.12.11"
   val crossScala = List(scala, "2.11.12", "2.13.1", dotty)
-  val scalaTest = "3.2.1"
+  val scalaTest = "3.2.4-M1"
   val slf4j     = "1.7.30"
 }
 
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.3.13
+sbt.version=1.4.7
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -10,4 +10,4 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.5")
 
 addSbtPlugin("com.scalapenos" % "sbt-prompt" % "1.0.2")
 
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.1")
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.3")
diff --git a/src/main/scala-3.x/com/typesafe/scalalogging/LoggerMacro.scala b/src/main/scala-3.x/com/typesafe/scalalogging/LoggerMacro.scala
diff --git a/src/main/scala-3.x/com/typesafe/scalalogging/LoggerTakingImplicitMacro.scala b/src/main/scala-3.x/com/typesafe/scalalogging/LoggerTakingImplicitMacro.scala

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ unmanagedSourceDirectories in Compile ++= {`
`35`	`35`	`val sourceDir = (sourceDirectory in Compile).value`
`36`	`36`	`val extraFilesOpt = CrossVersion.partialVersion(scalaVersion.value) match {`
`37`	`37`	`case Some((2, _)) => Some(sourceDir / "scala-2.x")`
`38`		`- case Some((0, _)) => Some(sourceDir / "scala-3.x")`
	`38`	`+ case Some((3, _)) => Some(sourceDir / "scala-3.x")`
`39`	`39`	`case _ => None`
`40`	`40`	`}`
`41`	`41`	`extraFilesOpt.toSeq`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-sbt.version=1.3.13`
	`1`	`+sbt.version=1.4.7`
Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,4 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.5")`
`10`	`10`
`11`	`11`	`addSbtPlugin("com.scalapenos" % "sbt-prompt" % "1.0.2")`
`12`	`12`
`13`		`-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.1")`
	`13`	`+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.3")`