From f8b03f4ac03ad0a0d4a0c10034fcb12631e4251a Mon Sep 17 00:00:00 2001 From: Stefan Vacareanu Date: Wed, 19 Jun 2024 13:42:13 +0300 Subject: [PATCH 1/5] Fix vulnerabilitieis --- .circleci/config.yml | 4 ++-- Dockerfile | 2 +- project/Dependencies.scala | 8 ++++---- project/plugins.sbt | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index aa8b582..53832fb 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.1 + codacy_plugins_test: codacy/plugins-test@2.0.11 jobs: test: diff --git a/Dockerfile b/Dockerfile index 5d620a0..5034d18 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM amazoncorretto:8-alpine3.17-jre +FROM amazoncorretto:8-alpine3.19-jre RUN apk add bash WORKDIR /opt/docker COPY docs /docs diff --git a/project/Dependencies.scala b/project/Dependencies.scala index db07eb8..ec17e08 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 = "com.typesafe.play" %% "play-json" % "2.10.6" - val scalaMeta = "org.scalameta" %% "scalameta" % "4.4.28" + val scalaMeta = "org.scalameta" %% "scalameta" % "4.9.6" - private val pmdVersion = "6.44.0" + private val pmdVersion = "6.55.0" val pmdLanguages = Seq( "scala", diff --git a/project/plugins.sbt b/project/plugins.sbt index 81fb7df..7b6f2a1 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.2") From 5178e29b5c8304571b2c1746d91e867e79098b62 Mon Sep 17 00:00:00 2001 From: Stefan Vacareanu Date: Wed, 19 Jun 2024 13:45:14 +0300 Subject: [PATCH 2/5] update --- project/Dependencies.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index ec17e08..5e2dcbc 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -3,12 +3,12 @@ import sbt._ object Dependencies { object Codacy { - val duplicationSeed = "com.codacy" %% "codacy-duplication-scala-seed" % "2.1.1" + val duplicationSeed = "com.codacy" %% "codacy-duplication-scala-seed" % "2.0.1" } - val playJson = "com.typesafe.play" %% "play-json" % "2.10.6" + val playJson = "com.typesafe.play" %% "play-json" % "2.7.4" - val scalaMeta = "org.scalameta" %% "scalameta" % "4.9.6" + val scalaMeta = "org.scalameta" %% "scalameta" % "4.4.28" private val pmdVersion = "6.55.0" From f3a9e7664b6830f0d17d0bb2c0ff69c91cb3311e Mon Sep 17 00:00:00 2001 From: Stefan Vacareanu Date: Wed, 19 Jun 2024 13:51:00 +0300 Subject: [PATCH 3/5] Update scalafmt --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 0847f07..8d88bde 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "1.6.1" +version = "3.8.2" style = IntelliJ project.excludeFilters = ["target/.*"] maxColumn = 120 From 0bda983c6adf35721133ad6eef970887387c76a5 Mon Sep 17 00:00:00 2001 From: Stefan Vacareanu Date: Wed, 19 Jun 2024 13:57:43 +0300 Subject: [PATCH 4/5] Remove outdaded scalafmt test --- .circleci/config.yml | 3 +-- .scalafmt.conf | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 53832fb..e5b428f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,8 +24,7 @@ workflows: - codacy/sbt: name: publish_docker_local cmd: | - sbt "scalafmt::test; - test:scalafmt::test; + sbt "test:scalafmt::test; sbt:scalafmt::test; Test / compile; stage" diff --git a/.scalafmt.conf b/.scalafmt.conf index 8d88bde..0847f07 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.8.2" +version = "1.6.1" style = IntelliJ project.excludeFilters = ["target/.*"] maxColumn = 120 From 425f8770f2faa52d570165bea84b4082623b1fbe Mon Sep 17 00:00:00 2001 From: Stefan Vacareanu Date: Wed, 19 Jun 2024 14:03:16 +0300 Subject: [PATCH 5/5] remove outdated test --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e5b428f..0fd375f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,7 +25,6 @@ workflows: name: publish_docker_local cmd: | sbt "test:scalafmt::test; - sbt:scalafmt::test; Test / compile; stage" docker build -t $CIRCLE_PROJECT_REPONAME:latest .