Skip to content

Commit

Permalink
Merge branch 'master' into subscription-stream-control
Browse files Browse the repository at this point in the history
  • Loading branch information
svroonland authored May 19, 2024
2 parents 5365aa0 + e122b22 commit f977001
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ lazy val _scala3 = "3.3.3"
inThisBuild(
List(
name := "ZIO Kafka",
zioVersion := "2.1.0",
zioVersion := "2.1.1",
scalaVersion := _scala213,
// zio-sbt defines these 'scala213' and 'scala3' settings, but we need to define them here to override the defaults and better control them
scala213 := _scala213,
Expand Down Expand Up @@ -157,7 +157,7 @@ lazy val zioKafkaTest =
libraryDependencies ++= Seq(
kafkaClients,
logback % Test,
"dev.zio" %% "zio-logging-slf4j" % "2.2.3" % Test
"dev.zio" %% "zio-logging-slf4j" % "2.2.4" % Test
) ++ `embedded-kafka`.value
)

Expand All @@ -179,13 +179,13 @@ lazy val zioKafkaExample =
.settings(run / fork := false)
.settings(
libraryDependencies ++= Seq(
"dev.zio" %% "zio" % "2.1.0",
"dev.zio" %% "zio" % "2.1.1",
"dev.zio" %% "zio-kafka" % "2.7.4",
"dev.zio" %% "zio-logging-slf4j2" % "2.2.3",
"dev.zio" %% "zio-logging-slf4j2" % "2.2.4",
"io.github.embeddedkafka" %% "embedded-kafka" % embeddedKafkaVersion,
logback,
"dev.zio" %% "zio-kafka-testkit" % "2.7.4" % Test,
"dev.zio" %% "zio-test" % "2.1.0" % Test
"dev.zio" %% "zio-test" % "2.1.1" % Test
),
// Scala 3 compiling fails with:
// [error] Modules were resolved with conflicting cross-version suffixes in ProjectRef(uri("file:/home/runner/work/zio-kafka/zio-kafka/"), "zioKafkaExample"):
Expand Down

0 comments on commit f977001

Please sign in to comment.