Skip to content

Commit

Permalink
Merge branch 'main' into update/slf4j-api-2.0.13
Browse files Browse the repository at this point in the history
  • Loading branch information
geirolz authored May 26, 2024
2 parents 183b9bb + c6ae47e commit c11b78d
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 14 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Scala Steward: Reformat with scalafmt 3.7.3
4b4860e574bdce3d507699f4f3f4f876fee8a55f

# Scala Steward: Reformat with scalafmt 3.8.0
8576cc99a5c4317d533534f65952a51b2469a76b
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.7.17
version = 3.8.0
encoding = "UTF-8"
runner.dialect = "scala3"
maxColumn = 150
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ object AppResources:
.fromAutoCloseable(IO(Source.fromResource("host-table.txt")))
.map(_.getLines().toList)
.map(AppResources(_))

19 changes: 10 additions & 9 deletions project/ProjectDependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,30 @@ import scala.language.postfixOps
object ProjectDependencies {

private val catsVersion = "2.10.0"
private val catsEffectVersion = "3.5.3"
private val catsEffectVersion = "3.5.4"
private val circeVersion = "0.14.6"
private val circeGenericExtraVersion = "0.14.3"
private val pureConfigVersion = "0.17.6"
private val fly4sVersion = "1.0.1"
private val munitVersion = "0.7.29"
private val munitEffectVersion = "1.0.7"
private val munitVersion = "1.0.0"
private val munitEffectVersion = "2.0.0"
private val slf4Version = "2.0.13"
private val log4catsVersion = "2.6.0"
private val odinVersion = "0.13.0"
private val http4sVersion = "0.23.25"
private val fs2Version = "3.9.4"
private val scalacheck = "1.17.0"
private val fs2Version = "3.10.2"
private val scalacheck = "1.17.1"


lazy val common: Seq[ModuleID] = Seq(
// runtime
"org.typelevel" %% "cats-core" % catsVersion,

// test
"org.scalameta" %% "munit" % munitVersion % Test,
"org.scalameta" %% "munit-scalacheck" % munitVersion % Test,
"org.typelevel" %% "munit-cats-effect-3" % munitEffectVersion % Test,
"org.scalacheck" %% "scalacheck" % scalacheck % Test
"org.scalameta" %% "munit" % munitVersion % Test,
"org.scalameta" %% "munit-scalacheck" % munitVersion % Test,
"org.typelevel" %% "munit-cats-effect" % munitEffectVersion % Test,
"org.scalacheck" %% "scalacheck" % scalacheck % Test
)

object Core {
Expand Down
6 changes: 3 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.11")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.2")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
addSbtPlugin("org.jmotor.sbt" % "sbt-dependency-updates" % "1.2.8")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0")
addSbtPlugin("org.jmotor.sbt" % "sbt-dependency-updates" % "1.2.9")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")

0 comments on commit c11b78d

Please sign in to comment.