From 76d54f1a0d16ec23911fc89199f1cf8d78c82dfc Mon Sep 17 00:00:00 2001 From: Ferdinand Svehla Date: Mon, 21 Oct 2024 11:03:38 +0200 Subject: [PATCH 1/6] CI: Scala 2.13.14 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e356c429..6a347d96 100644 --- 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.13'] + scala: ['2.13.14'] 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.13', '3.3.4'] + scala: ['2.12.19', '2.13.14', '3.3.4'] platform: ['JVM', 'JS', 'Native'] steps: - name: Checkout current branch From fb18cf27f79020359421aa683776eba117ef44f1 Mon Sep 17 00:00:00 2001 From: Ferdinand Svehla Date: Mon, 21 Oct 2024 11:08:10 +0200 Subject: [PATCH 2/6] Update silencer --- project/BuildHelper.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala index fc94a15d..66f48a04 100644 --- a/project/BuildHelper.scala +++ b/project/BuildHelper.scala @@ -22,7 +22,7 @@ object BuildHelper { val Scala213: String = versions("2.13") val ScalaDotty: String = "3.3.4" - val SilencerVersion = "1.7.16" + val SilencerVersion = "1.7.19" private val stdOptions = Seq( "-deprecation", From 65c6cdb8efd842f85f9af8ee27a1090767907cb5 Mon Sep 17 00:00:00 2001 From: Ferdinand Svehla Date: Mon, 21 Oct 2024 11:10:43 +0200 Subject: [PATCH 3/6] Update semanticDB --- project/BuildHelper.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala index 66f48a04..d78aeae8 100644 --- a/project/BuildHelper.scala +++ b/project/BuildHelper.scala @@ -229,7 +229,7 @@ object BuildHelper { }, semanticdbEnabled := scalaVersion.value != ScalaDotty, // enable SemanticDB semanticdbOptions += "-P:semanticdb:synthetics:on", - semanticdbVersion := "4.9.2", + semanticdbVersion := "4.10.2", Test / parallelExecution := true, incOptions ~= (_.withLogRecompileOnMacro(false)), autoAPIMappings := true, From 5c3ef158f760b7a8f451d07fb94d59dc50cfbd4d Mon Sep 17 00:00:00 2001 From: Ferdinand Svehla Date: Mon, 21 Oct 2024 11:14:24 +0200 Subject: [PATCH 4/6] set scala version to 2.13.15 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a347d96..fc4a1996 100644 --- 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.14'] + scala: ['2.13.15'] 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.14', '3.3.4'] + scala: ['2.12.19', '2.13.15', '3.3.4'] platform: ['JVM', 'JS', 'Native'] steps: - name: Checkout current branch From 738c3dff0bbd15b45dca87b1c06490f7e42d3f05 Mon Sep 17 00:00:00 2001 From: Ferdinand Svehla Date: Mon, 21 Oct 2024 11:16:54 +0200 Subject: [PATCH 5/6] remove unnecessary @nowarn --- zio-json-golden/src/main/scala/zio/json/golden/package.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zio-json-golden/src/main/scala/zio/json/golden/package.scala b/zio-json-golden/src/main/scala/zio/json/golden/package.scala index e36fcfc7..8bdf6aec 100644 --- a/zio-json-golden/src/main/scala/zio/json/golden/package.scala +++ b/zio-json-golden/src/main/scala/zio/json/golden/package.scala @@ -27,7 +27,7 @@ package object golden { else DiffResult.Different(x, y) } - @nowarn implicit private lazy val diff: Diff[GoldenSample] = (x: GoldenSample, y: GoldenSample) => + implicit private lazy val diff: Diff[GoldenSample] = (x: GoldenSample, y: GoldenSample) => Diff[Json].diff(x.samples, y.samples) def goldenTest[A: Tag: JsonEncoder]( From 57402b9b1ed5c57bd35275d25d8f58ce5bfcf73c Mon Sep 17 00:00:00 2001 From: Ferdinand Svehla Date: Mon, 21 Oct 2024 11:20:46 +0200 Subject: [PATCH 6/6] no fatal warnings --- project/BuildHelper.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala index d78aeae8..77ec4c3c 100644 --- a/project/BuildHelper.scala +++ b/project/BuildHelper.scala @@ -32,7 +32,8 @@ object BuildHelper { "-unchecked" ) ++ { if (sys.env.contains("CI")) { - Seq("-Xfatal-warnings") + // Seq("-Xfatal-warnings") // enable this when we are ready to enforce this + Nil } else { Nil // to enable Scalafix locally }