From a7e8718afab239d226037961233cb7b73db70eaa Mon Sep 17 00:00:00 2001 From: Jan Chyb Date: Fri, 20 Sep 2024 12:33:40 +0200 Subject: [PATCH 1/2] Replace diffutils library with munit-diff munit-diff is a reimplementation of of the diffutils, necessary for cross compilation with Scala Native. --- build.sbt | 2 +- scalafmt-cli/src/main/scala/org/scalafmt/cli/InputMethod.scala | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 881b28b956..27e5e1a0d5 100644 --- a/build.sbt +++ b/build.sbt @@ -174,7 +174,7 @@ lazy val cli = project.in(file("scalafmt-cli")).settings( oldStrategy(x) }, libraryDependencies ++= Seq( - "com.googlecode.java-diff-utils" % "diffutils" % "1.3.0", + "org.scalameta" %% "munit-diff" % "1.0.2", "com.martiansoftware" % "nailgun-server" % "0.9.1", "com.github.scopt" %% "scopt" % "4.1.0", ), diff --git a/scalafmt-cli/src/main/scala/org/scalafmt/cli/InputMethod.scala b/scalafmt-cli/src/main/scala/org/scalafmt/cli/InputMethod.scala index f99caa84c4..59bb92ce85 100644 --- a/scalafmt-cli/src/main/scala/org/scalafmt/cli/InputMethod.scala +++ b/scalafmt-cli/src/main/scala/org/scalafmt/cli/InputMethod.scala @@ -9,6 +9,8 @@ import java.nio.file.Paths import scala.io.Source +import munit.{diff => difflib} + sealed abstract class InputMethod { def readInput(options: CliOptions): String def path: Path From 514ef70114a88c25839392f3dfcdb3ead6429118 Mon Sep 17 00:00:00 2001 From: Jan Chyb Date: Fri, 20 Sep 2024 12:41:27 +0200 Subject: [PATCH 2/2] Upgrade mdoc to 2.6.1 Needed for mdoc-parser specifically, which only since 2.6.0 is available for Scala Native --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index a5560dc2cc..7e2c721dab 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -12,7 +12,7 @@ object Dependencies { val scalacheckV = "1.18.0" val coursier = "2.1.10" val munitV = "1.0.1" - val mdocV = "2.5.4" + val mdocV = "2.6.1" val scalapb = Def.setting { ExclusionRule(