Skip to content

Commit

Permalink
Merge branch 'main' into update/jackson-module-scala-2.15.3
Browse files Browse the repository at this point in the history
  • Loading branch information
rolandtritsch authored Nov 5, 2023
2 parents b4078ba + fdc2308 commit 6290906
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

steps:
- name: checkout the repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: 'recursive'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
publish:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-java@v3
Expand Down
12 changes: 6 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,14 @@ lazy val root = Project("sbt-coveralls", file("."))
),
libraryDependencies ++= Seq(
"com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.15.3",
"com.fasterxml.jackson.core" % "jackson-core" % "2.15.2",
"com.fasterxml.jackson.core" % "jackson-core" % "2.15.3",
"org.eclipse.jgit" % "org.eclipse.jgit" % "5.13.0.202109080827-r",
"org.scalaj" %% "scalaj-http" % "2.4.2",
"io.circe" %% "circe-core" % "0.14.5",
"io.circe" %% "circe-generic" % "0.14.5",
"io.circe" %% "circe-parser" % "0.14.5",
"org.mockito" % "mockito-core" % "5.4.0" % Test,
"org.scalatest" %% "scalatest" % "3.2.16" % Test
"io.circe" %% "circe-core" % "0.14.6",
"io.circe" %% "circe-generic" % "0.14.6",
"io.circe" %% "circe-parser" % "0.14.6",
"org.mockito" % "mockito-core" % "5.6.0" % Test,
"org.scalatest" %% "scalatest" % "3.2.17" % Test
),
scriptedLaunchOpts ++= Seq(
"-Xmx1024M",
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
libraryDependencies += "org.scala-sbt" % "scripted-plugin_2.12" % sbtVersion.value

addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")

0 comments on commit 6290906

Please sign in to comment.