diff --git a/backend/.scalafix.conf b/backend/.scalafix.conf index 5b39f0c7..b15c5d66 100644 --- a/backend/.scalafix.conf +++ b/backend/.scalafix.conf @@ -42,4 +42,5 @@ OrganizeImports { ] expandRelative = true importsOrder = SymbolsFirst + targetDialect = Auto } \ No newline at end of file diff --git a/backend/dataAccess/src/test/scala/ru/tinkoff/tcb/bson/derivation/BsonDecoderSpec.scala b/backend/dataAccess/src/test/scala/ru/tinkoff/tcb/bson/derivation/BsonDecoderSpec.scala index 15f2f962..adeec6b9 100644 --- a/backend/dataAccess/src/test/scala/ru/tinkoff/tcb/bson/derivation/BsonDecoderSpec.scala +++ b/backend/dataAccess/src/test/scala/ru/tinkoff/tcb/bson/derivation/BsonDecoderSpec.scala @@ -9,7 +9,7 @@ import org.scalatest.TryValues import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import ru.tinkoff.tcb.bson.{TestEntity => _, _} +import ru.tinkoff.tcb.bson.{TestEntity as _, *} import ru.tinkoff.tcb.bson.BsonEncoder.ops.* class BsonDecoderSpec extends AnyFunSuite with Matchers with TryValues { diff --git a/backend/mockingbird/src/main/scala/ru/tinkoff/tcb/mockingbird/stream/EventSpawner.scala b/backend/mockingbird/src/main/scala/ru/tinkoff/tcb/mockingbird/stream/EventSpawner.scala index c9456429..ff4f6f89 100644 --- a/backend/mockingbird/src/main/scala/ru/tinkoff/tcb/mockingbird/stream/EventSpawner.scala +++ b/backend/mockingbird/src/main/scala/ru/tinkoff/tcb/mockingbird/stream/EventSpawner.scala @@ -3,8 +3,8 @@ package ru.tinkoff.tcb.mockingbird.stream import scala.util.control.NonFatal import fs2.Stream -import io.circe.Error as CirceError import io.circe.DecodingFailure +import io.circe.Error as CirceError import io.circe.parser.parse import mouse.all.optionSyntaxMouse import mouse.boolean.* diff --git a/backend/mockingbird/src/main/scala/ru/tinkoff/tcb/utils/transformation/json/package.scala b/backend/mockingbird/src/main/scala/ru/tinkoff/tcb/utils/transformation/json/package.scala index 0ad66601..f35c249c 100644 --- a/backend/mockingbird/src/main/scala/ru/tinkoff/tcb/utils/transformation/json/package.scala +++ b/backend/mockingbird/src/main/scala/ru/tinkoff/tcb/utils/transformation/json/package.scala @@ -3,8 +3,8 @@ package ru.tinkoff.tcb.utils.transformation import scala.util.control.TailCalls import scala.util.control.TailCalls.TailRec -import io.circe.JsonNumber as JNumber import io.circe.Json +import io.circe.JsonNumber as JNumber import kantan.xpath.* import mouse.boolean.* diff --git a/backend/project/plugins.sbt b/backend/project/plugins.sbt index 4e18a4a5..f3ae42f6 100644 --- a/backend/project/plugins.sbt +++ b/backend/project/plugins.sbt @@ -2,7 +2,7 @@ addDependencyTreePlugin addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.1") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin("ch.epfl.scala" % "sbt-missinglink" % "0.3.6") addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.7")