Skip to content

Commit

Permalink
Merge pull request #203 from laserdisc-io/upgrades
Browse files Browse the repository at this point in the history
upgrades
  • Loading branch information
barryoneill authored Oct 10, 2024
2 parents 52c0430 + 5333a3b commit 0c2e0a2
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 24 deletions.
6 changes: 3 additions & 3 deletions .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
version=3.6.1
version=3.8.3

maxColumn = 140
style = default
align.preset = more

runner.dialect = scala213source3
fileOverride {
"glob:**/scala-3.0+/**" { runner.dialect = scala3 }
"glob:**/scala-3/**" { runner.dialect = scala3 }
}

danglingParentheses.preset = true
Expand Down Expand Up @@ -44,4 +44,4 @@ rewrite.neverInfix.excludeFilters = [until
should]

rewrite.imports.sort = original
newlines.implicitParamListModifierPrefer = before
newlines.implicitParamListModifierPrefer = before
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
lazy val scala213 = "2.13.13"
lazy val scala3 = "3.3.3"
lazy val scala213 = "2.13.15"
lazy val scala3 = "3.3.4"
lazy val supportedScalaVersions = List(scala213, scala3)
ThisBuild / crossScalaVersions := supportedScalaVersions
ThisBuild / scalaVersion := scala213
Expand Down
33 changes: 16 additions & 17 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -7,45 +7,44 @@ object Dependencies {
val TestLib = Seq(
testFrameworks += new TestFramework("munit.Framework"),
libraryDependencies ++= Seq(
"org.scalameta" %% "munit" % "0.7.29",
"org.mockito" % "mockito-core" % "5.11.0",
"org.scalameta" %% "munit" % "1.0.2",
"org.mockito" % "mockito-core" % "5.14.1",
"org.gnieh" %% "diffson-circe" % "4.6.0"
).map(_ % Test)
)

val Slack = Seq(
libraryDependencies += "com.slack.api" % "slack-app-backend" % "1.39.0"
libraryDependencies += "com.slack.api" % "slack-app-backend" % "1.43.1"
)

val Refined = Seq(
libraryDependencies += "eu.timepit" %% "refined" % "0.11.1"
libraryDependencies += "eu.timepit" %% "refined" % "0.11.2"
)

val NewTypes = Seq(
libraryDependencies += "io.monix" %% "newtypes-core" % "0.2.3"
libraryDependencies += "io.monix" %% "newtypes-core" % "0.3.0"
)

val Logging = Seq(
libraryDependencies ++= Seq(
"org.typelevel" %% "log4cats-slf4j" % "2.6.0",
"ch.qos.logback" % "logback-classic" % "1.5.3" % Test,
"ch.qos.logback" % "logback-core" % "1.5.3" % Test,
"org.slf4j" % "jcl-over-slf4j" % "2.0.12" % Test,
"org.slf4j" % "jul-to-slf4j" % "2.0.12" % Test
"org.typelevel" %% "log4cats-slf4j" % "2.7.0",
"ch.qos.logback" % "logback-classic" % "1.5.9" % Test,
"ch.qos.logback" % "logback-core" % "1.5.9" % Test,
"org.slf4j" % "jcl-over-slf4j" % "2.0.16" % Test,
"org.slf4j" % "jul-to-slf4j" % "2.0.16" % Test
)
)

val Http4sVersion = "0.23.26"
val Http4s = Seq(
libraryDependencies ++= Seq(
"org.http4s" %% "http4s-dsl" % Http4sVersion,
"org.http4s" %% "http4s-ember-server" % Http4sVersion,
"org.http4s" %% "http4s-ember-client" % Http4sVersion,
"org.http4s" %% "http4s-circe" % Http4sVersion
)
"org.http4s" %% "http4s-dsl",
"org.http4s" %% "http4s-ember-server",
"org.http4s" %% "http4s-ember-client",
"org.http4s" %% "http4s-circe"
).map(_ % "0.23.28")
)

val CirceVersion = "0.14.6"
val CirceVersion = "0.14.10"
val Circe = Seq(
libraryDependencies ++= Seq(
"io.circe" %% "circe-core" % CirceVersion,
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.2
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.11")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.7.0")

0 comments on commit 0c2e0a2

Please sign in to comment.