From 64fb131dc21aeea8a62fe196448e512c04286683 Mon Sep 17 00:00:00 2001 From: Jacob Wang Date: Mon, 12 Jul 2021 22:04:06 +0100 Subject: [PATCH] update deps --- .github/workflows/ci.yml | 2 +- build.sbt | 16 ++++++++-------- .../scala/difflicious/DiffResultPrinter.scala | 4 +++- .../scala/difflicious/differ/EqualsDiffer.scala | 4 ++-- project/plugins.sbt | 14 +++++++------- 5 files changed, 21 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c826525..9038707 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,7 +61,7 @@ jobs: run: sbt --client '++${{ matrix.scala }}; githubWorkflowCheck' - name: Build project - run: sbt --client '++${{ matrix.scala }}; test; makeMicrosite' + run: sbt --client '++${{ matrix.scala }}; test; makeMicrosite; publishLocal' - name: Compress target directories run: tar cf targets.tar modules/benchmarks/target target modules/munit/target docs/target modules/scalatest/target modules/core/target modules/cats/target modules/coretest/target project/target diff --git a/build.sbt b/build.sbt index 35d6d41..5d01a00 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,4 @@ -val munitVersion = "0.7.26" +val munitVersion = "0.7.27" val catsVersion = "2.6.1" val scalatestVersion = "3.2.9" @@ -31,9 +31,9 @@ lazy val core = Project("difflicious-core", file("modules/core")) .settings(commonSettings) .settings( libraryDependencies ++= Seq( - "com.propensive" %% "magnolia" % "0.17.0", - "dev.zio" %% "izumi-reflect" % "1.1.1", - "com.lihaoyi" %% "fansi" % "0.2.12", + "com.propensive" %% "magnolia" % "0.17.0", + "dev.zio" %% "izumi-reflect" % "1.1.1", + "com.lihaoyi" %% "fansi" % "0.2.12", ) ++ ( if (scalaVersion.value.startsWith("2")) Seq("org.scala-lang" % "scala-reflect" % "2.13.5") @@ -86,7 +86,7 @@ lazy val coretest = Project("coretest", file("modules/coretest")) ), // Test deps libraryDependencies ++= Seq( - "org.scalameta" %% "munit" % munitVersion, + "org.scalameta" %% "munit" % munitVersion, "org.scalameta" %% "munit-scalacheck" % munitVersion, ).map(_ % Test), ) @@ -152,8 +152,8 @@ lazy val commonSettings = Seq( versionScheme := Some("early-semver"), scalacOptions ++= Seq("-Wmacros:after"), libraryDependencies ++= Seq( - compilerPlugin("org.typelevel" %% "kind-projector" % "0.13.0" cross CrossVersion.full), - compilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1"), + compilerPlugin("org.typelevel" %% "kind-projector" % "0.13.0" cross CrossVersion.full), + compilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1"), ).filterNot(_ => scalaVersion.value.startsWith("3")), ) @@ -198,7 +198,7 @@ ThisBuild / githubWorkflowPublishPreamble ++= setupJekyllSteps ThisBuild / githubWorkflowBuild ~= { steps => steps.map { case w: WorkflowStep.Sbt if w.commands == List("test") => - w.copy(commands = List("test", "makeMicrosite")) + w.copy(commands = List("test", "makeMicrosite", "publishLocal")) case w => w } } diff --git a/modules/core/src/main/scala/difflicious/DiffResultPrinter.scala b/modules/core/src/main/scala/difflicious/DiffResultPrinter.scala index 073caee..8c34aa3 100644 --- a/modules/core/src/main/scala/difflicious/DiffResultPrinter.scala +++ b/modules/core/src/main/scala/difflicious/DiffResultPrinter.scala @@ -29,7 +29,9 @@ object DiffResultPrinter { case r: DiffResult.ListResult => { val indentForFields = Str("\n" ++ indentLevel.asSpacesPlus1) val listStrs = r.items - .map { res => consoleOutput(res, indentLevel + 1) ++ "," } + .map { res => + consoleOutput(res, indentLevel + 1) ++ "," + } .foldLeft(Str("")) { case (accum, next) => accum ++ indentForFields ++ next } val allStr = Str(s"${r.typeName.short}(") ++ listStrs ++ Str(s"\n${indentLevel.asSpaces})") colorOnMatchType(str = allStr, matchType = r.pairType) diff --git a/modules/core/src/main/scala/difflicious/differ/EqualsDiffer.scala b/modules/core/src/main/scala/difflicious/differ/EqualsDiffer.scala index 1da5389..20cc55f 100644 --- a/modules/core/src/main/scala/difflicious/differ/EqualsDiffer.scala +++ b/modules/core/src/main/scala/difflicious/differ/EqualsDiffer.scala @@ -1,11 +1,11 @@ package difflicious.differ import difflicious.ConfigureOp.PairBy -import difflicious.{DiffResult, ConfigureOp, ConfigureError, ConfigurePath, DiffInput} +import difflicious.{ConfigureError, ConfigureOp, ConfigurePath, DiffInput, DiffResult} /** * Differ where the two values are compared by using the equals method. - * If the two values aren't equal, then we use the provided [[valueToString]] function + * If the two values aren't equal, then we use the provided valueToString function * to output the diagnostic output. */ final class EqualsDiffer[T](isIgnored: Boolean, valueToString: T => String) extends ValueDiffer[T] { diff --git a/project/plugins.sbt b/project/plugins.sbt index 3791ea0..706d8cc 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ -addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.17") -addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.0") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1") -addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7") -addSbtPlugin("com.47deg" % "sbt-microsites" % "1.3.4") -addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.12.0") +addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.20") +addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.8.2") +addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7") +addSbtPlugin("com.47deg" % "sbt-microsites" % "1.3.4") +addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.12.0")