Merge pull request #1335 from scala-steward/update/scalafmt-core-3.8.0

SethTisue · web-flow · commit ba60965b4b39 · 2024-02-20T14:46:49.000-08:00
Update scalafmt-core to 3.8.0
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1,2 @@
+# Scala Steward: Reformat with scalafmt 3.8.0
+c7afd84c5921949600cd336bbc72acbb41d2342b
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.7.17
+version = 3.8.0
 runner.dialect = scala212
 
 project.git = true
diff --git a/internal/zinc-scripted/src/test/scala/sbt/internal/inc/IncHandler.scala b/internal/zinc-scripted/src/test/scala/sbt/internal/inc/IncHandler.scala
@@ -196,7 +196,12 @@ class IncHandler(directory: Path, cacheDir: Path, scriptedLog: ManagedLogger, co
       toCache
     }
     val analyzingCompiler = scalaCompiler(si, compilerBridge)
-    val cs = incrementalCompiler.compilers(si, ClasspathOptionsUtil.noboot(si.version), None, analyzingCompiler)
+    val cs = incrementalCompiler.compilers(
+      si,
+      ClasspathOptionsUtil.noboot(si.version),
+      None,
+      analyzingCompiler
+    )
     IncState(si, cs, 0)
   }
 
diff --git a/zinc/src/test/resources/sources/naha/ClientWithImplicitUsed.scala b/zinc/src/test/resources/sources/naha/ClientWithImplicitUsed.scala
@@ -12,7 +12,7 @@
 package naha
 
 object ClientWithImplicitUsed {
-  def add(nr: Any)(implicit no: ImplicitWrapper[_]) = nr.toString + no.a.toString
+  def add(nr: Any)(implicit no: ImplicitWrapper[?]) = nr.toString + no.a.toString
 
   val vals: Seq[Any] = Seq(NormalDependecy.implicitMember, NormalDependecy.standardMember)
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Scala Steward: Reformat with scalafmt 3.8.0`
	`2`	`+c7afd84c5921949600cd336bbc72acbb41d2342b`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,12 @@ class IncHandler(directory: Path, cacheDir: Path, scriptedLog: ManagedLogger, co`
`196`	`196`	`toCache`
`197`	`197`	`}`
`198`	`198`	`val analyzingCompiler = scalaCompiler(si, compilerBridge)`
`199`		`- val cs = incrementalCompiler.compilers(si, ClasspathOptionsUtil.noboot(si.version), None, analyzingCompiler)`
	`199`	`+ val cs = incrementalCompiler.compilers(`
	`200`	`+ si,`
	`201`	`+ ClasspathOptionsUtil.noboot(si.version),`
	`202`	`+ None,`
	`203`	`+ analyzingCompiler`
	`204`	`+ )`
`200`	`205`	`IncState(si, cs, 0)`
`201`	`206`	`}`
`202`	`207`