From df5b421016235bd7ab8b6df671ba536b64b19630 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 16 Jun 2024 13:10:06 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.8.2 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 43220f7..4e3bc9c 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.7.17" +version = "3.8.2" align.preset = more maxColumn = 100 From 6c4324ce8dd8c23e100c4c6d26c9834af083f421 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 16 Jun 2024 13:10:18 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.8.2 Executed command: scalafmt --non-interactive --- .../apache/spark/sql/almondinternals/StageElem.scala | 7 ++++--- modules/tests/src/main/scala/ammonite/spark/Init.scala | 10 ++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/modules/almond-spark/src/main/scala/org/apache/spark/sql/almondinternals/StageElem.scala b/modules/almond-spark/src/main/scala/org/apache/spark/sql/almondinternals/StageElem.scala index 2cc866f..23f2719 100644 --- a/modules/almond-spark/src/main/scala/org/apache/spark/sql/almondinternals/StageElem.scala +++ b/modules/almond-spark/src/main/scala/org/apache/spark/sql/almondinternals/StageElem.scala @@ -85,9 +85,10 @@ final class StageElem( publish.updateHtml( s"""
- |
+ |
| $doneTasks0${if (diff == 0) "" else s" + $diff"} / $numTasks |
|
diff --git a/modules/tests/src/main/scala/ammonite/spark/Init.scala b/modules/tests/src/main/scala/ammonite/spark/Init.scala index a0a0031..5f2c7c8 100644 --- a/modules/tests/src/main/scala/ammonite/spark/Init.scala +++ b/modules/tests/src/main/scala/ammonite/spark/Init.scala @@ -29,8 +29,9 @@ object Init { @ assert(org.apache.spark.SPARK_VERSION == "$sparkVersion") // sanity check - @ val spark = AmmoniteSparkSession.builder()${prependBuilderCalls.mkString}.appName("test-ammonite-spark").master("$master")${conf.map( - t => s".config($q${t._1}$q, $q${t._2}$q)" + @ val spark = AmmoniteSparkSession.builder()${prependBuilderCalls + .mkString}.appName("test-ammonite-spark").master("$master")${conf.map(t => + s".config($q${t._1}$q, $q${t._2}$q)" ).mkString}.getOrCreate() @ def sc = spark.sparkContext""" @@ -56,8 +57,9 @@ object Init { | |assert(org.apache.spark.SPARK_VERSION == "$sparkVersion") // sanity check | - |val spark = AmmoniteSparkSession.builder()${prependBuilderCalls.mkString}.appName("test-ammonite-spark").master("$master")${conf.map( - t => s".config($q${t._1}$q, $q${t._2}$q)" + |val spark = AmmoniteSparkSession.builder()${prependBuilderCalls + .mkString}.appName("test-ammonite-spark").master("$master")${conf.map(t => + s".config($q${t._1}$q, $q${t._2}$q)" ).mkString}.getOrCreate() |def sc = spark.sparkContext |""".stripMargin From 38810522d842af5137395d1ab334502d98f21e28 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 16 Jun 2024 13:10:18 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.8.2' 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 0000000..cc76339 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.8.2 +6c4324ce8dd8c23e100c4c6d26c9834af083f421