Skip to content

Commit d219cc5

Browse files
committed
[bump] dependencies in preparation for scala 2.13
I couldn't add the 2.13 target because kafka itself has no binary yet. I figured this out later when I already upgraded the other dependencies. Maybe this is still useful to have.
1 parent a02a82a commit d219cc5

File tree

4 files changed

+14
-15
lines changed

4 files changed

+14
-15
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,7 @@ atlassian-ide-plugin.xml
7979
com_crashlytics_export_strings.xml
8080
crashlytics.properties
8181
crashlytics-build.properties
82+
83+
84+
.bloop
85+
.metals

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jdk:
55

66
scala:
77
- 2.11.12
8-
- 2.12.6
8+
- 2.12.9
99

1010
sudo: false
1111

build.sbt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ import sbtrelease.Version
22

33
parallelExecution in ThisBuild := false
44

5-
val kafkaVersion = "2.0.0"
6-
val confluentVersion = "5.0.0"
7-
val akkaVersion = "2.5.14"
5+
val kafkaVersion = "2.3.0"
6+
val confluentVersion = "5.3.0"
7+
val akkaVersion = "2.5.25"
88

99
lazy val commonSettings = Seq(
1010
organization := "net.manub",
11-
scalaVersion := "2.12.6",
12-
crossScalaVersions := Seq("2.12.6", "2.11.12"),
11+
scalaVersion := "2.12.9",
12+
crossScalaVersions := Seq("2.12.9", "2.11.12"),
1313
homepage := Some(url("https://github.com/manub/scalatest-embedded-kafka")),
1414
parallelExecution in Test := false,
1515
logBuffered in Test := false,
@@ -20,10 +20,10 @@ lazy val commonSettings = Seq(
2020
)
2121

2222
lazy val commonLibrarySettings = libraryDependencies ++= Seq(
23-
"org.apache.avro" % "avro" % "1.8.2",
23+
"org.apache.avro" % "avro" % "1.9.1",
2424
"org.apache.kafka" %% "kafka" % kafkaVersion,
2525
"org.slf4j" % "slf4j-log4j12" % "1.7.25" % Test,
26-
"org.scalatest" %% "scalatest" % "3.0.5" % Test,
26+
"org.scalatest" %% "scalatest" % "3.0.8" % Test,
2727
"com.typesafe.akka" %% "akka-actor" % akkaVersion % Test,
2828
"com.typesafe.akka" %% "akka-testkit" % akkaVersion % Test
2929
)

embedded-kafka/src/main/scala/net/manub/embeddedkafka/avro/avroMarshallers.scala

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ import org.apache.avro.specific.{
1313
import org.apache.kafka.common.serialization.{Deserializer, Serializer}
1414

1515
class KafkaAvroDeserializer[T <: SpecificRecord](schema: Schema)
16-
extends Deserializer[T]
17-
with NoOpConfiguration
18-
with NoOpClose {
16+
extends Deserializer[T] {
1917

2018
private val reader = new SpecificDatumReader[T](schema)
2119

@@ -25,10 +23,7 @@ class KafkaAvroDeserializer[T <: SpecificRecord](schema: Schema)
2523
}
2624
}
2725

28-
class KafkaAvroSerializer[T <: SpecificRecord]()
29-
extends Serializer[T]
30-
with NoOpConfiguration
31-
with NoOpClose {
26+
class KafkaAvroSerializer[T <: SpecificRecord]() extends Serializer[T] {
3227

3328
private def toBytes(nullableData: T): Array[Byte] =
3429
Option(nullableData).fold[Array[Byte]](null) { data =>

0 commit comments

Comments
 (0)