Skip to content

Commit

Permalink
Merge branch 'series/1.x' into series/2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
bplommer committed Apr 27, 2021
2 parents 555ff7f + ff6a84c commit b444b6a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.12.13, 2.13.5, 3.0.0-RC2]
scala: [2.12.13, 2.13.5, 3.0.0-RC3]
java: [adopt@1.8]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -96,4 +96,4 @@ jobs:
GIT_DEPLOY_KEY: ${{ secrets.GIT_DEPLOY_KEY }}
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
PGP_SECRET: ${{ secrets.PGP_SECRET }}
run: sbt ++${{ matrix.scala }} ci-release docs/docusaurusPublishGhpages
run: sbt ++${{ matrix.scala }} ci-release docs/docusaurusPublishGhpages
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
val catsEffectVersion = "3.1.0"

val catsVersion = "2.4.1"
val catsVersion = "2.6.0"

val confluentVersion = "6.1.1"

Expand All @@ -10,13 +10,13 @@ val kafkaVersion = "2.8.0"

val testcontainersScalaVersion = "0.39.3"

val vulcanVersion = "1.5.1"
val vulcanVersion = "1.6.0"

val scala212 = "2.12.13"

val scala213 = "2.13.5"

val scala3 = "3.0.0-RC2"
val scala3 = "3.0.0-RC3"

lazy val `fs2-kafka` = project
.in(file("."))
Expand Down Expand Up @@ -86,10 +86,10 @@ lazy val dependencySettings = Seq(
.cross(CrossVersion.for3Use2_13),
("com.dimafeng" %% "testcontainers-scala-kafka" % testcontainersScalaVersion)
.cross(CrossVersion.for3Use2_13),
"org.typelevel" %% "discipline-scalatest" % "2.1.3",
"org.typelevel" %% "discipline-scalatest" % "2.1.4",
"org.typelevel" %% "cats-effect-laws" % catsEffectVersion,
"org.typelevel" %% "cats-effect-testkit" % catsEffectVersion,
"org.typelevel" %% "cats-testkit-scalatest" % "2.1.3",
"org.typelevel" %% "cats-testkit-scalatest" % "2.1.4",
"ch.qos.logback" % "logback-classic" % "1.2.3"
).map(_ % Test),
libraryDependencies ++= {
Expand Down

0 comments on commit b444b6a

Please sign in to comment.