Merge branch 'master' into update/sbt-scalafix-0.11.1

.github/workflows/ci.yml

@@ -13,16 +13,38 @@ concurrency:
 permissions:
   contents: read
 
+env:
+  JAVA_VERSION: '1.11.0.19'
+
 jobs:
-  format_compile_lint:
+  compile:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: coursier/setup-action@v1
+        with:
+          jvm: temurin:${{env.JAVA_VERSION}}
+          apps: sbt
+      - name: Compile
+        run: sbt compile
+  format:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: VirtusLab/scala-cli-setup@v0.2.1
+      - uses: coursier/setup-action@v1
         with:
-          jvm: adopt:11
+          jvm: temurin:${{env.JAVA_VERSION}}
+          apps: sbt
       - name: Check format
         run: sbt checkFormat
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: coursier/setup-action@v1
+        with:
+          jvm: temurin:${{env.JAVA_VERSION}}
+          apps: sbt
       - name: Scalafix Lint
         run: sbt scalafixLint
       - name: Scapegoat Lint
@@ -31,9 +53,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: VirtusLab/scala-cli-setup@v0.2.1
+      - uses: coursier/setup-action@v1
         with:
-          jvm: adopt:11
+          jvm: temurin:${{env.JAVA_VERSION}}
+          apps: sbt
       - name: Run tests with coverage Report
         run: sbt testCoverage
       - uses: codecov/codecov-action@v3

.github/workflows/dependency-check.yml

@@ -2,17 +2,18 @@ name: Dependency check
 on:
   workflow_dispatch:
 
+env:
+  JAVA_VERSION: '1.11.0.19'
+
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - uses: coursier/setup-action@v1
         with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: 'sbt'
+          jvm: temurin:${{env.JAVA_VERSION}}
+          apps: sbt
       - name: DependencyCheck
         run: sbt -v -Dfile.encoding=UTF-8 dependencyCheck
       - name: Print DependencyCheck Result

.scalafmt.conf

@@ -1,3 +1,3 @@
-version=3.7.12
+version=3.7.14
 runner.dialect = scala213source3
 maxColumn = 80

build.sbt

@@ -16,7 +16,7 @@ lazy val commonSettings = Seq(
   organization := "biandratti",
   scalaVersion := scalaV,
   scalacOptions += "-Xsource:3",
-  ThisBuild / scapegoatVersion := "2.1.2",
+  ThisBuild / scapegoatVersion := "2.1.3",
   // wartremoverErrors ++= Warts.unsafe.diff(Seq(Wart.Any)),
   // wartremoverExcluded ++= (Compile / routes).value,
   coverageFailOnMinimum := true,

project/Dependencies.scala

@@ -78,5 +78,5 @@ object Dependencies {
   lazy val kamonAgent: ModuleID = "io.kamon" % "kanela-agent" % "1.0.17"
 
   lazy val openTelemetryAgent: ModuleID =
-    "io.opentelemetry.javaagent" % "opentelemetry-javaagent" % "1.29.0"
+    "io.opentelemetry.javaagent" % "opentelemetry-javaagent" % "1.30.0"
 }

project/plugins.sbt

@@ -5,11 +5,12 @@ addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.19")
 addSbtPlugin("com.github.sbt" % "sbt-javaagent" % "0.1.7")
 
 //scala-fmt
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
 
 //lints
 addSbtPlugin("org.wartremover" % "sbt-wartremover" % "3.1.3")
-addSbtPlugin("com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.2.1")
+
+addSbtPlugin("com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.2.2")
 addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1")
 
 //coverage