Skip to content

Commit

Permalink
Merge pull request #421 from Banno/am/typelevel-log4cats
Browse files Browse the repository at this point in the history
KAYAK-1002 switch to typelevel log4cats
  • Loading branch information
amohrland authored May 31, 2021
2 parents 4a3739d + 1a0b997 commit 424c340
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 9 deletions.
5 changes: 2 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ val V = new {
val junit = "4.13"
val kafka = "2.7.0"
val kindProjector = "0.11.3"
val log4cats = "1.1.1"
val log4cats = "1.3.1"
val log4j = "1.7.30"
val logback = "1.2.3"
val scalacheck = "1.15.4"
Expand Down Expand Up @@ -50,7 +50,6 @@ lazy val core = project
("org.apache.kafka" % "kafka-streams" % V.kafka % "test").classifier("test"),
("org.apache.kafka" % "kafka-streams-test-utils" % V.kafka % "test"),
"ch.qos.logback" % "logback-classic" % V.logback % "test",
"org.slf4j" % "log4j-over-slf4j" % V.log4j % "test",
"org.scalacheck" %% "scalacheck" % V.scalacheck % "test",
"org.scalatest" %% "scalatest" % V.scalatest % "test",
"org.scalatestplus" %% "scalacheck-1-15" % "3.2.8.0" % Test,
Expand Down Expand Up @@ -136,7 +135,7 @@ lazy val commonSettings = Seq(
"io.confluent" % "kafka-avro-serializer" % V.confluent,
"com.sksamuel.avro4s" %% "avro4s-core" % V.avro4s,
"io.prometheus" % "simpleclient" % V.simpleClient,
"io.chrisdavenport" %% "log4cats-slf4j" % V.log4cats,
"org.typelevel" %% "log4cats-slf4j" % V.log4cats,
),
Test / sourceGenerators += (Test / avroScalaGenerate).taskValue,
watchSources ++= ((Test / avroSourceDirectories).value ** "*.avdl").get,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import cats.implicits._
import cats.effect.Sync
import java.util.regex.Pattern

import io.chrisdavenport.log4cats.slf4j.Slf4jLogger
import org.typelevel.log4cats.slf4j.Slf4jLogger

import scala.jdk.CollectionConverters._
import scala.concurrent.duration._
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import org.apache.kafka.common.errors.WakeupException
import org.apache.kafka.clients.consumer._
import com.banno.kafka._
import fs2.concurrent.{Signal, SignallingRef}
import io.chrisdavenport.log4cats.slf4j.Slf4jLogger
import org.typelevel.log4cats.slf4j.Slf4jLogger

sealed trait SeekTo {
def apply[F[_]](consumer: ConsumerApi[F, _, _], partitions: Iterable[TopicPartition]): F[Unit]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import cats.syntax.all._
import com.banno.kafka.metrics.MetricsReporterApi
import fs2.Stream
import fs2.concurrent.SignallingRef
import io.chrisdavenport.log4cats.slf4j.Slf4jLogger
import org.typelevel.log4cats.slf4j.Slf4jLogger
import io.prometheus.client._
import org.apache.kafka.common.MetricName
import org.apache.kafka.common.metrics.KafkaMetric
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import io.confluent.kafka.schemaregistry.client.rest.RestService
import cats.implicits._
import cats.effect.Sync
import com.sksamuel.avro4s.SchemaFor
import io.chrisdavenport.log4cats.slf4j.Slf4jLogger
import org.typelevel.log4cats.slf4j.Slf4jLogger
import io.confluent.kafka.schemaregistry.ParsedSchema

import scala.jdk.CollectionConverters._
Expand Down
2 changes: 1 addition & 1 deletion core/src/test/scala/com/banno/kafka/InMemoryKafka.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import org.scalatest.{BeforeAndAfterAll, Suite}
import org.scalacheck.Gen
import com.banno.kafka.admin.AdminApi
import cats.effect.IO
import io.chrisdavenport.log4cats.slf4j.Slf4jLogger
import org.typelevel.log4cats.slf4j.Slf4jLogger
import org.apache.kafka.clients.admin.NewTopic

trait InMemoryKafka extends BeforeAndAfterAll { this: Suite =>
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.5.1
sbt.version=1.5.2

0 comments on commit 424c340

Please sign in to comment.