From 5e3d76fd98c85b655dd7e0942da0734daba778e7 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 17 Jan 2026 16:06:44 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.10.4 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 43220f70..94a67167 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.7.17" +version = "3.10.4" align.preset = more maxColumn = 100 From 2ec2174c423f52a000a6d76f33d5236fba36a9e7 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 17 Jan 2026 16:06:55 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.10.4 Executed command: scalafmt --non-interactive --- build.sc | 28 ++++++++------- .../almond/spark/DataFrameRenderers.scala | 2 +- .../ProgressSparkListener.scala | 3 +- .../spark/sql/almondinternals/SendLog.scala | 8 ++--- .../spark/sql/almondinternals/StageElem.scala | 12 ++++--- .../AmmoniteSparkSessionBuilder.scala | 2 +- .../SparkDependencies.scala | 4 +-- .../spark/repl/ExecutorClassLoader.scala | 2 +- .../spark/repl/ExecutorClassLoader.scala | 2 +- .../spark/repl/ExecutorClassLoader.scala | 2 +- .../spark/repl/ExecutorClassLoader.scala | 2 +- .../ammonite/spark/ProgressBarTests.scala | 3 +- .../scala/ammonite/spark/SparkReplTests.scala | 34 ++++++------------- .../spark/fromammonite/TestRepl.scala | 6 ++-- project/deps.sc | 10 +++--- 15 files changed, 56 insertions(+), 64 deletions(-) diff --git a/build.sc b/build.sc index 57af7ae7..6affc713 100644 --- a/build.sc +++ b/build.sc @@ -19,8 +19,8 @@ implicit def millModuleBasePath: define.BasePath = trait AmmSparkPublishModule extends PublishModule { import mill.scalalib.publish._ def publishVersion = T { - val v = VcsVersion.vcsState().format() - val dirtyIdx = v.indexOf("-DIRTY") + val v = VcsVersion.vcsState().format() + val dirtyIdx = v.indexOf("-DIRTY") def endsWithCommitHash = v.length > 6 && v.substring(v.length - 6).forall(c => c.isDigit || (c >= 'a' && c <= 'f')) if (dirtyIdx >= 0) v.take(dirtyIdx) + "-SNAPSHOT" @@ -92,7 +92,7 @@ trait WithDependencyResourceFile extends JavaModule { val dir = T.dest / "dep-file" val dest = dir / dependencyResourcePath - val deps0 = T.task(compileIvyDeps() ++ transitiveIvyDeps())() + val deps0 = T.task(compileIvyDeps() ++ transitiveIvyDeps())() val (_, res) = mill.modules.Jvm.resolveDependenciesMetadata( repositoriesTask(), deps0.map(resolveCoursierDependency().apply(_)), @@ -125,14 +125,14 @@ trait WithDependencyResourceFile extends JavaModule { object `spark-stubs_24` extends SbtModule with AmmSparkPublishModule { def scalaVersion = Versions.scala212 - def ivyDeps = super.ivyDeps() ++ Agg( + def ivyDeps = super.ivyDeps() ++ Agg( Deps.sparkSql(scalaVersion()) ) } object `spark-stubs_30` extends SbtModule with AmmSparkPublishModule { def scalaVersion = Versions.scala212 - def ivyDeps = super.ivyDeps() ++ Agg( + def ivyDeps = super.ivyDeps() ++ Agg( Deps.sparkSql3 ) } @@ -148,7 +148,7 @@ class SparkStubs32(val crossScalaVersion: String) extends CrossSbtModule object core extends Cross[Core](Versions.scala: _*) class Core(val crossScalaVersion: String) extends CrossSbtModule with WithPropertyFile with AmmSparkPublishModule with AmmSparkMima { - def artifactName = "ammonite-spark" + def artifactName = "ammonite-spark" def compileIvyDeps = super.compileIvyDeps() ++ Agg( Deps.ammoniteReplApi, Deps.sparkSql(scalaVersion()) @@ -158,16 +158,18 @@ class Core(val crossScalaVersion: String) extends CrossSbtModule with WithProper Deps.jettyServer ) def propertyFilePath = - os.sub / "org" / "apache" / "spark" / "sql" / "ammonitesparkinternals" / "ammonite-spark.properties" + os.sub / "org" / "apache" / "spark" / "sql" / "ammonitesparkinternals" / + "ammonite-spark.properties" def versionInProperties = publishVersion() - def propResourcesDir = T.persistent { + def propResourcesDir = T.persistent { import sys.process._ val dir = T.dest / "property-resources" val ver = publishVersion() val f = - dir / "org" / "apache" / "spark" / "sql" / "ammonitesparkinternals" / "ammonite-spark.properties" + dir / "org" / "apache" / "spark" / "sql" / "ammonitesparkinternals" / + "ammonite-spark.properties" val contentStr = s"""commit-hash=${Seq("git", "rev-parse", "HEAD").!!.trim} @@ -225,7 +227,7 @@ class Tests(val crossScalaVersion: String) extends CrossSbtModule with WithPrope object `local-spark-distrib-tests` extends SbtModule { private def sv = Versions.scala212 def scalaVersion = sv - def moduleDeps = super.moduleDeps ++ Seq( + def moduleDeps = super.moduleDeps ++ Seq( tests(sv) ) @@ -235,14 +237,14 @@ object `local-spark-distrib-tests` extends SbtModule { object `standalone-tests` extends SbtModule { private def sv = Versions.scala212 def scalaVersion = sv - def moduleDeps = super.moduleDeps ++ Seq( + def moduleDeps = super.moduleDeps ++ Seq( tests(sv) ) object test extends Tests with AmmSparkTests } -object `yarn-tests` extends Cross[YarnTests](Versions.scala: _*) +object `yarn-tests` extends Cross[YarnTests](Versions.scala: _*) class YarnTests(val crossScalaVersion: String) extends CrossSbtModule { def moduleDeps = super.moduleDeps ++ Seq( tests() @@ -254,7 +256,7 @@ class YarnTests(val crossScalaVersion: String) extends CrossSbtModule { object `yarn-spark-distrib-tests` extends SbtModule { private def sv = Versions.scala212 def scalaVersion = sv - def moduleDeps = super.moduleDeps ++ Seq( + def moduleDeps = super.moduleDeps ++ Seq( tests(sv) ) diff --git a/modules/almond-spark/src/main/scala/almond/spark/DataFrameRenderers.scala b/modules/almond-spark/src/main/scala/almond/spark/DataFrameRenderers.scala index e8911bea..a3ca16f6 100644 --- a/modules/almond-spark/src/main/scala/almond/spark/DataFrameRenderers.scala +++ b/modules/almond-spark/src/main/scala/almond/spark/DataFrameRenderers.scala @@ -9,7 +9,7 @@ object DataFrameRenderer { import scalatags.Text.all._ val columnFields = df.schema.fieldNames.toSeq.map(th(_)) val columns = tr(columnFields) - val rows = df + val rows = df .rdd .map { row => val fieldValues = row.toSeq.map(fieldToString).map(td(_)) diff --git a/modules/almond-spark/src/main/scala/org/apache/spark/sql/almondinternals/ProgressSparkListener.scala b/modules/almond-spark/src/main/scala/org/apache/spark/sql/almondinternals/ProgressSparkListener.scala index 9cb27e11..edfae833 100644 --- a/modules/almond-spark/src/main/scala/org/apache/spark/sql/almondinternals/ProgressSparkListener.scala +++ b/modules/almond-spark/src/main/scala/org/apache/spark/sql/almondinternals/ProgressSparkListener.scala @@ -49,7 +49,8 @@ final class ProgressSparkListener( } else publish.stderr( - s"Stage $stageId not found (only have ${elems.asScala.toVector.map(_._1).sorted})" + '\n' + s"Stage $stageId not found (only have ${elems.asScala.toVector.map(_._1).sorted})" + + '\n' ) } } diff --git a/modules/almond-spark/src/main/scala/org/apache/spark/sql/almondinternals/SendLog.scala b/modules/almond-spark/src/main/scala/org/apache/spark/sql/almondinternals/SendLog.scala index 7154d50a..daaccfa9 100644 --- a/modules/almond-spark/src/main/scala/org/apache/spark/sql/almondinternals/SendLog.scala +++ b/modules/almond-spark/src/main/scala/org/apache/spark/sql/almondinternals/SendLog.scala @@ -52,7 +52,7 @@ final class SendLog( res match { case Some(t) => t - case None => + case None => assert(delay.isFinite) Thread.sleep(delay.toMillis) helper((backOffFactor * delay).min(maxBackOffDelay)) @@ -111,7 +111,7 @@ final class SendLog( while (keepReading && lines.length <= lineBufferSize && br.ready()) lines += br.readLine() - val l = lines.result() + val l = lines.result() val l0 = if (replaceHome) { val home = sys.props("user.home") @@ -193,7 +193,7 @@ object SendLog { lazy val sendLog = new SendLog(f, commHandler, prefix = Option(prefix)) - val id = Id.generate() + val id = Id.generate() val data = DisplayData( Map(DisplayData.ContentType.text -> "", DisplayData.ContentType.html -> ""), idOpt = Some(id) @@ -203,7 +203,7 @@ object SendLog { commHandler.receiver( commName, onOpen = (_, _) => { - val msg = "See your browser developer console for detailed spark logs." + val msg = "See your browser developer console for detailed spark logs." val updatedData = DisplayData( Map( DisplayData.ContentType.text -> msg, 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 2cc866f8..fbac2c58 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 @@ -88,7 +88,9 @@ final class StageElem( |
- | $doneTasks0${if (diff == 0) "" else s" + $diff"} / $numTasks + | $doneTasks0${ + if (diff == 0) "" else s" + $diff" + } / $numTasks |
|
| @@ -97,7 +99,7 @@ final class StageElem( ) } else { - val taskOrTasks = if (numTasks <= 1) "task" else "tasks" + val taskOrTasks = if (numTasks <= 1) "task" else "tasks" val onGoingMessage = if (onGoingCount <= 0) "" else s", $onGoingCount on-going" @@ -109,7 +111,7 @@ final class StageElem( if (stageDone0 && !keep) { // Allow the user to see the completed bar before wiping it - val delay = 3.seconds + val delay = 3.seconds val runnable: Runnable = () => try { @@ -130,11 +132,11 @@ final class StageElem( object StageElem { private def keepAlive = 30.seconds - lazy val scheduler = { + lazy val scheduler = { val executor = new ScheduledThreadPoolExecutor( 1, new ThreadFactory { - val count = new AtomicInteger + val count = new AtomicInteger override def newThread(r: Runnable): Thread = { val name = s"almond-spark-progress-${count.getAndIncrement()}" val t = new Thread(r, name) 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 686be879..031a340c 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 @@ -404,7 +404,7 @@ class AmmoniteSparkSessionBuilder(implicit .toSet def toBeSent(jars: Seq[URI]): Seq[URI] = { - val nonSparkJars = jars.filter(uri => !sparkJarFileSet.contains(normalize(uri))) + val nonSparkJars = jars.filter(uri => !sparkJarFileSet.contains(normalize(uri))) val nonSparkJars0 = if (sendSourceJars0) nonSparkJars else nonSparkJars.filter(uri => !uri.toASCIIString.endsWith("-sources.jar")) diff --git a/modules/core/src/main/scala/org/apache/spark/sql/ammonitesparkinternals/SparkDependencies.scala b/modules/core/src/main/scala/org/apache/spark/sql/ammonitesparkinternals/SparkDependencies.scala index 6951848d..78ef4a38 100644 --- a/modules/core/src/main/scala/org/apache/spark/sql/ammonitesparkinternals/SparkDependencies.scala +++ b/modules/core/src/main/scala/org/apache/spark/sql/ammonitesparkinternals/SparkDependencies.scala @@ -71,7 +71,7 @@ object SparkDependencies { @tailrec def addIfClasses(module: String, classNames: List[String]): Unit = classNames match { - case Nil => + case Nil => case h :: t => try { cl.loadClass(h) @@ -96,7 +96,7 @@ object SparkDependencies { } def stubsDependency = { - val sv = org.apache.spark.SPARK_VERSION + val sv = org.apache.spark.SPARK_VERSION val suffix = sv.split('.').take(2) match { case Array("2", n) if Try(n.toInt).toOption.exists(_ <= 3) => "20" diff --git a/modules/spark-stubs_20/src/main/scala/org/apache/spark/repl/ExecutorClassLoader.scala b/modules/spark-stubs_20/src/main/scala/org/apache/spark/repl/ExecutorClassLoader.scala index b43cb175..63ea1dd9 100644 --- a/modules/spark-stubs_20/src/main/scala/org/apache/spark/repl/ExecutorClassLoader.scala +++ b/modules/spark-stubs_20/src/main/scala/org/apache/spark/repl/ExecutorClassLoader.scala @@ -62,7 +62,7 @@ class ExecutorClassLoader( private val fetchFn: (String) => InputStream = uri.getScheme() match { case "spark" => getClassFileInputStreamFromSparkRPC case "http" | "https" | "ftp" => getClassFileInputStreamFromHttpServer - case _ => + case _ => val fileSystem = FileSystem.get(uri, SparkHadoopUtil.get.newConfiguration(conf)) getClassFileInputStreamFromFileSystem(fileSystem) } diff --git a/modules/spark-stubs_24/src/main/scala/org/apache/spark/repl/ExecutorClassLoader.scala b/modules/spark-stubs_24/src/main/scala/org/apache/spark/repl/ExecutorClassLoader.scala index 11133b4c..42a22988 100644 --- a/modules/spark-stubs_24/src/main/scala/org/apache/spark/repl/ExecutorClassLoader.scala +++ b/modules/spark-stubs_24/src/main/scala/org/apache/spark/repl/ExecutorClassLoader.scala @@ -69,7 +69,7 @@ class ExecutorClassLoader( private val fetchFn: (String) => InputStream = uri.getScheme() match { case "spark" => getClassFileInputStreamFromSparkRPC case "http" | "https" | "ftp" => getClassFileInputStreamFromHttpServer - case _ => + case _ => val fileSystem = FileSystem.get(uri, SparkHadoopUtil.get.newConfiguration(conf)) getClassFileInputStreamFromFileSystem(fileSystem) } diff --git a/modules/spark-stubs_30/src/main/scala/org/apache/spark/repl/ExecutorClassLoader.scala b/modules/spark-stubs_30/src/main/scala/org/apache/spark/repl/ExecutorClassLoader.scala index 6017595a..94fc5b09 100644 --- a/modules/spark-stubs_30/src/main/scala/org/apache/spark/repl/ExecutorClassLoader.scala +++ b/modules/spark-stubs_30/src/main/scala/org/apache/spark/repl/ExecutorClassLoader.scala @@ -69,7 +69,7 @@ class ExecutorClassLoader( private val fetchFn: (String) => InputStream = uri.getScheme() match { case "spark" => getClassFileInputStreamFromSparkRPC case "http" | "https" | "ftp" => getClassFileInputStreamFromHttpServer - case _ => + case _ => val fileSystem = FileSystem.get(uri, SparkHadoopUtil.get.newConfiguration(conf)) getClassFileInputStreamFromFileSystem(fileSystem) } diff --git a/modules/spark-stubs_32/src/main/scala/org/apache/spark/repl/ExecutorClassLoader.scala b/modules/spark-stubs_32/src/main/scala/org/apache/spark/repl/ExecutorClassLoader.scala index 162eb820..160cd3ad 100644 --- a/modules/spark-stubs_32/src/main/scala/org/apache/spark/repl/ExecutorClassLoader.scala +++ b/modules/spark-stubs_32/src/main/scala/org/apache/spark/repl/ExecutorClassLoader.scala @@ -69,7 +69,7 @@ class ExecutorClassLoader( private val fetchFn: (String) => InputStream = uri.getScheme() match { case "spark" => getClassFileInputStreamFromSparkRPC case "http" | "https" | "ftp" => getClassFileInputStreamFromHttpServer - case _ => + case _ => val fileSystem = FileSystem.get(uri, SparkHadoopUtil.get.newConfiguration(conf)) getClassFileInputStreamFromFileSystem(fileSystem) } diff --git a/modules/tests/src/main/scala/ammonite/spark/ProgressBarTests.scala b/modules/tests/src/main/scala/ammonite/spark/ProgressBarTests.scala index 2523ea06..c8ec6e86 100644 --- a/modules/tests/src/main/scala/ammonite/spark/ProgressBarTests.scala +++ b/modules/tests/src/main/scala/ammonite/spark/ProgressBarTests.scala @@ -22,7 +22,7 @@ class ProgressBarTests(sparkVersion: String, master: String, conf: (String, Stri val tests = Tests { - "dummy test" - { + "dummy test" - sparkSession( if (interactive) """ @@ -47,7 +47,6 @@ class ProgressBarTests(sparkVersion: String, master: String, conf: (String, Stri @ val rdd = spark.sparkContext.makeRDD(1 to 10000, 200) """ ) - } } diff --git a/modules/tests/src/main/scala/ammonite/spark/SparkReplTests.scala b/modules/tests/src/main/scala/ammonite/spark/SparkReplTests.scala index 0385c9ed..245771a6 100644 --- a/modules/tests/src/main/scala/ammonite/spark/SparkReplTests.scala +++ b/modules/tests/src/main/scala/ammonite/spark/SparkReplTests.scala @@ -66,7 +66,7 @@ class SparkReplTests( // Beware that indentation of the session snippets is super sensitive. // All snippets should have the exact same indentation. - "simple foreach with accumulator" - { + "simple foreach with accumulator" - sparkSession( """ @ val accum = sc.longAccumulator @@ -78,9 +78,8 @@ class SparkReplTests( res: java.lang.Long = 55L """ ) - } - "external vars" - { + "external vars" - sparkSession( """ @ var v = 7 @@ -95,9 +94,8 @@ class SparkReplTests( res2: Int = 100 """ ) - } - "external classes" - { + "external classes" - sparkSession( """ @ class C { @@ -109,9 +107,8 @@ class SparkReplTests( res: Int = 50 """ ) - } - "external functions" - { + "external functions" - sparkSession( """ @ def double(x: Int) = x + x @@ -121,9 +118,8 @@ class SparkReplTests( res: Int = 110 """ ) - } - "external functions that access vars" - { + "external functions that access vars" - sparkSession( """ @ var v = 7 @@ -141,7 +137,6 @@ class SparkReplTests( res2: Int = 100 """ ) - } def hasBroadcastIssue = master == "local" || master.startsWith("local[") @@ -219,7 +214,7 @@ class SparkReplTests( ) } - "SPARK-2452 compound statements" - { + "SPARK-2452 compound statements" - sparkSession( """ @ val x = 4 ; def f() = x @@ -230,7 +225,6 @@ class SparkReplTests( resFoo: Int = 4 """ ) - } "SPARK-2576 importing implicits" - { val fieldNamePart = if (is212) "" else "value = " @@ -252,7 +246,7 @@ class SparkReplTests( ) } - "Datasets and encoders" - { + "Datasets and encoders" - sparkSession( """ @ import spark.implicits._ @@ -286,7 +280,6 @@ class SparkReplTests( res: Array[Int] = Array(10) """ ) - } "SPARK-2632 importing a method from non serializable class and not using it" - { val fieldNamePart = if (is212) "" else "value = " @@ -361,8 +354,7 @@ class SparkReplTests( ) } - "replicating blocks of object with class defined in repl" - { - + "replicating blocks of object with class defined in repl" - // FIXME The actual test also does https://github.com/apache/spark/blob/ab18b02e66fd04bc8f1a4fb7b6a7f2773902a494/repl/src/test/scala/org/apache/spark/repl/SingletonReplSuite.scala#L353-L359 sparkSession( @@ -387,7 +379,6 @@ class SparkReplTests( res: Int = 10 """ ) - } "should clone and clean line object in ClosureCleaner" - { inputUrlOpt match { @@ -430,7 +421,7 @@ class SparkReplTests( } } - "newProductSeqEncoder with REPL defined class" - { + "newProductSeqEncoder with REPL defined class" - sparkSession( """ @ case class Click(id: Int) @@ -440,7 +431,6 @@ class SparkReplTests( res: Boolean = true """ ) - } // Adapted from https://github.com/apache/spark/blob/3d5c61e5fd24f07302e39b5d61294da79aa0c2f9/repl/src/test/scala/org/apache/spark/repl/ReplSuite.scala#L193-L208 "line wrapper only initialized once when used as encoder outer scope" - { @@ -488,7 +478,7 @@ class SparkReplTests( } // Adapted from https://github.com/apache/spark/blob/3d5c61e5fd24f07302e39b5d61294da79aa0c2f9/repl/src/test/scala/org/apache/spark/repl/ReplSuite.scala#L230-L238 - "spark-shell should find imported types in class constructors and extends clause" - { + "spark-shell should find imported types in class constructors and extends clause" - sparkSession( """ @ import org.apache.spark.Partition @@ -501,10 +491,9 @@ class SparkReplTests( defined class P """ ) - } // https://github.com/apache/spark/blob/3d5c61e5fd24f07302e39b5d61294da79aa0c2f9/repl/src/test/scala/org/apache/spark/repl/ReplSuite.scala#L240-L259 - "spark-shell should shadow val/def definitions correctly" - { + "spark-shell should shadow val/def definitions correctly" - sparkSession( """ @ def myMethod() = "first definition" @@ -539,7 +528,6 @@ class SparkReplTests( res: String = "!!2!!" """ ) - } // tests below are custom ones diff --git a/modules/tests/src/main/scala/ammonite/spark/fromammonite/TestRepl.scala b/modules/tests/src/main/scala/ammonite/spark/fromammonite/TestRepl.scala index 2cd86a72..00dd50ac 100644 --- a/modules/tests/src/main/scala/ammonite/spark/fromammonite/TestRepl.scala +++ b/modules/tests/src/main/scala/ammonite/spark/fromammonite/TestRepl.scala @@ -37,7 +37,7 @@ class TestRepl { val warningBuffer = mutable.Buffer.empty[String] val errorBuffer = mutable.Buffer.empty[String] val infoBuffer = mutable.Buffer.empty[String] - val printer0 = Printer( + val printer0 = Printer( new PrintStream(outBytes), new PrintStream(errBytes), new PrintStream(resBytes), @@ -51,7 +51,7 @@ class TestRepl { val frames: Ref[List[Frame]] = Ref(List(Frame.createInitial(initialLoader))) val sess0 = new SessionApiImpl(frames) - var currentLine = 0 + var currentLine = 0 val interpParams = Interpreter.Parameters( printer = printer0, storage = storage, @@ -277,7 +277,7 @@ class TestRepl { () => currentLine += 1 ) processed match { - case Res.Failure(s) => printer0.error(s) + case Res.Failure(s) => printer0.error(s) case Res.Exception(throwable, msg) => printer0.error( Repl.showException(throwable, fansi.Attrs.Empty, fansi.Attrs.Empty, fansi.Attrs.Empty) diff --git a/project/deps.sc b/project/deps.sc index 27a572b4..97d235a7 100644 --- a/project/deps.sc +++ b/project/deps.sc @@ -17,15 +17,15 @@ object Deps { def ammoniteReplApi = ivy"sh.almond.tmp.ammonite:::ammonite-repl-api:${Versions.ammonite}" def ammoniteRepl = ivy"sh.almond.tmp.ammonite:::ammonite-repl:${Versions.ammonite}" - def classPathUtil = ivy"io.get-coursier::class-path-util:0.1.4" - def jettyServer = ivy"org.eclipse.jetty:jetty-server:9.4.58.v20250814" + def classPathUtil = ivy"io.get-coursier::class-path-util:0.1.4" + def jettyServer = ivy"org.eclipse.jetty:jetty-server:9.4.58.v20250814" def jsoniterScalaCore = ivy"com.github.plokhotnyuk.jsoniter-scala::jsoniter-scala-core:${Versions.jsoniterScala}" def jsoniterScalaMacros = ivy"com.github.plokhotnyuk.jsoniter-scala::jsoniter-scala-macros:${Versions.jsoniterScala}" - def log4j2 = ivy"org.apache.logging.log4j:log4j-core:2.17.2" - def scalaKernelApi = ivy"sh.almond:::scala-kernel-api:${Versions.almond}" - def scalatags = ivy"com.lihaoyi::scalatags:0.12.0" + def log4j2 = ivy"org.apache.logging.log4j:log4j-core:2.17.2" + def scalaKernelApi = ivy"sh.almond:::scala-kernel-api:${Versions.almond}" + def scalatags = ivy"com.lihaoyi::scalatags:0.12.0" def sparkSql(sv: String) = { val ver = if (sv.startsWith("2.12.")) "2.4.0" From 5e1cc72ad817617da899ef029017686c9d58b901 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 17 Jan 2026 16:06:55 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.10.4' 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 00000000..f283c081 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.10.4 +2ec2174c423f52a000a6d76f33d5236fba36a9e7