Skip to content

Commit

Permalink
Merge 5147c46 into c96afd4
Browse files Browse the repository at this point in the history
  • Loading branch information
sbhatt-mdsol committed Dec 1, 2021
2 parents c96afd4 + 5147c46 commit 3b07245
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 12 deletions.
35 changes: 27 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,9 +1,28 @@
import sbtassembly.MergeStrategy

name := "flinkrunner"

lazy val scala212 = "2.12.12"
lazy val scala211 = "2.11.12"
lazy val supportedScalaVersions = List(scala212)

val customMergeStrategy: String => MergeStrategy = {
case "reference.conf" =>
MergeStrategy.concat
case "module-info.class" =>
MergeStrategy.concat
case "mozilla/public-suffix-list.txt" =>
MergeStrategy.concat
case "scala/annotation/nowarn$.class" =>
MergeStrategy.concat
case "scala/annotation/nowarn.class" =>
MergeStrategy.concat
case s =>
MergeStrategy.defaultMergeStrategy(s)
}

assemblyMergeStrategy in assembly := customMergeStrategy

inThisBuild(
List(
organization := "io.epiphanous",
Expand Down Expand Up @@ -56,7 +75,7 @@ val flinkDeps =

val loggingDeps = Seq(
"ch.qos.logback" % "logback-classic" % V.logback % Provided,
"com.typesafe.scala-logging" %% "scala-logging" % V.scalaLogging
"com.typesafe.scala-logging" %% "scala-logging" % V.scalaLogging % Provided
)

val http4sDeps =
Expand All @@ -73,14 +92,14 @@ val circeDeps = Seq(
)

val otherDeps = Seq(
"com.beachape" %% "enumeratum" % V.enumeratum,
"org.apache.avro" % "avro" % V.avro,
"com.typesafe" % "config" % V.typesafeConfig,
"com.google.guava" % "guava" % V.guava,
"org.typelevel" %% "squants" % V.squants,
"com.sksamuel.avro4s" %% "avro4s-core" % V.avro4s,
"com.beachape" %% "enumeratum" % V.enumeratum % Provided,
"org.apache.avro" % "avro" % V.avro % Provided,
"com.typesafe" % "config" % V.typesafeConfig % Provided,
"com.google.guava" % "guava" % V.guava % Provided,
"org.typelevel" %% "squants" % V.squants % Provided,
"com.sksamuel.avro4s" %% "avro4s-core" % V.avro4s % Provided,
"org.scalactic" %% "scalactic" % V.scalaTest % Test,
"org.scalatest" %% "scalatest" % V.scalaTest % Test,
"org.scalatest" %% "scalatest" % V.scalaTest % Test ,
"org.scalacheck" %% "scalacheck" % V.scalaCheck % Test
)

Expand Down
1 change: 1 addition & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.5")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.7")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0")
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import scala.util.Try
* the schema registry context type
*/
class AvroCoder[Context](registry: AvroSchemaRegistryClient[Context])
extends LazyLogging {
extends LazyLogging with Serializable {

/**
* Decode a given binary avro encoded byte array using a schema
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ class ConfluentSchemaRegistryClient()(implicit
decoder: Decoder[ConfluentSchemaRegistryResponse])
extends AvroSchemaRegistryClient[ConfluentSchemaRegistryContext]
with StringUtils
with LazyLogging {
with LazyLogging
with Serializable {

import ConfluentSchemaRegistryClient.configPrefix

Expand Down Expand Up @@ -281,7 +282,7 @@ class ConfluentSchemaRegistryClient()(implicit
* the version to retrieve (defaults to "latest")
* @return
*/
protected def url(subject: String, version: String = "latest"): String =
protected def url(subject: String, version: String = "1"): String =
s"$urlBase/subjects/$subject/versions/$version"

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ package io.epiphanous.flinkrunner.avro

case class ConfluentSchemaRegistryContext(
isKey: Boolean = false,
version: String = "latest")
version: String = "1")

0 comments on commit 3b07245

Please sign in to comment.