diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index bb0910e2..f8287d98 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,5 @@ # Scala Steward: Reformat with scalafmt 3.5.8 d36e29b27d550a5498b4dc35324fb24945271f55 + +# Scala Steward: Reformat with scalafmt 3.8.4 +d0c0f4aa2f8e08d3dd670a648e84f232b617ba97 diff --git a/.scalafmt.conf b/.scalafmt.conf index 8ed645af..7f33a6b9 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.6.1 +version = 3.8.4 runner.dialect = scala213 continuationIndent.defnSite = 2 docstrings.style = Asterisk diff --git a/benchmark/src/main/scala/org/typelevel/catbird/benchmark/RerunnableBenchmark.scala b/benchmark/src/main/scala/org/typelevel/catbird/benchmark/RerunnableBenchmark.scala index dd9f80ae..668a4afd 100644 --- a/benchmark/src/main/scala/org/typelevel/catbird/benchmark/RerunnableBenchmark.scala +++ b/benchmark/src/main/scala/org/typelevel/catbird/benchmark/RerunnableBenchmark.scala @@ -6,7 +6,7 @@ import java.util.concurrent.{ ExecutorService, Executors, TimeUnit } import org.openjdk.jmh.annotations._ /** - * Compare the performance of `Rerunnable` against ordinary `Future`s. + * Compare the performance of `Rerunnable` against ordinary `Future` s. * * The following command will run the benchmarks with reasonable settings: * diff --git a/benchmark/src/test/scala/org/typelevel/catbird/benchmark/RerunnableBenchmarkSpec.scala b/benchmark/src/test/scala/org/typelevel/catbird/benchmark/RerunnableBenchmarkSpec.scala index 7a01d5af..6ac79c85 100644 --- a/benchmark/src/test/scala/org/typelevel/catbird/benchmark/RerunnableBenchmarkSpec.scala +++ b/benchmark/src/test/scala/org/typelevel/catbird/benchmark/RerunnableBenchmarkSpec.scala @@ -22,7 +22,6 @@ class RerunnableBenchmarkSpec extends AnyFlatSpec with BeforeAndAfter { assert(benchmark.sumIntsR === sum) } - it should "correctly calculate the sum using rerunnables and future pools" in { + it should "correctly calculate the sum using rerunnables and future pools" in assert(benchmark.sumIntsPR === sum) - } } diff --git a/project/FinaglePlugin.scala b/project/FinaglePlugin.scala index 950c1122..a95dbb8a 100644 --- a/project/FinaglePlugin.scala +++ b/project/FinaglePlugin.scala @@ -31,9 +31,8 @@ object FinaglePlugin extends AutoPlugin { .enablePlugins(NoPublishPlugin) .settings( libraryDependencies += module, - mimaCurrentClassfiles := { - (Compile / dependencyClasspath).value.seq.map(_.data).find(_.getName.startsWith(module.name)).get - }, + mimaCurrentClassfiles := + (Compile / dependencyClasspath).value.seq.map(_.data).find(_.getName.startsWith(module.name)).get, mimaPreviousArtifacts := versions.tail.map { v => module.withRevision(v) }.toSet