diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000..0a48b02 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.8.0 +deba18d0c776c804f4b628bf5051469a6229b4a1 diff --git a/.scalafmt.conf b/.scalafmt.conf index 43220f7..ec0110f 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.7.17" +version = "3.8.0" align.preset = more maxColumn = 100 diff --git a/modules/core/src/main/scala/org/apache/spark/sql/ammonitesparkinternals/AmmoniteSparkSessionBuilder.scala b/modules/core/src/main/scala/org/apache/spark/sql/ammonitesparkinternals/AmmoniteSparkSessionBuilder.scala index 686be87..57910f1 100644 --- a/modules/core/src/main/scala/org/apache/spark/sql/ammonitesparkinternals/AmmoniteSparkSessionBuilder.scala +++ b/modules/core/src/main/scala/org/apache/spark/sql/ammonitesparkinternals/AmmoniteSparkSessionBuilder.scala @@ -366,8 +366,10 @@ class AmmoniteSparkSessionBuilder(implicit case None => printLine("Getting spark JARs") val sparkJars0 = - SparkDependencies.sparkJars(interpApi.repositories(), interpApi.resolutionHooks, Nil) - (sparkJars0, Nil) + SparkDependencies.sparkJars(interpApi.repositories(), interpApi.resolutionHooks, Nil)( + sparkJars0, + Nil + ) case Some(sparkHome) => // Loose attempt at using the scala JARs already loaded in Ammonite, // rather than ones from the spark distribution.