Setup Scalafix

johnspade · Apr 7, 2024 · 6f9c915 · 6f9c915
1 parent 78ab208
commit 6f9c915
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 22 deletions.
diff --git a/.scalafix.conf b/.scalafix.conf
@@ -0,0 +1,17 @@
+OrganizeImports {
+ blankLines=Auto
+ groupedImports=Explode
+ groups=[
+ "re:(javax?|scala)\\.",
+ "zio",
+ "*",
+ "ru.johnspade"
+ ]
+ importSelectorsOrder=Ascii
+ importsOrder=Ascii
+ removeUnused=false
+}
+
+rules = [
+ OrganizeImports
+]
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.3.0"
+version = "3.8.1"
 align.preset = more
 maxColumn = 120
 danglingParentheses.preset = true

diff --git a/api/src/main/scala/ru/johnspade/nastenka/api/ApiInvestigationService.scala b/api/src/main/scala/ru/johnspade/nastenka/api/ApiInvestigationService.scala
@@ -1,16 +1,18 @@
 package ru.johnspade.nastenka.api
 
+import java.util.UUID
+
+import zio.*
+
 import io.github.arainko.ducktape.*
+
 import ru.johnspade.nastenka.errors.InvestigationNotFound
 import ru.johnspade.nastenka.models.Investigation
 import ru.johnspade.nastenka.models.InvestigationFullModel
 import ru.johnspade.nastenka.models.NewInvestigation
 import ru.johnspade.nastenka.models.Pin
 import ru.johnspade.nastenka.models.PinModel
 import ru.johnspade.nastenka.models.UpdatedInvestigation
-import zio.*
-
-import java.util.UUID
 
 trait ApiInvestigationService:
  def getAll: ZIO[Any, Nothing, List[Investigation]]

diff --git a/build.sbt b/build.sbt
@@ -15,7 +15,9 @@ val commonSettings = Seq(
  "-encoding",
  "utf8"
  ),
- resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/"
+ resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/",
+ semanticdbEnabled := true,
+ semanticdbVersion := scalafixSemanticdb.revision
 )
 
 lazy val root = project
@@ -26,6 +28,7 @@ lazy val root = project
 lazy val shared = project
  .in(file("shared"))
  .enablePlugins(ScalaJSPlugin)
+ .settings(commonSettings)
  .settings(
  scalaJSLinkerConfig ~= { _.withSourceMap(false) },
  scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.ESModule) },
@@ -63,7 +66,8 @@ lazy val api = project
  quill,
  ducktape,
  zioTest,
- zioTestSbt
+ zioTestSbt,
+ jsoup
  )
  )
 
@@ -110,7 +114,8 @@ lazy val email = project
  zioInteropCats,
  emilCommon,
  emilJavamail,
- logback
+ logback,
+ jsoup
  )
  )
 

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -3,4 +3,5 @@ addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.1")
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1")
 addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0")
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.0")
diff --git a/sources/email/src/main/scala/ru/johnspade/nastenka/email/EmailService.scala b/sources/email/src/main/scala/ru/johnspade/nastenka/email/EmailService.scala
@@ -1,17 +1,18 @@
 package ru.johnspade.nastenka.email
 
+import java.util.UUID
+import scala.util.Try
+
+import zio.*
+import zio.interop.catz.*
+import zio.interop.catz.implicits.*
+
 import cats.syntax.all.*
 import emil.SearchQuery.*
 import emil.*
 import emil.builder.*
 import emil.javamail.*
 import emil.javamail.conv.codec.given
-import zio.*
-import zio.interop.catz.*
-import zio.interop.catz.implicits.*
-
-import java.util.UUID
-import scala.util.Try
 
 trait EmailService:
  def collectEmailsToProcess(

diff --git a/sources/email/src/main/scala/ru/johnspade/nastenka/email/EmailSourceService.scala b/sources/email/src/main/scala/ru/johnspade/nastenka/email/EmailSourceService.scala
@@ -1,15 +1,16 @@
 package ru.johnspade.nastenka.email
 
-import ru.johnspade.nastenka.errors.InvestigationNotFound
-import ru.johnspade.nastenka.inbox.InboxService
-import ru.johnspade.nastenka.models.NewPin
-import ru.johnspade.nastenka.models.PinType
+import java.util.UUID
+import scala.util.Try
+
 import zio.*
 import zio.stream.ZSink
 import zio.stream.ZStream
 
-import java.util.UUID
-import scala.util.Try
+import ru.johnspade.nastenka.errors.InvestigationNotFound
+import ru.johnspade.nastenka.inbox.InboxService
+import ru.johnspade.nastenka.models.NewPin
+import ru.johnspade.nastenka.models.PinType
 
 trait EmailSourceService:
  def createStream: ZStream[Any, Throwable, Any]

diff --git a/sources/email/src/main/scala/ru/johnspade/nastenka/email/MailData.scala b/sources/email/src/main/scala/ru/johnspade/nastenka/email/MailData.scala
@@ -1,9 +1,11 @@
 package ru.johnspade.nastenka.email
 
-import emil.Mail
-import zio.Task
 import java.util.UUID
 
+import zio.Task
+
+import emil.Mail
+
 final case class MailData(
  messageId: String,
  from: Option[String],