diff --git a/.circleci/config.yml b/.circleci/config.yml index aa8b582..3748557 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,8 +1,8 @@ version: 2.1 orbs: - codacy: codacy/base@11.2.0 - codacy_plugins_test: codacy/plugins-test@1.1.1 + codacy: codacy/base@12.1.4 + codacy_plugins_test: codacy/plugins-test@2.0.11 jobs: test: @@ -24,11 +24,9 @@ workflows: - codacy/sbt: name: publish_docker_local cmd: | - sbt "scalafmt::test; - test:scalafmt::test; - sbt:scalafmt::test; - Test / compile; - stage" + sbt "test:scalafmt::test; + Test / compile; + stage" docker build -t $CIRCLE_PROJECT_REPONAME:latest . docker save --output docker-image.tar $CIRCLE_PROJECT_REPONAME:latest persist_to_workspace: true diff --git a/Dockerfile b/Dockerfile index 5d620a0..7588d2b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM amazoncorretto:8-alpine3.17-jre +FROM amazoncorretto:8-alpine3.20-jre RUN apk add bash WORKDIR /opt/docker COPY docs /docs diff --git a/build.sbt b/build.sbt index 1e251d4..d133a6a 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.13.12" +ThisBuild / scalaVersion := "2.13.14" lazy val codacyDuplictionPmdCpd = project .in(file(".")) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index db07eb8..53ee96c 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -3,14 +3,14 @@ import sbt._ object Dependencies { object Codacy { - val duplicationSeed = "com.codacy" %% "codacy-duplication-scala-seed" % "2.0.1" + val duplicationSeed = "com.codacy" %% "codacy-duplication-scala-seed" % "2.1.1" } - val playJson = "com.typesafe.play" %% "play-json" % "2.7.4" + val playJson = "org.playframework" %% "play-json" % "3.0.4" - val scalaMeta = "org.scalameta" %% "scalameta" % "4.4.28" + val scalaMeta = "org.scalameta" %% "scalameta" % "4.12.0" - private val pmdVersion = "6.44.0" + private val pmdVersion = "7.7.0" val pmdLanguages = Seq( "scala", diff --git a/project/build.properties b/project/build.properties index b19d4e1..1767a6f 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.9.7 +sbt.version = 1.10.5 diff --git a/project/plugins.sbt b/project/plugins.sbt index 81fb7df..dabc3ca 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("com.codacy" % "codacy-sbt-plugin" % "20.0.2") +addSbtPlugin("com.codacy" % "codacy-sbt-plugin" % "25.2.1")