diff --git a/.scalafmt.conf b/.scalafmt.conf index e5cd2f8774..efcd18433e 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,5 +1,5 @@ -version = "3.5.9" -runner.dialect = scala3 +version = "3.6.0" +runner.dialect = scala3Future project.git = true project.excludePaths = ["glob:**.sbt", "glob:**sbtgen.sc"] diff --git a/distage/distage-core-api/src/main/scala/izumi/distage/model/definition/Lifecycle.scala b/distage/distage-core-api/src/main/scala/izumi/distage/model/definition/Lifecycle.scala index d8196618be..5ad1d45a1d 100644 --- a/distage/distage-core-api/src/main/scala/izumi/distage/model/definition/Lifecycle.scala +++ b/distage/distage-core-api/src/main/scala/izumi/distage/model/definition/Lifecycle.scala @@ -995,11 +995,11 @@ object Lifecycle extends LifecycleInstances { } private[definition] sealed trait LifecycleInstances extends LifecycleCatsInstances { - implicit final def functor2ForLifecycle[F[+_, +_]: Functor2]: Functor2[Lifecycle2[F, + _, + _]] = new Functor2[Lifecycle2[F, + _, + _]] { + implicit final def functor2ForLifecycle[F[+_, +_]: Functor2]: Functor2[Lifecycle2[F, +_, +_]] = new Functor2[Lifecycle2[F, +_, +_]] { override def map[R, E, A, B](r: Lifecycle[F[E, _], A])(f: A => B): Lifecycle[F[E, _], B] = r.map(f) } - implicit final def functor3ForLifecycle[F[-_, +_, +_]: Functor3]: Functor3[Lifecycle3[F, - _, + _, + _]] = new Functor3[Lifecycle3[F, - _, + _, + _]] { + implicit final def functor3ForLifecycle[F[-_, +_, +_]: Functor3]: Functor3[Lifecycle3[F, -_, +_, +_]] = new Functor3[Lifecycle3[F, -_, +_, +_]] { override def map[R, E, A, B](r: Lifecycle[F[R, E, _], A])(f: A => B): Lifecycle[F[R, E, _], B] = r.map(f) } } diff --git a/fundamentals/fundamentals-bio/src/main/scala-3/izumi/functional/bio/Convert3To2VersionSpecific.scala b/fundamentals/fundamentals-bio/src/main/scala-3/izumi/functional/bio/Convert3To2VersionSpecific.scala index a777cad8b3..104ff542cd 100644 --- a/fundamentals/fundamentals-bio/src/main/scala-3/izumi/functional/bio/Convert3To2VersionSpecific.scala +++ b/fundamentals/fundamentals-bio/src/main/scala-3/izumi/functional/bio/Convert3To2VersionSpecific.scala @@ -18,8 +18,8 @@ trait BlockingIOLowPriorityVersionSpecific { implicit BlockingIO3: C[FR] { type Divergence = Nondivergent; type IsPredefined = T // `IsPredefined = T` is required only on Scala 3 } - ): Divergent.Of[BlockingIO2[FR[R, + _, + _]]] { type IsPredefined = T } = { - BlockingIO3.asInstanceOf[Divergent.Of[BlockingIO2[FR[R, + _, + _]]] { type IsPredefined = T }] + ): Divergent.Of[BlockingIO2[FR[R, +_, +_]]] { type IsPredefined = T } = { + BlockingIO3.asInstanceOf[Divergent.Of[BlockingIO2[FR[R, +_, +_]]] { type IsPredefined = T }] } }