diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000000..ce9f086281 --- /dev/null +++ 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 index 7914cb3693..376b6ac321 100644 --- 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 index 11c73cdd37..ac479e33a7 100644 --- 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 index 3982b708f2..2a6f4eabad 100644 --- 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)