Update scala-library, scala-reflect to 2.13.14 (#583)

fd4s · Jun 13, 2024 · dfd48d5 · dfd48d5
1 parent 7815a0e
commit dfd48d5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 16 deletions.
diff --git a/build.sbt b/build.sbt
@@ -13,7 +13,7 @@ val shapelessVersion = "2.3.10"
 val slf4jNopVersion = "2.0.13"
 
 val scala212 = "2.12.18"
-val scala213 = "2.13.12"
+val scala213 = "2.13.14"
 val scala3 = "3.3.1"
 
 ThisBuild / versionScheme := Some("early-semver")

diff --git a/modules/core/src/main/scala/vulcan/Codec.scala b/modules/core/src/main/scala/vulcan/Codec.scala
@@ -241,7 +241,7 @@ object Codec extends CodecCompanionCompat {
       extends Codec.InstanceForTypes[Avro.Boolean, Boolean](
         "Boolean",
         SchemaBuilder.builder().booleanType(),
-        _.asRight, { case (boolean: Boolean, _) => Right(boolean) },
+        _.asRight, { case (value: Boolean, _) => Right(value) },
         Some("Boolean")
       )
 
@@ -361,11 +361,11 @@ object Codec extends CodecCompanionCompat {
     override def decode(value: Any, writerSchema: Schema): Either[AvroError, BigDecimal] = {
       if (writerSchema.getType == Schema.Type.BYTES) {
         value match {
-          case bytes: Avro.Bytes =>
+          case avroBytes: Avro.Bytes =>
             writerSchema.getLogicalType match {
               case decimal: LogicalTypes.Decimal =>
                 val conversion = new Conversions.DecimalConversion()
-                val bigDecimal = BigDecimal(conversion.fromBytes(bytes, writerSchema, decimal))
+                val bigDecimal = BigDecimal(conversion.fromBytes(avroBytes, writerSchema, decimal))
                 if (bigDecimal.precision <= decimal.getPrecision) {
                   Right(bigDecimal)
                 } else
@@ -580,15 +580,15 @@ object Codec extends CodecCompanionCompat {
                 Left(AvroError.encodeExceedsFixedSize(bytes.length, size))
               }
             }, {
-              case (fixed: Avro.Fixed, schema) =>
+              case (fixed: Avro.Fixed, avroSchema) =>
                 val bytes = fixed.bytes()
-                if (bytes.length == schema.getFixedSize) {
+                if (bytes.length == avroSchema.getFixedSize) {
                   decode(bytes)
                 } else {
                   Left {
                     AvroError.decodeNotEqualFixedSize(
                       bytes.length,
-                      schema.getFixedSize
+                      avroSchema.getFixedSize
                     )
                   }
                 }
@@ -770,14 +770,14 @@ object Codec extends CodecCompanionCompat {
               Right(coll)
             }
           }, {
-            case (as: java.util.Collection[_], schema) =>
+            case (as: java.util.Collection[_], avroShema) =>
               val it = as.iterator()
               val coll: ju.Collection[A] = new ju.ArrayList
               AvroError.catchNonFatal {
                 while (it.hasNext)(coll
                   .add(
                     codec
-                      .decode(it.next(), schema.getElementType)
+                      .decode(it.next(), avroShema.getElementType)
                       .fold(err => throw err.throwable, identity)
                   ))
                 Right(coll)
@@ -887,11 +887,11 @@ object Codec extends CodecCompanionCompat {
                     .tupleLeft(Avro.String(key))
               }
               .map(_.toMap.asJava), {
-              case (map: java.util.Map[_, _], schema) =>
+              case (map: java.util.Map[_, _], avroSchema) =>
                 map.asScala.toList
                   .traverse {
                     case (key: Avro.String, value) =>
-                      codec.decode(value, schema.getValueType).tupleLeft(key.toString)
+                      codec.decode(value, avroSchema.getValueType).tupleLeft(key.toString)
                     case (key, _) => Left(AvroError.decodeUnexpectedMapKey(key))
                   }
                   .map(_.toMap)
@@ -1191,8 +1191,8 @@ object Codec extends CodecCompanionCompat {
           value match {
             case string: String          => Right(string)
             case avroString: Avro.String => Right(avroString.toString)
-            case bytes: Avro.Bytes =>
-              AvroError.catchNonFatal(Right(StandardCharsets.UTF_8.decode(bytes).toString))
+            case avroBytes: Avro.Bytes =>
+              AvroError.catchNonFatal(Right(StandardCharsets.UTF_8.decode(avroBytes).toString))
             case other =>
               Left {
                 AvroError

diff --git a/modules/core/src/main/scala/vulcan/Props.scala b/modules/core/src/main/scala/vulcan/Props.scala
@@ -52,8 +52,8 @@ object Props {
 
     override final def toString: String =
       toChain match {
-        case Right(props) =>
-          props.toList
+        case Right(pairs) =>
+          pairs.toList
             .map { case (name, value) => s"$name -> $value" }
             .mkString("Props(", ", ", ")")
 

diff --git a/modules/generic/src/test/scala/vulcan/generic/CodecBase.scala b/modules/generic/src/test/scala/vulcan/generic/CodecBase.scala
@@ -6,7 +6,6 @@
 
 package vulcan.generic
 
-import cats.implicits._
 import org.scalatest.Assertion
 import org.scalatest.funspec.AnyFunSpec
 import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks