Skip to content

Commit

Permalink
Merge pull request #11 from jatcwang/update_deps
Browse files Browse the repository at this point in the history
Update deps
  • Loading branch information
jatcwang authored Jul 12, 2021
2 parents c483063 + 64fb131 commit f5f7b10
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
val munitVersion = "0.7.26"
val munitVersion = "0.7.27"
val catsVersion = "2.6.1"
val scalatestVersion = "3.2.9"

Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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),
)
Expand Down Expand Up @@ -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")),
)

Expand Down Expand Up @@ -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
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -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] {
Expand Down
14 changes: 7 additions & 7 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")

0 comments on commit f5f7b10

Please sign in to comment.