Merge pull request #1519 from eed3si9n/wip/bump-util

[2.x] util 2.0.0-M3
sbt · Dec 18, 2024 · 5b55328 · 5b55328
2 parents 4984165 + 8a6ff75
commit 5b55328
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/internal/zinc-compile-core/src/main/scala/sbt/internal/inc/FilteredReporter.scala b/internal/zinc-compile-core/src/main/scala/sbt/internal/inc/FilteredReporter.scala
@@ -36,8 +36,8 @@ class ManagedFilteredReporter(
     logger: ManagedLogger,
     positionMapper: Position => Position
 ) extends FilteredReporter(fileFilters, msgFilters, maximumErrors, logger, positionMapper) {
-  import LoggedReporter.problemFormats._
-  import LoggedReporter.problemStringFormats._
+  import LoggedReporter.problemFormats.given
+  import LoggedReporter.problemStringFormats.given
   logger.registerStringCodec[Problem]
 
   override def logError(problem: Problem): Unit = logger.errorEvent(problem)

diff --git a/internal/zinc-compile-core/src/main/scala/sbt/internal/inc/LoggedReporter.scala b/internal/zinc-compile-core/src/main/scala/sbt/internal/inc/LoggedReporter.scala
@@ -79,8 +79,8 @@ class ManagedLoggedReporter(
     logger: ManagedLogger,
     sourcePositionMapper: Position => Position = identity[Position]
 ) extends LoggedReporter(maximumErrors, logger, sourcePositionMapper) {
-  import problemFormats._
-  import problemStringFormats._
+  import problemFormats.given
+  import problemStringFormats.given
   logger.registerStringCodec[Problem]
 
   override def logError(problem: Problem): Unit = logger.errorEvent(problem)

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -9,7 +9,7 @@ object Dependencies {
   val scala211 = "2.11.12"
   val scala212 = "2.12.20"
   val scala213 = "2.13.15"
-  val scala3 = "3.3.4"
+  val scala3 = "3.6.2"
   val scala3ForBridge = "3.3.4"
   val scala213ForBridge = "2.13.15"
   val defaultScalaVersion = scala3
@@ -18,7 +18,7 @@ object Dependencies {
   val scala3_only = Seq(scala3)
 
   private val ioVersion = nightlyVersion.getOrElse("1.10.2")
-  private val utilVersion = nightlyVersion.getOrElse("2.0.0-M1")
+  private val utilVersion = nightlyVersion.getOrElse("2.0.0-M3")
 
   private val sbtIO = "org.scala-sbt" %% "io" % ioVersion