From 03d9240c87efcba8d84f9dd03ff2485632572e4f Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 17 Nov 2023 20:17:40 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.7.17 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 8e8d1e8..b761d01 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.7.14" +version = "3.7.17" align.preset = none align.openParenCallSite = false From 212627a6eaa9a9d667b63baae274d89a3a1a9d85 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 17 Nov 2023 20:17:51 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.7.17 Executed command: scalafmt --non-interactive --- .../mill/kotlin/KotlinModulePlatform.scala | 14 +++++++------- .../mill/kotlin/KotlinModulePlatform.scala | 14 +++++++------- .../mill/kotlin/KotlinModulePlatform.scala | 14 +++++++------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/main/src-0.10/de/tobiasroeser/mill/kotlin/KotlinModulePlatform.scala b/main/src-0.10/de/tobiasroeser/mill/kotlin/KotlinModulePlatform.scala index 8243299..6888e23 100644 --- a/main/src-0.10/de/tobiasroeser/mill/kotlin/KotlinModulePlatform.scala +++ b/main/src-0.10/de/tobiasroeser/mill/kotlin/KotlinModulePlatform.scala @@ -25,13 +25,13 @@ trait KotlinModulePlatform extends JavaModule { } private[kotlin] def internalCompileJavaFiles( - worker: ZincWorkerApi, - upstreamCompileOutput: Seq[CompilationResult], - javaSourceFiles: Seq[os.Path], - compileCp: Agg[os.Path], - javacOptions: Seq[String], - compileProblemReporter: Option[CompileProblemReporter], - reportOldProblems: Boolean + worker: ZincWorkerApi, + upstreamCompileOutput: Seq[CompilationResult], + javaSourceFiles: Seq[os.Path], + compileCp: Agg[os.Path], + javacOptions: Seq[String], + compileProblemReporter: Option[CompileProblemReporter], + reportOldProblems: Boolean )(implicit ctx: ZincWorkerApi.Ctx): Result[CompilationResult] = { worker.compileJava( upstreamCompileOutput = upstreamCompileOutput, diff --git a/main/src-0.11/de/tobiasroeser/mill/kotlin/KotlinModulePlatform.scala b/main/src-0.11/de/tobiasroeser/mill/kotlin/KotlinModulePlatform.scala index c6cdc48..693dd49 100644 --- a/main/src-0.11/de/tobiasroeser/mill/kotlin/KotlinModulePlatform.scala +++ b/main/src-0.11/de/tobiasroeser/mill/kotlin/KotlinModulePlatform.scala @@ -23,13 +23,13 @@ trait KotlinModulePlatform extends JavaModule { } private[kotlin] def internalCompileJavaFiles( - worker: ZincWorkerApi, - upstreamCompileOutput: Seq[CompilationResult], - javaSourceFiles: Seq[os.Path], - compileCp: Agg[os.Path], - javacOptions: Seq[String], - compileProblemReporter: Option[CompileProblemReporter], - reportOldProblems: Boolean + worker: ZincWorkerApi, + upstreamCompileOutput: Seq[CompilationResult], + javaSourceFiles: Seq[os.Path], + compileCp: Agg[os.Path], + javacOptions: Seq[String], + compileProblemReporter: Option[CompileProblemReporter], + reportOldProblems: Boolean )(implicit ctx: ZincWorkerApi.Ctx): Result[CompilationResult] = { worker.compileJava( upstreamCompileOutput = upstreamCompileOutput, diff --git a/main/src-0.9-/de/tobiasroeser/mill/kotlin/KotlinModulePlatform.scala b/main/src-0.9-/de/tobiasroeser/mill/kotlin/KotlinModulePlatform.scala index 8c4cdbb..0c0a1ab 100644 --- a/main/src-0.9-/de/tobiasroeser/mill/kotlin/KotlinModulePlatform.scala +++ b/main/src-0.9-/de/tobiasroeser/mill/kotlin/KotlinModulePlatform.scala @@ -27,13 +27,13 @@ trait KotlinModulePlatform extends JavaModule { } private[kotlin] def internalCompileJavaFiles( - worker: ZincWorkerApi, - upstreamCompileOutput: Seq[CompilationResult], - javaSourceFiles: Seq[os.Path], - compileCp: Agg[os.Path], - javacOptions: Seq[String], - compileProblemReporter: Option[CompileProblemReporter], - reportOldProblems: Boolean + worker: ZincWorkerApi, + upstreamCompileOutput: Seq[CompilationResult], + javaSourceFiles: Seq[os.Path], + compileCp: Agg[os.Path], + javacOptions: Seq[String], + compileProblemReporter: Option[CompileProblemReporter], + reportOldProblems: Boolean )(implicit ctx: ZincWorkerApi.Ctx): Result[CompilationResult] = { worker.compileJava( upstreamCompileOutput = upstreamCompileOutput, From 65d0649cbafc68b042fbab000ec7217414697725 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 17 Nov 2023 20:17:51 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.7.17' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index cd589ac..c153c1f 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,5 @@ # Scala Steward: Reformat with scalafmt 3.0.8 8d58705806bcf399976168d377c9fc79023043b6 + +# Scala Steward: Reformat with scalafmt 3.7.17 +212627a6eaa9a9d667b63baae274d89a3a1a9d85