Skip to content

Commit

Permalink
Merge branch 'master' into update/tapir-core-1.1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
scala-steward committed Jul 8, 2023
2 parents 76bc4c4 + 5b27aff commit 049fc7f
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Login to DockerHub
uses: docker/login-action@v2.1.0
uses: docker/login-action@v2.2.0
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASSWORD }}
Expand Down
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version = 3.7.3
version = 3.7.7
maxColumn = 120
runner.dialect = scala213
22 changes: 11 additions & 11 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import com.softwaremill.Publish.updateDocs
import com.softwaremill.UpdateVersionInDocs
import sbt.Def

val http4sVersion = "0.23.18"
val http4sVersion = "0.23.22"
val circeVersion = "0.14.3"
val circeYamlVersion = "0.14.2"
val tapirVersion = "1.1.2"
val sttpClientVersion = "3.8.15"
val sttpClientVersion = "3.8.16"

val declineVersion = "2.4.1"

Expand All @@ -22,8 +22,8 @@ val jsonDependencies = Seq(

val loggingDependencies = Seq(
"com.typesafe.scala-logging" %% "scala-logging" % "3.9.5",
"ch.qos.logback" % "logback-classic" % "1.4.6",
"org.typelevel" %% "log4cats-slf4j" % "2.5.0"
"ch.qos.logback" % "logback-classic" % "1.4.8",
"org.typelevel" %% "log4cats-slf4j" % "2.6.0"
)

val apiDocsDependencies = Seq(
Expand All @@ -43,7 +43,7 @@ lazy val dockerSettings = Seq(

lazy val commonSettings: Seq[Def.Setting[_]] = commonSmlBuildSettings ++ ossPublishSettings ++ Seq(
organization := "com.softwaremill.sttp.livestub",
scalaVersion := "2.13.10",
scalaVersion := "2.13.11",
scalafmtOnCompile := false,
scmInfo := Some(
ScmInfo(
Expand Down Expand Up @@ -71,13 +71,13 @@ lazy val app: Project = (project in file("app"))
libraryDependencies ++= Seq(
"com.softwaremill.sttp.client3" %% "core" % sttpClientVersion,
"org.http4s" %% "http4s-dsl" % http4sVersion,
"org.http4s" %% "http4s-blaze-server" % "0.23.14",
"org.http4s" %% "http4s-blaze-server" % "0.23.15",
"com.softwaremill.sttp.tapir" %% "tapir-http4s-server" % tapirVersion,
"com.monovore" %% "decline" % declineVersion,
"com.monovore" %% "decline-effect" % declineVersion,
"com.softwaremill.common" %% "tagging" % "2.3.4",
"org.typelevel" %% "cats-core" % "2.9.0",
"org.scalatest" %% "scalatest" % "3.2.15" % Test,
"org.scalatest" %% "scalatest" % "3.2.16" % Test,
"org.typelevel" %% "cats-effect-testing-scalatest" % "1.5.0" % Test
) ++ loggingDependencies ++ apiDocsDependencies
)
Expand All @@ -101,8 +101,8 @@ lazy val sdk: Project = (project in file("sdk"))
libraryDependencies ++= Seq(
"com.softwaremill.sttp.client3" %% "core" % sttpClientVersion,
"com.softwaremill.sttp.tapir" %% "tapir-sttp-client" % tapirVersion,
"org.scalatest" %% "scalatest" % "3.2.15" % Test,
"org.typelevel" %% "cats-effect" % "3.4.8",
"org.scalatest" %% "scalatest" % "3.2.16" % Test,
"org.typelevel" %% "cats-effect" % "3.5.1",
"com.softwaremill.sttp.client3" %% "async-http-client-backend-cats" % sttpClientVersion % Test,
"org.typelevel" %% "cats-effect-testing-scalatest" % "1.5.0" % Test
)
Expand Down Expand Up @@ -138,8 +138,8 @@ lazy val openapi = project
name := "openapi",
libraryDependencies ++= Seq(
"io.circe" %% "circe-yaml" % circeYamlVersion,
"com.softwaremill.diffx" %% "diffx-scalatest-should" % "0.8.2" % Test,
"org.scalatest" %% "scalatest" % "3.2.15" % Test
"com.softwaremill.diffx" %% "diffx-scalatest-should" % "0.8.3" % Test,
"org.scalatest" %% "scalatest" % "3.2.16" % Test
) ++ jsonDependencies
)

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.8.2
sbt.version = 1.9.1

0 comments on commit 049fc7f

Please sign in to comment.