Skip to content

[bump] dependencies in preparation for scala 2.13 #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,7 @@ atlassian-ide-plugin.xml
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties


.bloop
.metals
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
language: scala

jdk:
- oraclejdk8
- openjdk8

scala:
- 2.11.12
- 2.12.6
- 2.12.9

sudo: false

Expand Down
14 changes: 7 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ import sbtrelease.Version

parallelExecution in ThisBuild := false

val kafkaVersion = "2.0.0"
val confluentVersion = "5.0.0"
val akkaVersion = "2.5.14"
val kafkaVersion = "2.3.0"
val confluentVersion = "5.3.0"
val akkaVersion = "2.5.25"

lazy val commonSettings = Seq(
organization := "net.manub",
scalaVersion := "2.12.6",
crossScalaVersions := Seq("2.12.6", "2.11.12"),
scalaVersion := "2.12.9",
crossScalaVersions := Seq("2.12.9", "2.11.12"),
homepage := Some(url("https://github.com/manub/scalatest-embedded-kafka")),
parallelExecution in Test := false,
logBuffered in Test := false,
Expand All @@ -20,10 +20,10 @@ lazy val commonSettings = Seq(
)

lazy val commonLibrarySettings = libraryDependencies ++= Seq(
"org.apache.avro" % "avro" % "1.8.2",
"org.apache.avro" % "avro" % "1.9.1",
"org.apache.kafka" %% "kafka" % kafkaVersion,
"org.slf4j" % "slf4j-log4j12" % "1.7.25" % Test,
"org.scalatest" %% "scalatest" % "3.0.5" % Test,
"org.scalatest" %% "scalatest" % "3.0.8" % Test,
"com.typesafe.akka" %% "akka-actor" % akkaVersion % Test,
"com.typesafe.akka" %% "akka-testkit" % akkaVersion % Test
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@ import org.apache.avro.specific.{
import org.apache.kafka.common.serialization.{Deserializer, Serializer}

class KafkaAvroDeserializer[T <: SpecificRecord](schema: Schema)
extends Deserializer[T]
with NoOpConfiguration
with NoOpClose {
extends Deserializer[T] {

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

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

class KafkaAvroSerializer[T <: SpecificRecord]()
extends Serializer[T]
with NoOpConfiguration
with NoOpClose {
class KafkaAvroSerializer[T <: SpecificRecord]() extends Serializer[T] {

private def toBytes(nullableData: T): Array[Byte] =
Option(nullableData).fold[Array[Byte]](null) { data =>
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.2.1
sbt.version=1.2.8