Update Scala 2 to 2.12.20 and 2.13.16

zio · Jan 25, 2025 · f66fa0c · f66fa0c
1 parent b1aaf9c
commit f66fa0c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -38,7 +38,7 @@ jobs:
       fail-fast: false
       matrix:
         java: ['17', '21']
-        scala: ['2.13.15', '3.3.4']
+        scala: ['2.13.16', '3.3.4']
     steps:
       - name: Checkout current branch
         uses: actions/checkout@v4.1.2
@@ -79,7 +79,7 @@ jobs:
       fail-fast: false
       matrix:
         java: ['17', '21']
-        scala: ['2.12.19', '2.13.15', '3.3.4']
+        scala: ['2.12.20', '2.13.16', '3.3.4']
         platform: ['JVM', 'JS', 'Native']
     steps:
       - name: Checkout current branch

diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala
@@ -238,7 +238,7 @@ object BuildHelper {
     },
     semanticdbEnabled := scalaVersion.value != ScalaDotty, // enable SemanticDB
     semanticdbOptions += "-P:semanticdb:synthetics:on",
-    semanticdbVersion        := "4.10.2",
+    semanticdbVersion        := "4.12.7",
     Test / parallelExecution := true,
     incOptions ~= (_.withLogRecompileOnMacro(false)),
     autoAPIMappings := true,

diff --git a/zio-json-golden/src/main/scala/zio/json/golden/filehelpers.scala b/zio-json-golden/src/main/scala/zio/json/golden/filehelpers.scala
@@ -5,8 +5,6 @@ import java.nio.file.Path
 import zio.{ test => _, _ }
 import zio.json._
 
-import zio.stacktracer.TracingImplicits.disableAutoTrace
-
 import java.nio.file.Files
 
 object filehelpers {
@@ -15,17 +13,13 @@ object filehelpers {
     if (file.getName == "target") ZIO.succeed(file)
     else ZIO.attempt(file.getParentFile).flatMap(getRootDir)
 
-  def createGoldenDirectory(pathToDir: String)(implicit trace: Trace): Task[Path] = {
-    val _        = disableAutoTrace // TODO: Find a way to suppress the unused import warning
-    val rootFile = new File(getClass.getResource("/").toURI)
-
+  def createGoldenDirectory(pathToDir: String)(implicit trace: Trace): Task[Path] =
     for {
-      baseFile <- getRootDir(rootFile)
+      baseFile <- getRootDir(new File(getClass.getResource(".").toURI))
       goldenDir = new File(baseFile.getParentFile, pathToDir)
       path      = goldenDir.toPath
       _        <- ZIO.attemptBlocking(goldenDir.mkdirs)
     } yield path
-  }
 
   def writeSampleToFile(path: Path, sample: GoldenSample)(implicit trace: Trace): IO[IOException, Unit] = {
     val jsonString = sample.toJsonPretty