Defork back to scapegoat-scala org on github (#985)

Johnnei · Renovate Bot · web-flow · commit 66f70113b8df · 2025-10-20T17:22:17.000+02:00
* chore(ci): Migrate to GitLab CI and update groupIds

* chore: Switch project to use coursier instead of ivy

* feat: Support Scala 3.7.3

* fix(scala3): Member mutability must match trait

* chore(deps): update dependency scalafmt to v3.9.10

* chore(deps): update dependency com.eed3si9n:sbt-assembly to v0.15.0

* Defork back to scala-scapegoat org on github

* chore(fmt): Apply Scalafmt

---------

Co-authored-by: Renovate Bot &lt;renovate@johnnei.org&gt;
diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
@@ -12,10 +12,10 @@ jobs:
         scala:
           - 2.12.19
           - 2.12.20
-          - 2.13.15
           - 2.13.16
+          - 2.13.17
           - 3.3.6
-          - 3.7.0
+          - 3.7.3
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
@@ -24,9 +24,9 @@ jobs:
           java-version: ${{matrix.java}}
       - uses: actions/cache@v4
         with:
-          path: ~/.ivy2/cache
-          key: ivy-${{hashFiles('**/*.sbt')}}-${{matrix.scala}}
-          restore-keys: ivy-
+          path: ~/.cache/coursier
+          key: coursier-${{hashFiles('**/*.sbt')}}
+          restore-keys: coursier-
       - uses: actions/cache@v4
         with:
           path: ~/.sbt
@@ -44,9 +44,9 @@ jobs:
           java-version: 11
       - uses: actions/cache@v4
         with:
-          path: ~/.ivy2/cache
-          key: ivy-${{hashFiles('**/*.sbt')}}
-          restore-keys: ivy-
+          path: ~/.cache/coursier
+          key: coursier-${{hashFiles('**/*.sbt')}}
+          restore-keys: coursier-
       - uses: actions/cache@v4
         with:
           path: ~/.sbt
diff --git a/.jvmopts b/.jvmopts
diff --git a/.mergify.yml b/.mergify.yml
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.8.3"
+version = "3.9.10"
 runner.dialect = scala3
 maxColumn = 110
 docstrings.style = Asterisk
diff --git a/build.sbt b/build.sbt
@@ -19,8 +19,8 @@ developers := List(
   )
 )
 
-scalaVersion := "3.7.0"
-crossScalaVersions := Seq("2.12.19", "2.12.20", "2.13.15", "2.13.16", "3.3.6", "3.7.0")
+scalaVersion := "3.7.3"
+crossScalaVersions := Seq("2.12.19", "2.12.20", "2.13.16", "2.13.17", "3.3.6", "3.7.3")
 autoScalaLibrary := false
 crossVersion := CrossVersion.full
 crossTarget := {
@@ -31,9 +31,6 @@ versionScheme := Some("early-semver")
 semanticdbEnabled := (scalaBinaryVersion.value == "3")
 scalafixConfig := Some(file(if (scalaBinaryVersion.value == "3") ".scalafix.conf" else ".scalafix-2.conf"))
 
-// https://github.com/sksamuel/scapegoat/issues/298
-ThisBuild / useCoursier := false
-
 val scala2Options = Seq(
   "-Xlint",
   "-Xlint:adapted-args",
@@ -118,7 +115,7 @@ libraryDependencies ++= (if (scalaBinaryVersion.value == "3") {
                              "org.scala-lang" % "scala-compiler" % scalaVersion.value % "provided",
                              "org.scala-lang" % "scala-compiler" % scalaVersion.value % "test",
                              compilerPlugin(
-                               "org.scalameta" % "semanticdb-scalac" % "4.13.6" cross CrossVersion.full
+                               "org.scalameta" % "semanticdb-scalac" % "4.13.10" cross CrossVersion.full
                              )
                            )
                          })
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.11.0
+sbt.version=1.11.7
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,8 +1,6 @@
-resolvers += Classpaths.sbtPluginReleases
-
-addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.3")
-addSbtPlugin("com.eed3si9n"   % "sbt-assembly"   % "0.14.10")
-addSbtPlugin("org.scalameta"  % "sbt-scalafmt"   % "2.5.4")
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2")
+addSbtPlugin("com.eed3si9n"   % "sbt-assembly"   % "0.15.0")
+addSbtPlugin("org.scalameta"  % "sbt-scalafmt"   % "2.5.5")
 addSbtPlugin("org.scoverage"  % "sbt-scoverage"  % "2.3.1")
 addSbtPlugin("ch.epfl.scala"  % "sbt-scalafix"   % "0.14.3")
 
diff --git a/sonatype.sbt b/sonatype.sbt
diff --git a/src/main/scala-2/com/sksamuel/scapegoat/inspections/AvoidRequire.scala b/src/main/scala-2/com/sksamuel/scapegoat/inspections/AvoidRequire.scala
@@ -2,13 +2,13 @@ package com.sksamuel.scapegoat.inspections
 
 import com.sksamuel.scapegoat.{Inspection, InspectionContext, Inspector, Levels}
 
-class AvoidRequire extends
-  Inspection(
-    text = "Use of require",
-    defaultLevel = Levels.Warning,
-    description = "Use require in code.",
-    explanation = "Using require throws an untyped Exception."
-  ) {
+class AvoidRequire
+    extends Inspection(
+      text = "Use of require",
+      defaultLevel = Levels.Warning,
+      description = "Use require in code.",
+      explanation = "Using require throws an untyped Exception."
+    ) {
 
   def inspector(ctx: InspectionContext): Inspector =
     new Inspector(ctx) {
diff --git a/src/main/scala-2/com/sksamuel/scapegoat/inspections/traits/AbstractTrait.scala b/src/main/scala-2/com/sksamuel/scapegoat/inspections/traits/AbstractTrait.scala
@@ -3,12 +3,13 @@ package com.sksamuel.scapegoat.inspections.traits
 import com.sksamuel.scapegoat._
 
 class AbstractTrait
-  extends Inspection(
-    text = "Use of abstract trait",
-    defaultLevel = Levels.Info,
-    description = "Traits are automatically abstract.",
-    explanation = "The abstract modifier is used in class definitions. It is redundant for traits, and mandatory for all other classes which have incomplete members."
-  ){
+    extends Inspection(
+      text = "Use of abstract trait",
+      defaultLevel = Levels.Info,
+      description = "Traits are automatically abstract.",
+      explanation =
+        "The abstract modifier is used in class definitions. It is redundant for traits, and mandatory for all other classes which have incomplete members."
+    ) {
 
   override def inspector(ctx: InspectionContext): Inspector = {
     new Inspector(ctx) {
@@ -17,9 +18,8 @@ class AbstractTrait
 
           import context.global._
 
-          def isAbstractTrait(positions: Map[Long, Position]): Boolean = {
+          def isAbstractTrait(positions: Map[Long, Position]): Boolean =
             positions.contains(Flag.TRAIT) && positions.contains(Flag.ABSTRACT)
-          }
 
           override def inspect(tree: Tree): Unit = {
             tree match {
diff --git a/src/main/scala-3/com/sksamuel/scapegoat/Plugin.scala b/src/main/scala-3/com/sksamuel/scapegoat/Plugin.scala
@@ -28,7 +28,7 @@ class ScapegoatPlugin extends StandardPlugin {
 
 }
 
-class ScapegoatPhase(val configuration: Configuration, override val inspections: Seq[Inspection])
+class ScapegoatPhase(var configuration: Configuration, override val inspections: Seq[Inspection])
     extends PluginPhase
     with ScapegoatBasePlugin {
 
diff --git a/src/main/scala/com/sksamuel/scapegoat/Configuration.scala b/src/main/scala/com/sksamuel/scapegoat/Configuration.scala
@@ -66,7 +66,7 @@ object Configuration {
           .map { nameLevel =>
             nameLevel.split("=") match {
               case Array(insp, level) => insp -> Levels.fromName(level)
-              case _ =>
+              case _                  =>
                 throw new IllegalArgumentException(
                   s"Malformed argument to 'overrideLevels': '$nameLevel'. " +
                     "Expecting 'name=level' where 'name' is the simple name of an inspection and 'level' is the simple name of a com.sksamuel.scapegoat.Level constant, e.g. 'Warning'."
diff --git a/src/main/scala/com/sksamuel/scapegoat/io/HtmlReportWriter.scala b/src/main/scala/com/sksamuel/scapegoat/io/HtmlReportWriter.scala
@@ -126,7 +126,7 @@ object HtmlReportWriter extends ReportWriter {
             {decorateCode(warning.explanation.replace("<", "&lt;").replace(">", "&gt;"))}
           </div>{
         warning.snippet match {
-          case None =>
+          case None          =>
           case Some(snippet) =>
             <div class="snippet">
               {snippet}
diff --git a/src/test/scala-2/com/sksamuel/scapegoat/PluginRunner.scala b/src/test/scala-2/com/sksamuel/scapegoat/PluginRunner.scala
@@ -63,13 +63,13 @@ trait PluginRunner {
     scalaJars.map(findScalaJar)
   }
 
-  def findScalaJar(artifactId: String): File = findIvyJar("org.scala-lang", artifactId, scalaVersion)
+  def findScalaJar(artifactId: String): File = findIvyJar("org/scala-lang", artifactId, scalaVersion)
 
   def findIvyJar(groupId: String, artifactId: String, version: String): File = {
-    val userHome = System.getProperty("user.home")
-    val sbtHome = userHome + "/.ivy2"
-    val jarPath =
-      sbtHome + "/cache/" + groupId + "/" + artifactId + "/jars/" + artifactId + "-" + version + ".jar"
+    val coursierCache =
+      sys.env.getOrElse("COURSIER_CACHE", System.getProperty("user.home") + "/.cache/coursier/v1")
+    val mavenProxy = sys.env.getOrElse("MAVEN_PROXY", "https/repo1.maven.org/maven2")
+    val jarPath = s"$coursierCache/$mavenProxy/$groupId/$artifactId/$version/$artifactId-$version.jar"
     val file = new File(jarPath)
     if (file.exists) file
     else throw new FileNotFoundException(s"Could not locate [$jarPath].")
diff --git a/src/test/scala-3/com/sksamuel/scapegoat/DottyRunner.scala b/src/test/scala-3/com/sksamuel/scapegoat/DottyRunner.scala
@@ -100,16 +100,16 @@ class DottyRunner(
 
   private def getScalaJars: List[File] = {
     val scalaJars = List("scala3-library_3")
-    findIvyJar("org.scala-lang", "scala-library", scalaVersion) :: scalaJars.map(findScalaJar)
+    findIvyJar("org/scala-lang", "scala-library", scalaVersion) :: scalaJars.map(findScalaJar)
   }
 
-  private def findScalaJar(artifactId: String): File = findIvyJar("org.scala-lang", artifactId, dottyVersion)
+  private def findScalaJar(artifactId: String): File = findIvyJar("org/scala-lang", artifactId, dottyVersion)
 
   private def findIvyJar(groupId: String, artifactId: String, version: String): File = {
-    val userHome = System.getProperty("user.home")
-    val sbtHome = userHome + "/.ivy2"
-    val jarPath =
-      sbtHome + "/cache/" + groupId + "/" + artifactId + "/jars/" + artifactId + "-" + version + ".jar"
+    val coursierCache =
+      sys.env.getOrElse("COURSIER_CACHE", System.getProperty("user.home") + "/.cache/coursier/v1")
+    val mavenProxy = sys.env.getOrElse("MAVEN_PROXY", "https/repo1.maven.org/maven2")
+    val jarPath = s"$coursierCache/$mavenProxy/$groupId/$artifactId/$version/$artifactId-$version.jar"
     val file = new File(jarPath)
     if (file.exists) file
     else throw new FileNotFoundException(s"Could not locate [$jarPath].")
diff --git a/src/test/scala/com/sksamuel/scapegoat/WarningTest.scala b/src/test/scala/com/sksamuel/scapegoat/WarningTest.scala
@@ -17,18 +17,14 @@ class WarningTest extends AnyFreeSpec {
 
   "Warning" - {
     "hasMinimalLevelOf" - {
-      "info >= info" in {
-        assert(warning.hasMinimalLevelOf(Levels.Info) === true)
-      }
-      "info < warning" in {
-        assert(warning.hasMinimalLevelOf(Levels.Warning) === false)
-      }
-      "info < error" in {
-        assert(warning.hasMinimalLevelOf(Levels.Error) === false)
-      }
-      "error > warning" in {
-        assert(warning.copy(level = Levels.Error).hasMinimalLevelOf(Levels.Warning) === true)
-      }
+      "info >= info" in
+      assert(warning.hasMinimalLevelOf(Levels.Info) === true)
+      "info < warning" in
+      assert(warning.hasMinimalLevelOf(Levels.Warning) === false)
+      "info < error" in
+      assert(warning.hasMinimalLevelOf(Levels.Error) === false)
+      "error > warning" in
+      assert(warning.copy(level = Levels.Error).hasMinimalLevelOf(Levels.Warning) === true)
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version = "3.8.3"`
	`1`	`+version = "3.9.10"`
`2`	`2`	`runner.dialect = scala3`
`3`	`3`	`maxColumn = 110`
`4`	`4`	`docstrings.style = Asterisk`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-sbt.version=1.11.0`
	`1`	`+sbt.version=1.11.7`