Skip to content

Commit 6e8a06c

Browse files
azhurazhur
committed
upgrade scala
1 parent 8bf1447 commit 6e8a06c

File tree

13 files changed

+37
-37
lines changed

13 files changed

+37
-37
lines changed

‎build.sbt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ inThisBuild(
2222
)
2323
)
2424

25-
lazy val latest212 = "2.12.18"
25+
lazy val latest212 = "2.12.20"
2626

27-
lazy val latest213 = "2.13.12"
27+
lazy val latest213 = "2.13.16"
2828

29-
lazy val latest3 = "3.3.1"
29+
lazy val latest3 = "3.3.4"
3030

3131
lazy val `kafka-serde-scala` =
3232
project

‎kafka-serde-avro4s/src/main/scala/io/github/azhur/kafka/serde/Avro4sBinarySupport.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import scala.util.control.NonFatal
2929
trait Avro4sBinarySupport {
3030
implicit def toSerializer[T >: Null: Encoder]: Serializer[T] =
3131
new Serializer[T] {
32-
override def configure(configs: util.Map[String, _], isKey: Boolean): Unit = {}
32+
override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {}
3333
override def close(): Unit = {}
3434
override def serialize(topic: String, data: T): Array[Byte] =
3535
if (data == null) null
@@ -52,7 +52,7 @@ trait Avro4sBinarySupport {
5252
): Deserializer[T] =
5353
new Deserializer[T] {
5454
private val schema = AvroSchema[T]
55-
override def configure(configs: util.Map[String, _], isKey: Boolean): Unit = {}
55+
override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {}
5656
override def close(): Unit = {}
5757
override def deserialize(topic: String, data: Array[Byte]): T =
5858
if (data == null) null
@@ -73,7 +73,7 @@ trait Avro4sBinarySupport {
7373

7474
implicit def toSerde[T >: Null: SchemaFor: Encoder: Decoder]: Serde[T] =
7575
new Serde[T] {
76-
override def configure(configs: util.Map[String, _], isKey: Boolean): Unit = {}
76+
override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {}
7777
override def close(): Unit = {}
7878
override def serializer(): Serializer[T] = toSerializer[T]
7979
override def deserializer(): Deserializer[T] = toDeserializer[T]

‎kafka-serde-avro4s/src/main/scala/io/github/azhur/kafka/serde/Avro4sDataSupport.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ trait Avro4sDataSupport {
3333
codec: CodecFactory = CodecFactory.nullCodec()
3434
): Serializer[T] =
3535
new Serializer[T] {
36-
override def configure(configs: util.Map[String, _], isKey: Boolean): Unit = {}
36+
override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {}
3737
override def close(): Unit = {}
3838
override def serialize(topic: String, data: T): Array[Byte] =
3939
if (data == null) null
@@ -56,7 +56,7 @@ trait Avro4sDataSupport {
5656
): Deserializer[T] =
5757
new Deserializer[T] {
5858
private val schema = AvroSchema[T]
59-
override def configure(configs: util.Map[String, _], isKey: Boolean): Unit = {}
59+
override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {}
6060
override def close(): Unit = {}
6161
override def deserialize(topic: String, data: Array[Byte]): T =
6262
if (data == null) null
@@ -81,7 +81,7 @@ trait Avro4sDataSupport {
8181
codec: CodecFactory = CodecFactory.nullCodec()
8282
): Serde[T] =
8383
new Serde[T] {
84-
override def configure(configs: util.Map[String, _], isKey: Boolean): Unit = {}
84+
override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {}
8585
override def close(): Unit = {}
8686
override def serializer(): Serializer[T] = toSerializer[T]
8787
override def deserializer(): Deserializer[T] = toDeserializer[T]

‎kafka-serde-avro4s/src/main/scala/io/github/azhur/kafka/serde/Avro4sJsonSupport.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import scala.util.{ Failure, Success }
2929
trait Avro4sJsonSupport {
3030
implicit def toSerializer[T >: Null: Encoder]: Serializer[T] =
3131
new Serializer[T] {
32-
override def configure(configs: util.Map[String, _], isKey: Boolean): Unit = {}
32+
override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {}
3333
override def close(): Unit = {}
3434
override def serialize(topic: String, data: T): Array[Byte] =
3535
if (data == null) null
@@ -52,7 +52,7 @@ trait Avro4sJsonSupport {
5252
): Deserializer[T] =
5353
new Deserializer[T] {
5454
private val schema = AvroSchema[T]
55-
override def configure(configs: util.Map[String, _], isKey: Boolean): Unit = {}
55+
override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {}
5656
override def close(): Unit = {}
5757
override def deserialize(topic: String, data: Array[Byte]): T =
5858
if (data == null) null
@@ -75,7 +75,7 @@ trait Avro4sJsonSupport {
7575
decoder: Decoder[T]
7676
): Serde[T] =
7777
new Serde[T] {
78-
override def configure(configs: util.Map[String, _], isKey: Boolean): Unit = {}
78+
override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {}
7979
override def close(): Unit = {}
8080
override def serializer(): Serializer[T] = toSerializer[T]
8181
override def deserializer(): Deserializer[T] = toDeserializer[T]

‎kafka-serde-circe/src/main/scala/io/github/azhur/kafka/serde/CirceSupport.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ trait CirceSupport {
3232
): Serializer[T] =
3333
new Serializer[T] {
3434
import io.circe.syntax._
35-
override def configure(configs: util.Map[String, _], isKey: Boolean): Unit = {}
35+
override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {}
3636
override def close(): Unit = {}
3737
override def serialize(topic: String, data: T): Array[Byte] =
3838
if (data == null) null
@@ -48,7 +48,7 @@ trait CirceSupport {
4848
import io.circe._
4949
import cats.syntax.either._
5050

51-
override def configure(configs: util.Map[String, _], isKey: Boolean): Unit = {}
51+
override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {}
5252
override def close(): Unit = {}
5353
override def deserialize(topic: String, data: Array[Byte]): T =
5454
if (data == null) null
@@ -66,7 +66,7 @@ trait CirceSupport {
6666
decoder: Decoder[T]
6767
): Serde[T] =
6868
new Serde[T] {
69-
override def configure(configs: util.Map[String, _], isKey: Boolean): Unit = {}
69+
override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {}
7070
override def close(): Unit = {}
7171
override def serializer(): Serializer[T] = toSerializer[T]
7272
override def deserializer(): Deserializer[T] = toDeserializer[T]

‎kafka-serde-jackson/src/main/scala/io/github/azhur/kafka/serde/JacksonFormatSchemaSupport.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ trait JacksonFormatSchemaSupport {
3535
): Serializer[T] =
3636
new Serializer[T] {
3737
private val writer = mapper.writer(schema)
38-
override def configure(configs: util.Map[String, _], isKey: Boolean): Unit = {}
38+
override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {}
3939
override def close(): Unit = {}
4040
override def serialize(topic: String, data: T): Array[Byte] =
4141
if (data == null) null
@@ -53,7 +53,7 @@ trait JacksonFormatSchemaSupport {
5353
): Deserializer[T] =
5454
new Deserializer[T] {
5555
private val reader = mapper.readerFor(typeReference[T]).`with`(schema)
56-
override def configure(configs: util.Map[String, _], isKey: Boolean): Unit = {}
56+
override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {}
5757
override def close(): Unit = {}
5858
override def deserialize(topic: String, data: Array[Byte]): T =
5959
if (data == null) null
@@ -70,7 +70,7 @@ trait JacksonFormatSchemaSupport {
7070
ct: TypeTag[T]
7171
): Serde[T] =
7272
new Serde[T] {
73-
override def configure(configs: util.Map[String, _], isKey: Boolean): Unit = {}
73+
override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {}
7474
override def close(): Unit = {}
7575
override def serializer(): Serializer[T] = toSerializer[T]
7676
override def deserializer(): Deserializer[T] = toDeserializer[T]

‎kafka-serde-jackson/src/main/scala/io/github/azhur/kafka/serde/JacksonJsonSupport.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import scala.util.control.NonFatal
2929
trait JacksonJsonSupport {
3030
implicit def toSerializer[T <: AnyRef](implicit mapper: ObjectMapper): Serializer[T] =
3131
new Serializer[T] {
32-
override def configure(configs: util.Map[String, _], isKey: Boolean): Unit = {}
32+
override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {}
3333
override def close(): Unit = {}
3434
override def serialize(topic: String, data: T): Array[Byte] =
3535
if (data == null) null
@@ -46,7 +46,7 @@ trait JacksonJsonSupport {
4646
): Deserializer[T] =
4747
new Deserializer[T] {
4848
private val tr = typeReference[T]
49-
override def configure(configs: util.Map[String, _], isKey: Boolean): Unit = {}
49+
override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {}
5050
override def close(): Unit = {}
5151
override def deserialize(topic: String, data: Array[Byte]): T =
5252
if (data == null) null
@@ -62,7 +62,7 @@ trait JacksonJsonSupport {
6262
tt: TypeTag[T]
6363
): Serde[T] =
6464
new Serde[T] {
65-
override def configure(configs: util.Map[String, _], isKey: Boolean): Unit = {}
65+
override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {}
6666
override def close(): Unit = {}
6767
override def serializer(): Serializer[T] = toSerializer[T]
6868
override def deserializer(): Deserializer[T] = toDeserializer[T]

‎kafka-serde-json4s/src/main/scala/io/github/azhur/kafka/serde/Json4sSupport.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ trait Json4sSupport {
3131
formats: Formats
3232
): Serializer[T] =
3333
new Serializer[T] {
34-
override def configure(configs: util.Map[String, _], isKey: Boolean): Unit = {}
34+
override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {}
3535
override def close(): Unit = {}
3636
override def serialize(topic: String, data: T): Array[Byte] =
3737
if (data == null) null
@@ -48,7 +48,7 @@ trait Json4sSupport {
4848
mf: Manifest[T]
4949
): Deserializer[T] =
5050
new Deserializer[T] {
51-
override def configure(configs: util.Map[String, _], isKey: Boolean): Unit = {}
51+
override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {}
5252
override def close(): Unit = {}
5353
override def deserialize(topic: String, data: Array[Byte]): T =
5454
if (data == null) null
@@ -65,7 +65,7 @@ trait Json4sSupport {
6565
mf: Manifest[T]
6666
): Serde[T] =
6767
new Serde[T] {
68-
override def configure(configs: util.Map[String, _], isKey: Boolean): Unit = {}
68+
override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {}
6969
override def close(): Unit = {}
7070
override def serializer(): Serializer[T] = toSerializer[T]
7171
override def deserializer(): Deserializer[T] = toDeserializer[T]

‎kafka-serde-jsoniter-scala/src/main/scala/io/github/azhur/kafka/serde/JsoniterScalaSupport.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ trait JsoniterScalaSupport {
3030
writerConfig: WriterConfig = WriterConfig
3131
): Serializer[T] =
3232
new Serializer[T] {
33-
override def configure(configs: util.Map[String, _], isKey: Boolean): Unit = {}
33+
override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {}
3434
override def close(): Unit = {}
3535
override def serialize(topic: String, data: T): Array[Byte] =
3636
if (data == null) null
@@ -46,7 +46,7 @@ trait JsoniterScalaSupport {
4646
readerConfig: ReaderConfig = ReaderConfig
4747
): Deserializer[T] =
4848
new Deserializer[T] {
49-
override def configure(configs: util.Map[String, _], isKey: Boolean): Unit = {}
49+
override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {}
5050
override def close(): Unit = {}
5151
override def deserialize(topic: String, data: Array[Byte]): T =
5252
if (data == null) null
@@ -63,7 +63,7 @@ trait JsoniterScalaSupport {
6363
readerConfig: ReaderConfig = ReaderConfig
6464
): Serde[T] =
6565
new Serde[T] {
66-
override def configure(configs: util.Map[String, _], isKey: Boolean): Unit = {}
66+
override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {}
6767
override def close(): Unit = {}
6868
override def serializer(): Serializer[T] = toSerializer[T]
6969
override def deserializer(): Deserializer[T] = toDeserializer[T]

‎kafka-serde-play-json/src/main/scala/io/github/azhur/kafka/serde/PlayJsonSupport.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ trait PlayJsonSupport {
3232
printer: JsValue => String = Json.stringify
3333
): Serializer[T] =
3434
new Serializer[T] {
35-
override def configure(configs: util.Map[String, _], isKey: Boolean): Unit = {}
35+
override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {}
3636
override def close(): Unit = {}
3737
override def serialize(topic: String, data: T): Array[Byte] =
3838
if (data == null) null
@@ -47,7 +47,7 @@ trait PlayJsonSupport {
4747
reads: Reads[T]
4848
): Deserializer[T] =
4949
new Deserializer[T] {
50-
override def configure(configs: util.Map[String, _], isKey: Boolean): Unit = {}
50+
override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {}
5151
override def close(): Unit = {}
5252
override def deserialize(topic: String, data: Array[Byte]): T =
5353
if (data == null) null
@@ -65,7 +65,7 @@ trait PlayJsonSupport {
6565
printer: JsValue => String = Json.stringify
6666
): Serde[T] =
6767
new Serde[T] {
68-
override def configure(configs: util.Map[String, _], isKey: Boolean): Unit = {}
68+
override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {}
6969
override def close(): Unit = {}
7070
override def serializer(): Serializer[T] = toSerializer[T]
7171
override def deserializer(): Deserializer[T] = toDeserializer[T]

0 commit comments

Comments
 (0)