From 58348e23e4774b80a5299f20996cd25c36e03e5b Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 20 Feb 2024 05:53:31 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.8.0 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 7914cb369..376b6ac32 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 From c7afd84c5921949600cd336bbc72acbb41d2342b Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 20 Feb 2024 05:54:11 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.8.0 Executed command: scalafmt --non-interactive --- .../src/test/scala/sbt/internal/inc/IncHandler.scala | 7 ++++++- .../resources/sources/naha/ClientWithImplicitUsed.scala | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) 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 11c73cdd3..ac479e33a 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 3982b708f..2a6f4eaba 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) From 16cd2905183dd9147f8d76c0344251923e611001 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 20 Feb 2024 05:54:11 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.8.0' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 000000000..ce9f08628 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.8.0 +c7afd84c5921949600cd336bbc72acbb41d2342b