Merge pull request #3544 from armanbilge/topic/scalafix-updates

armanbilge · web-flow · commit 1d67ef4740b9 · 2025-03-11T01:36:18.000-07:00
Scalafix updates
diff --git a/scalafix/project/build.properties b/scalafix/project/build.properties
@@ -1 +1 @@
-sbt.version=1.5.3
+sbt.version=1.10.10
diff --git a/scalafix/project/plugins.sbt b/scalafix/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.29")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.2")
diff --git a/scalafix/rules/src/main/scala/fix/v1.scala b/scalafix/rules/src/main/scala/fix/v1.scala
@@ -391,7 +391,7 @@ object StreamAppRules {
       tpl.copy(
         inits = tpl.inits :+ Init(Type.Name("IOApp"), Name("IOApp"), List()),
         stats = addProgramRun(tpl.stats)).toString()
-    ) + Patch.addLeft(tpl, "extends ")
+    )
 
   private[this] def replaceStats(stats: List[Stat]): List[Patch] =
     stats.flatMap{
diff --git a/scalafix/tests/src/test/scala/fix/RuleSuite.scala b/scalafix/tests/src/test/scala/fix/RuleSuite.scala
@@ -1,8 +1,8 @@
 package fix
 
-import org.scalatest.FunSuiteLike
+import org.scalatest.funsuite.AnyFunSuiteLike
 import scalafix.testkit.AbstractSemanticRuleSuite
 
-class RuleSuite extends AbstractSemanticRuleSuite with FunSuiteLike {
+class RuleSuite extends AbstractSemanticRuleSuite with AnyFunSuiteLike {
   runAllTests()
 }

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.29")`
	`1`	`+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.2")`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package fix`
`2`	`2`
`3`		`-import org.scalatest.FunSuiteLike`
	`3`	`+import org.scalatest.funsuite.AnyFunSuiteLike`
`4`	`4`	`import scalafix.testkit.AbstractSemanticRuleSuite`
`5`	`5`
`6`		`-class RuleSuite extends AbstractSemanticRuleSuite with FunSuiteLike {`
	`6`	`+class RuleSuite extends AbstractSemanticRuleSuite with AnyFunSuiteLike {`
`7`	`7`	`runAllTests()`
`8`	`8`	`}`