Merge pull request #1461 from scalacenter/update/sbt-scalafix-0.13.0

Update sbt-scalafix to 0.13.0
scalacenter · Jan 8, 2025 · 027e70d · 027e70d
2 parents a036d8d + 97bb7f4
commit 027e70d
Show file tree

Hide file tree

Showing 18 changed files with 30 additions and 30 deletions.
diff --git a/.scalafix.conf b/.scalafix.conf
@@ -1,7 +1,7 @@
 rules = [
-  # ExplicitResultTypes,
+  ExplicitResultTypes,
   OrganizeImports,
-  # RemoveUnused
+  RemoveUnused
 ]
 
 ExplicitResultTypes {

diff --git a/modules/core/shared/src/main/scala/scaladex/core/api/ProjectResponse.scala b/modules/core/shared/src/main/scala/scaladex/core/api/ProjectResponse.scala
@@ -1,7 +1,7 @@
 package scaladex.core.api
 
-import scaladex.core.model.Project.*
 import scaladex.core.model.*
+import scaladex.core.model.Project.*
 
 case class ProjectResponse(
     organization: Organization,

diff --git a/modules/core/shared/src/main/scala/scaladex/core/model/BinaryVersion.scala b/modules/core/shared/src/main/scala/scaladex/core/model/BinaryVersion.scala
@@ -2,8 +2,8 @@ package scaladex.core.model
 
 import scaladex.core.util.Parsers
 
-import fastparse.NoWhitespace.*
 import fastparse.*
+import fastparse.NoWhitespace.*
 
 final case class BinaryVersion(platform: Platform, language: Language):
   def isValid: Boolean = platform.isValid && language.isValid

diff --git a/modules/core/shared/src/main/scala/scaladex/core/model/Platform.scala b/modules/core/shared/src/main/scala/scaladex/core/model/Platform.scala
@@ -69,7 +69,7 @@ case class MillPlugin(version: Version) extends Platform:
     case _ => false
 
 object MillPlugin:
-  val `0.10` = MillPlugin(Version(0, 10))
+  val `0.10`: MillPlugin = MillPlugin(Version(0, 10))
 
   given ordering: Ordering[MillPlugin] = Ordering.by(p => p.asInstanceOf[Platform])
 

diff --git a/modules/core/shared/src/main/scala/scaladex/core/model/Version.scala b/modules/core/shared/src/main/scala/scaladex/core/model/Version.scala
@@ -2,8 +2,8 @@ package scaladex.core.model
 
 import scaladex.core.util.Parsers.*
 
-import fastparse.NoWhitespace.*
 import fastparse.*
+import fastparse.NoWhitespace.*
 
 sealed trait Version extends Ordered[Version]:
   def value: String

diff --git a/modules/core/shared/src/test/scala/scaladex/core/test/Values.scala b/modules/core/shared/src/test/scala/scaladex/core/test/Values.scala
@@ -3,32 +3,32 @@ package scaladex.core.test
 import java.time.Instant
 import java.time.temporal.ChronoUnit
 
+import scaladex.core.model.*
 import scaladex.core.model.Artifact.*
 import scaladex.core.model.ArtifactDependency.Scope
 import scaladex.core.model.Project.Settings
-import scaladex.core.model.*
 import scaladex.core.model.search.ProjectDocument
 
 object Values:
   val now: Instant = Instant.now().truncatedTo(ChronoUnit.MILLIS)
   val ok: GithubStatus = GithubStatus.Ok(now)
   val unknown: GithubStatus = GithubStatus.Unknown(now)
 
-  val `2.6.1` = Version(2, 6, 1)
+  val `2.6.1`: Version = Version(2, 6, 1)
   val `4`: Version = Version(4)
-  val `2.5.0` = Version(2, 5, 0)
-  val `7.0.0` = Version(7, 0, 0)
-  val `7.1.0` = Version(7, 1, 0)
-  val `7.2.0-PREVIEW.1` = Version("7.2.0-PREVIEW.1")
-  val `7.2.0-PREVIEW.2` = Version("7.2.0-PREVIEW.2")
-  val `7.2.0` = Version(7, 2, 0)
-  val `7.3.0` = Version(7, 3, 0)
+  val `2.5.0`: Version = Version(2, 5, 0)
+  val `7.0.0`: Version = Version(7, 0, 0)
+  val `7.1.0`: Version = Version(7, 1, 0)
+  val `7.2.0-PREVIEW.1`: Version = Version("7.2.0-PREVIEW.1")
+  val `7.2.0-PREVIEW.2`: Version = Version("7.2.0-PREVIEW.2")
+  val `7.2.0`: Version = Version(7, 2, 0)
+  val `7.3.0`: Version = Version(7, 3, 0)
 
   val `_2.13`: BinaryVersion = BinaryVersion(Jvm, Scala.`2.13`)
   val `_3`: BinaryVersion = BinaryVersion(Jvm, Scala.`3`)
   val `_sjs1_3`: BinaryVersion = BinaryVersion(ScalaJs.`1.x`, Scala.`3`)
-  val `_sjs0.6_2.13` = BinaryVersion(ScalaJs.`0.6`, Scala.`2.13`)
-  val `_native0.4_2.13` = BinaryVersion(ScalaNative.`0.4`, Scala.`2.13`)
+  val `_sjs0.6_2.13`: BinaryVersion = BinaryVersion(ScalaJs.`0.6`, Scala.`2.13`)
+  val `_native0.4_2.13`: BinaryVersion = BinaryVersion(ScalaNative.`0.4`, Scala.`2.13`)
 
   private def contributor(login: String): GithubContributor =
     GithubContributor(login, "", Url(""), 1)

diff --git a/modules/data/src/main/scala/scaladex/data/cleanup/GithubRepoExtractor.scala b/modules/data/src/main/scala/scaladex/data/cleanup/GithubRepoExtractor.scala
@@ -9,10 +9,10 @@ import scala.util.matching.Regex
 import scaladex.core.model.Project
 import scaladex.infra.DataPaths
 
+import org.json4s.*
 import org.json4s.JsonAST.JField
 import org.json4s.JsonAST.JObject
 import org.json4s.JsonAST.JString
-import org.json4s.*
 import org.json4s.native.Serialization
 
 class GithubRepoExtractor(paths: DataPaths):

diff --git a/modules/infra/src/main/scala/scaladex/infra/sql/ArtifactTable.scala b/modules/infra/src/main/scala/scaladex/infra/sql/ArtifactTable.scala
@@ -2,8 +2,8 @@ package scaladex.infra.sql
 
 import java.time.Instant
 
-import scaladex.core.model.Artifact.*
 import scaladex.core.model.*
+import scaladex.core.model.Artifact.*
 import scaladex.infra.sql.DoobieMappings.given
 import scaladex.infra.sql.DoobieUtils.*
 

diff --git a/modules/infra/src/main/scala/scaladex/infra/sql/DoobieMappings.scala b/modules/infra/src/main/scala/scaladex/infra/sql/DoobieMappings.scala
@@ -5,8 +5,8 @@ import java.util.UUID
 
 import scala.util.Try
 
-import scaladex.core.model.Project.*
 import scaladex.core.model.*
+import scaladex.core.model.Project.*
 import scaladex.core.util.Secret
 import scaladex.infra.Codecs.given
 

diff --git a/modules/infra/src/test/scala/scaladex/infra/SqlDatabaseTests.scala b/modules/infra/src/test/scala/scaladex/infra/SqlDatabaseTests.scala
@@ -5,8 +5,8 @@ import java.util.concurrent.Executors
 
 import scala.concurrent.ExecutionContext
 
-import scaladex.core.model.ArtifactDependency.Scope
 import scaladex.core.model.*
+import scaladex.core.model.ArtifactDependency.Scope
 import scaladex.core.util.ScalaExtensions.*
 import scaladex.core.util.Secret
 

diff --git a/modules/server/src/main/scala/scaladex/server/GithubAuthImpl.scala b/modules/server/src/main/scala/scaladex/server/GithubAuthImpl.scala
@@ -18,9 +18,9 @@ import com.typesafe.scalalogging.LazyLogging
 import io.circe.Json
 import org.apache.pekko.actor.ActorSystem
 import org.apache.pekko.http.scaladsl.*
+import org.apache.pekko.http.scaladsl.model.*
 import org.apache.pekko.http.scaladsl.model.HttpMethods.POST
 import org.apache.pekko.http.scaladsl.model.Uri.*
-import org.apache.pekko.http.scaladsl.model.*
 import org.apache.pekko.http.scaladsl.model.headers.*
 import org.apache.pekko.http.scaladsl.unmarshalling.Unmarshal
 

diff --git a/modules/server/src/main/scala/scaladex/server/Server.scala b/modules/server/src/main/scala/scaladex/server/Server.scala
@@ -31,8 +31,8 @@ import doobie.util.ExecutionContexts
 import org.apache.pekko.actor.ActorSystem
 import org.apache.pekko.http.scaladsl.*
 import org.apache.pekko.http.scaladsl.model.StatusCodes
-import org.apache.pekko.http.scaladsl.server.Directives.*
 import org.apache.pekko.http.scaladsl.server.*
+import org.apache.pekko.http.scaladsl.server.Directives.*
 
 object Server extends LazyLogging:
 

diff --git a/modules/server/src/main/scala/scaladex/server/route/AuthenticationApi.scala b/modules/server/src/main/scala/scaladex/server/route/AuthenticationApi.scala
@@ -22,9 +22,9 @@ import com.softwaremill.pekkohttpsession.SingleValueSessionSerializer
 import com.softwaremill.pekkohttpsession.javadsl.InMemoryRefreshTokenStorage
 import com.typesafe.scalalogging.LazyLogging
 import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.http.scaladsl.model.*
 import org.apache.pekko.http.scaladsl.model.StatusCodes.TemporaryRedirect
 import org.apache.pekko.http.scaladsl.model.Uri.Query
-import org.apache.pekko.http.scaladsl.model.*
 import org.apache.pekko.http.scaladsl.model.headers.Referer
 import org.apache.pekko.http.scaladsl.server.Directive1
 import org.apache.pekko.http.scaladsl.server.Directives.*

diff --git a/modules/server/src/main/scala/scaladex/server/route/Badges.scala b/modules/server/src/main/scala/scaladex/server/route/Badges.scala
@@ -18,8 +18,8 @@ import scaladex.core.model.Version.PreferStable
 import scaladex.core.service.WebDatabase
 
 import org.apache.pekko.http.scaladsl.model.StatusCodes.*
-import org.apache.pekko.http.scaladsl.model.headers.CacheDirectives.*
 import org.apache.pekko.http.scaladsl.model.headers.*
+import org.apache.pekko.http.scaladsl.model.headers.CacheDirectives.*
 import org.apache.pekko.http.scaladsl.server.Directives.*
 import org.apache.pekko.http.scaladsl.server.RequestContext
 import org.apache.pekko.http.scaladsl.server.Route

diff --git a/modules/server/src/main/scala/scaladex/server/route/ProjectPages.scala b/modules/server/src/main/scala/scaladex/server/route/ProjectPages.scala
@@ -23,10 +23,10 @@ import scaladex.view.html.notfound
 import scaladex.view.project.html
 
 import com.typesafe.scalalogging.LazyLogging
-import org.apache.pekko.http.scaladsl.model.Uri.*
 import org.apache.pekko.http.scaladsl.model.*
-import org.apache.pekko.http.scaladsl.server.Directives.*
+import org.apache.pekko.http.scaladsl.model.Uri.*
 import org.apache.pekko.http.scaladsl.server.*
+import org.apache.pekko.http.scaladsl.server.Directives.*
 
 class ProjectPages(
     env: Env,

diff --git a/modules/server/src/main/scala/scaladex/server/route/SearchPages.scala b/modules/server/src/main/scala/scaladex/server/route/SearchPages.scala
@@ -9,8 +9,8 @@ import scaladex.server.TwirlSupport.given
 import scaladex.view.search.html.searchresult
 
 import org.apache.pekko.http.scaladsl.model.Uri.*
-import org.apache.pekko.http.scaladsl.server.Directives.*
 import org.apache.pekko.http.scaladsl.server.*
+import org.apache.pekko.http.scaladsl.server.Directives.*
 
 class SearchPages(env: Env, searchEngine: SearchEngine)(
     using ExecutionContext

diff --git a/modules/server/src/main/scala/scaladex/server/service/ArtifactConverter.scala b/modules/server/src/main/scala/scaladex/server/service/ArtifactConverter.scala
@@ -2,8 +2,8 @@ package scaladex.server.service
 
 import java.time.Instant
 
-import scaladex.core.model.ArtifactDependency.Scope
 import scaladex.core.model.*
+import scaladex.core.model.ArtifactDependency.Scope
 import scaladex.data.cleanup.*
 import scaladex.data.maven.ArtifactModel
 import scaladex.data.maven.Dependency

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -4,7 +4,7 @@ addSbtPlugin("io.github.irundaia" % "sbt-sassify" % "1.5.2")
 addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.4")
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
-addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0")
 
 libraryDependencies ++= Seq(
   "org.testcontainers" % "postgresql" % "1.20.4",