Update Scala 2 to 2.12.20 and 2.13.16 (#796)

zio · Jan 26, 2025 · 8e72213 · 8e72213
1 parent 57b2059
commit 8e72213
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -40,7 +40,7 @@ jobs:
       fail-fast: false
       matrix:
         java: ['temurin:17', 'temurin:21']
-        scala: ['2.12.19', '2.13.15', '3.3.4']
+        scala: ['2.12.20', '2.13.16', '3.3.4']
         platform: ['JVM', 'Native', 'JS']
     steps:
     - uses: actions/[email protected]

diff --git a/zio-schema-derivation/shared/src/main/scala-2/zio/schema/DeriveSchema.scala b/zio-schema-derivation/shared/src/main/scala-2/zio/schema/DeriveSchema.scala
@@ -306,10 +306,8 @@ object DeriveSchema {
                 } else {
                   annotations :+
                     q"new _root_.zio.schema.annotation.fieldDefaultValue[${symbol.typeSignature}](${defaultConstructorValues(i)})"
-
                 }
-
-            }.filter(_ != EmptyTree)
+            }
           }.getOrElse(Nil)
 
         val fieldValidations: List[Tree] =
@@ -324,11 +322,10 @@ object DeriveSchema {
                       c.warning(c.enclosingPosition, s"Unhandled annotation tree $tree")
                       EmptyTree
                   }
-              }
-            }.filter(_ != EmptyTree)
-              .map(_.foldLeft[c.universe.Tree](q"_root_.zio.schema.validation.Validation.succeed") {
+              }.foldLeft[c.universe.Tree](q"_root_.zio.schema.validation.Validation.succeed") {
                 case (acc, t) => q"$acc && $t"
-              })
+              }
+            }
           }.getOrElse(Nil)
 
         if (arity > 22) {

diff --git a/zio-schema-json/shared/src/main/scala/zio/schema/codec/JsonCodec.scala b/zio-schema-json/shared/src/main/scala/zio/schema/codec/JsonCodec.scala
@@ -1554,7 +1554,6 @@ object JsonCodec {
 
         override def -(key: String): collection.Map[String, Any] = ???
 
-        @scala.annotation.nowarn
         override def -(key1: String, key2: String, keys: String*): collection.Map[String, Any] = ???
 
         override def get(key: String): Option[Any] = ???