From 1d1c39546610f87e753ea9b6fdd94a12d3bf3264 Mon Sep 17 00:00:00 2001 From: DaSCH Bot <50987250+daschbot@users.noreply.github.com> Date: Tue, 1 Oct 2024 13:47:37 +0800 Subject: [PATCH] chore: Patch dependency updates (#3373) --- .github/workflows/build-and-test.yml | 8 ++++---- project/Dependencies.scala | 6 +++--- project/build.properties | 2 +- project/plugins.sbt | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index d7168f1c08..05793f2e24 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -35,12 +35,12 @@ jobs: uses: codacy/codacy-coverage-reporter-action@v1 with: project-token: ${{ secrets.CODACY_PROJECT_TOKEN }} - coverage-reports: ./target/scala-3.3.3/coverage-report/cobertura.xml + coverage-reports: ./target/scala-3.3.4/coverage-report/cobertura.xml - name: Upload coverage data to codecov if: ${{ env.IS_NOOP == 'false' }} uses: codecov/codecov-action@v3 with: - files: ./target/scala-3.3.3/coverage-report/cobertura.xml + files: ./target/scala-3.3.4/coverage-report/cobertura.xml - name: No-op step if: ${{ env.IS_NOOP == 'true' }} run: echo "No checks on main or release branches, skipping this job." @@ -79,12 +79,12 @@ jobs: uses: codacy/codacy-coverage-reporter-action@v1 with: project-token: ${{ secrets.CODACY_PROJECT_TOKEN }} - coverage-reports: ./target/scala-3.3.3/coverage-report/cobertura.xml + coverage-reports: ./target/scala-3.3.4/coverage-report/cobertura.xml - name: Upload coverage data to codecov if: ${{ env.IS_NOOP == 'false' }} uses: codecov/codecov-action@v3 with: - files: ./target/scala-3.3.3/coverage-report/cobertura.xml + files: ./target/scala-3.3.4/coverage-report/cobertura.xml - name: No-op step if: ${{ env.IS_NOOP == 'true' }} run: echo "No checks on main or release branches, skipping this job." diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 21802a05f5..fc994c740e 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -14,7 +14,7 @@ object Dependencies { // base image the knora-sipi image is created from val sipiImage = "daschswiss/sipi:v3.13.0" - val ScalaVersion = "3.3.3" + val ScalaVersion = "3.3.4" val PekkoActorVersion = "1.1.1" val PekkoHttpVersion = "1.0.1" @@ -113,13 +113,13 @@ object Dependencies { val pekkoTestkit = "org.apache.pekko" %% "pekko-testkit" % PekkoActorVersion val scalaTest = "org.scalatest" %% "scalatest" % "3.2.19" - val testcontainers = "org.testcontainers" % "testcontainers" % "1.20.1" + val testcontainers = "org.testcontainers" % "testcontainers" % "1.20.2" val wiremock = "org.wiremock" % "wiremock" % "3.9.1" // found/added by the plugin but deleted anyway val commonsLang3 = "org.apache.commons" % "commons-lang3" % "3.17.0" - val tapirVersion = "1.11.3" + val tapirVersion = "1.11.5" val tapir = Seq( "com.softwaremill.sttp.tapir" %% "tapir-pekko-http-server" % tapirVersion, diff --git a/project/build.properties b/project/build.properties index ee4c672cd0..0b699c3052 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.1 +sbt.version=1.10.2 diff --git a/project/plugins.sbt b/project/plugins.sbt index 80d258b35e..eaca06f566 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -7,7 +7,7 @@ addSbtPlugin("io.kamon" % "sbt-aspectj-runner" % "1.1.2") addSbtPlugin("org.playframework.twirl" % "sbt-twirl" % "2.0.7") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0") addSbtPlugin("com.github.sbt" % "sbt-javaagent" % "0.1.8") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.0") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.1") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1")