Skip to content

Commit f5f7b10

Browse files
authored
Merge pull request #11 from jatcwang/update_deps
Update deps
2 parents c483063 + 64fb131 commit f5f7b10

File tree

5 files changed

+21
-19
lines changed

5 files changed

+21
-19
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
run: sbt --client '++${{ matrix.scala }}; githubWorkflowCheck'
6262

6363
- name: Build project
64-
run: sbt --client '++${{ matrix.scala }}; test; makeMicrosite'
64+
run: sbt --client '++${{ matrix.scala }}; test; makeMicrosite; publishLocal'
6565

6666
- name: Compress target directories
6767
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

build.sbt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
val munitVersion = "0.7.26"
1+
val munitVersion = "0.7.27"
22
val catsVersion = "2.6.1"
33
val scalatestVersion = "3.2.9"
44

@@ -31,9 +31,9 @@ lazy val core = Project("difflicious-core", file("modules/core"))
3131
.settings(commonSettings)
3232
.settings(
3333
libraryDependencies ++= Seq(
34-
"com.propensive" %% "magnolia" % "0.17.0",
35-
"dev.zio" %% "izumi-reflect" % "1.1.1",
36-
"com.lihaoyi" %% "fansi" % "0.2.12",
34+
"com.propensive" %% "magnolia" % "0.17.0",
35+
"dev.zio" %% "izumi-reflect" % "1.1.1",
36+
"com.lihaoyi" %% "fansi" % "0.2.12",
3737
) ++ (
3838
if (scalaVersion.value.startsWith("2"))
3939
Seq("org.scala-lang" % "scala-reflect" % "2.13.5")
@@ -86,7 +86,7 @@ lazy val coretest = Project("coretest", file("modules/coretest"))
8686
),
8787
// Test deps
8888
libraryDependencies ++= Seq(
89-
"org.scalameta" %% "munit" % munitVersion,
89+
"org.scalameta" %% "munit" % munitVersion,
9090
"org.scalameta" %% "munit-scalacheck" % munitVersion,
9191
).map(_ % Test),
9292
)
@@ -152,8 +152,8 @@ lazy val commonSettings = Seq(
152152
versionScheme := Some("early-semver"),
153153
scalacOptions ++= Seq("-Wmacros:after"),
154154
libraryDependencies ++= Seq(
155-
compilerPlugin("org.typelevel" %% "kind-projector" % "0.13.0" cross CrossVersion.full),
156-
compilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1"),
155+
compilerPlugin("org.typelevel" %% "kind-projector" % "0.13.0" cross CrossVersion.full),
156+
compilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1"),
157157
).filterNot(_ => scalaVersion.value.startsWith("3")),
158158
)
159159

@@ -198,7 +198,7 @@ ThisBuild / githubWorkflowPublishPreamble ++= setupJekyllSteps
198198
ThisBuild / githubWorkflowBuild ~= { steps =>
199199
steps.map {
200200
case w: WorkflowStep.Sbt if w.commands == List("test") =>
201-
w.copy(commands = List("test", "makeMicrosite"))
201+
w.copy(commands = List("test", "makeMicrosite", "publishLocal"))
202202
case w => w
203203
}
204204
}

modules/core/src/main/scala/difflicious/DiffResultPrinter.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ object DiffResultPrinter {
2929
case r: DiffResult.ListResult => {
3030
val indentForFields = Str("\n" ++ indentLevel.asSpacesPlus1)
3131
val listStrs = r.items
32-
.map { res => consoleOutput(res, indentLevel + 1) ++ "," }
32+
.map { res =>
33+
consoleOutput(res, indentLevel + 1) ++ ","
34+
}
3335
.foldLeft(Str("")) { case (accum, next) => accum ++ indentForFields ++ next }
3436
val allStr = Str(s"${r.typeName.short}(") ++ listStrs ++ Str(s"\n${indentLevel.asSpaces})")
3537
colorOnMatchType(str = allStr, matchType = r.pairType)

modules/core/src/main/scala/difflicious/differ/EqualsDiffer.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package difflicious.differ
22

33
import difflicious.ConfigureOp.PairBy
4-
import difflicious.{DiffResult, ConfigureOp, ConfigureError, ConfigurePath, DiffInput}
4+
import difflicious.{ConfigureError, ConfigureOp, ConfigurePath, DiffInput, DiffResult}
55

66
/**
77
* Differ where the two values are compared by using the equals method.
8-
* If the two values aren't equal, then we use the provided [[valueToString]] function
8+
* If the two values aren't equal, then we use the provided valueToString function
99
* to output the diagnostic output.
1010
*/
1111
final class EqualsDiffer[T](isIgnored: Boolean, valueToString: T => String) extends ValueDiffer[T] {

project/plugins.sbt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.17")
2-
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.0")
3-
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
4-
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
5-
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
6-
addSbtPlugin("com.47deg" % "sbt-microsites" % "1.3.4")
7-
addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.12.0")
1+
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.20")
2+
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3")
3+
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")
4+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.8.2")
5+
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
6+
addSbtPlugin("com.47deg" % "sbt-microsites" % "1.3.4")
7+
addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.12.0")

0 commit comments

Comments
 (0)