From 58fc01a2f6957982b843b6ef8656914212901d83 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 13 Apr 2026 21:59:54 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.11.0 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 2aaede8..954b3ad 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.9.10 +version = 3.11.0 align.preset = more assumeStandardLibraryStripMargin = true From 10c6ce6f1df7e730637d0cbd6f8a9761bb59a0ac Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 13 Apr 2026 22:00:01 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.11.0 Executed command: scalafmt --non-interactive --- build.sbt | 28 ++++++++++--------- .../main/scala/io/bullet/spliff/Diff.scala | 8 +++--- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/build.sbt b/build.sbt index bee4167..844c4d4 100644 --- a/build.sbt +++ b/build.sbt @@ -5,10 +5,10 @@ import java.net.URI inThisBuild( Seq( organization := "io.bullet", - homepage := Some(URI.create("https://github.com/sirthias/spliff/").toURL), - description := "Efficient diffing in Scala", - startYear := Some(2020), - licenses := Seq("MPLv2" -> URI.create("https://www.mozilla.org/en-US/MPL/2.0/").toURL), + homepage := Some(URI.create("https://github.com/sirthias/spliff/").toURL), + description := "Efficient diffing in Scala", + startYear := Some(2020), + licenses := Seq("MPLv2" -> URI.create("https://www.mozilla.org/en-US/MPL/2.0/").toURL), scmInfo := Some(ScmInfo(url("https://github.com/sirthias/spliff/"), "scm:git:git@github.com:sirthias/spliff.git")), developers := List( @@ -21,17 +21,18 @@ inThisBuild( ) lazy val commonSettings = Seq( - scalaVersion := "2.13.17", + scalaVersion := "2.13.17", crossScalaVersions := Seq("2.13.17", "3.3.7"), libraryDependencies ++= Seq( - "org.scalameta" %% "munit" % "1.2.1" % Test, - "org.scalameta" %% "munit-scalacheck" % "1.2.0" % Test, + "org.scalameta" %% "munit" % "1.2.1" % Test, + "org.scalameta" %% "munit-scalacheck" % "1.2.0" % Test, "org.scalacheck" %% "scalacheck" % "1.19.0" % Test ), Compile / doc / scalacOptions += "-no-link-warnings", scalacOptions ++= Seq( "-deprecation", - "-encoding", "UTF-8", + "-encoding", + "UTF-8", "-feature", "-language:implicitConversions", "-release:8", @@ -49,7 +50,8 @@ lazy val commonSettings = Seq( "-Wunused", "-Xlint", "-Xsource:3", - "-Ybackend-parallelism", "8", + "-Ybackend-parallelism", + "8", "-Ycache-macro-class-loader:last-modified", ) case Some((3, _)) => @@ -69,10 +71,10 @@ lazy val commonSettings = Seq( headerLicense := Some(HeaderLicense.MPLv2("2021 - 2024", "Mathias Doenitz")), // publishing - publishMavenStyle := true, + publishMavenStyle := true, Test / publishArtifact := false, - pomIncludeRepository := (_ ⇒ false), - publishTo := sonatypePublishToBundle.value, + pomIncludeRepository := (_ ⇒ false), + publishTo := sonatypePublishToBundle.value, sonatypeCredentialHost := xerial.sbt.Sonatype.sonatypeCentralHost, ) @@ -86,7 +88,7 @@ lazy val releaseSettings = { import ReleaseTransformations._ Seq( releaseCrossBuild := true, - releaseProcess := Seq[ReleaseStep]( + releaseProcess := Seq[ReleaseStep]( checkSnapshotDependencies, inquireVersions, runClean, diff --git a/spliff/src/main/scala/io/bullet/spliff/Diff.scala b/spliff/src/main/scala/io/bullet/spliff/Diff.scala index bb6fed7..e8f5c4c 100644 --- a/spliff/src/main/scala/io/bullet/spliff/Diff.scala +++ b/spliff/src/main/scala/io/bullet/spliff/Diff.scala @@ -794,8 +794,8 @@ object Diff { @tailrec def rec(dimIx: Int, resIx: Int, last: Op): Int = if (dimIx < dimArray.length) { - val op = dimArray(dimIx) - var ir1 = resIx + val op = dimArray(dimIx) + var ir1 = resIx val next = last -> op match { case (Op.Delete(delBaseIx, delCnt), Op.Insert(insBaseIx, targetIx, insCnt)) if delBaseIx == insBaseIx => ir1 = resIx - 1 @@ -894,7 +894,7 @@ object Diff { case (InTarget(b), InBase(a)) => Distinct(a, b) case (Distinct(a, b), InBase(c)) => Distinct(a merge c, b) case (Distinct(a, b), InTarget(c)) => Distinct(a, b merge c) - case _ => + case _ => buf += last next } @@ -929,7 +929,7 @@ object Diff { def patch(implicit ct: ClassTag[T]): Patch[T] = { val steps = delInsMovOps.map { case Op.Insert(baseIx, targetIx, count) => - val values = new Array[T](count) + val values = new Array[T](count) @tailrec def rec(i: Int): Array[T] = if (i < values.length) rec(setAndGetNextIndex(values, i, target(targetIx + i))) else values Patch.Insert(baseIx, ArraySeq.unsafeWrapArray(rec(0))) From 13747d5fb925fdf89acaf1f4fe8c24cfbf7402c5 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 13 Apr 2026 22:00:01 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.11.0' 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..cb3b54e --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.11.0 +10c6ce6f1df7e730637d0cbd6f8a9761bb59a0ac