From d1d2587389dc49ed6800b15a23d299ea29b404ff Mon Sep 17 00:00:00 2001 From: "david.marinho@codacy.com" Date: Thu, 28 Nov 2024 11:57:18 +0000 Subject: [PATCH 1/7] bump pmd cpd 7.7.0 --- project/Dependencies.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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", From b0951df88fee61bf33e8b451797748d143af60aa Mon Sep 17 00:00:00 2001 From: "david.marinho@codacy.com" Date: Thu, 28 Nov 2024 12:02:34 +0000 Subject: [PATCH 2/7] bump dependencies, docker image and libraries --- .circleci/config.yml | 4 ++-- Dockerfile | 2 +- project/build.properties | 2 +- project/plugins.sbt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index aa8b582..688ef0e 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: 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/project/build.properties b/project/build.properties index b19d4e1..4b164e0 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.9.7 +sbt.version = 3.3.3 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") From 80cf5602ce362306d11ca3259bff0b6b71be4f0a Mon Sep 17 00:00:00 2001 From: "david.marinho@codacy.com" Date: Thu, 28 Nov 2024 12:05:03 +0000 Subject: [PATCH 3/7] fix sbt version --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 4b164e0..1767a6f 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 3.3.3 +sbt.version = 1.10.5 From 853e6eafa80bbf4baeba0d2c0a447fadf3cbcb84 Mon Sep 17 00:00:00 2001 From: "david.marinho@codacy.com" Date: Thu, 28 Nov 2024 12:08:08 +0000 Subject: [PATCH 4/7] fix circle ci config file --- .circleci/config.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 688ef0e..3435b85 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,9 +24,7 @@ workflows: - codacy/sbt: name: publish_docker_local cmd: | - sbt "scalafmt::test; - test:scalafmt::test; - sbt:scalafmt::test; + sbt "test:scalafmt::test; Test / compile; stage" docker build -t $CIRCLE_PROJECT_REPONAME:latest . From c2cc4ca42e19286549f1d7ab558212f39b436994 Mon Sep 17 00:00:00 2001 From: "david.marinho@codacy.com" Date: Thu, 28 Nov 2024 12:14:39 +0000 Subject: [PATCH 5/7] fix circle ci config file --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3435b85..817c67a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,9 +24,9 @@ workflows: - codacy/sbt: name: publish_docker_local cmd: | - sbt "test: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 From ac80e0b5c9573c5d977f1a608b80b3e4df3b4208 Mon Sep 17 00:00:00 2001 From: "david.marinho@codacy.com" Date: Thu, 28 Nov 2024 12:15:06 +0000 Subject: [PATCH 6/7] fix circle ci config file --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 817c67a..3748557 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,7 +24,7 @@ workflows: - codacy/sbt: name: publish_docker_local cmd: | - sbt "test:scalafmt::test; + sbt "test:scalafmt::test; Test / compile; stage" docker build -t $CIRCLE_PROJECT_REPONAME:latest . From 077825fe9daa54fed8c8bc04774ac2d2a0748347 Mon Sep 17 00:00:00 2001 From: "david.marinho@codacy.com" Date: Thu, 28 Nov 2024 12:17:27 +0000 Subject: [PATCH 7/7] fix scala version --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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("."))