diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 56b189289..adb7164c4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: matrix: scala: - - 2.13.8 + - 2.13.14 steps: - uses: actions/checkout@v3 diff --git a/build.sbt b/build.sbt index 7d4e78bec..a4bdbb288 100644 --- a/build.sbt +++ b/build.sbt @@ -9,7 +9,7 @@ lazy val commonSettings = Seq( organizationHomepage := Some(url("http://evolution.com")), publishTo := Some(Resolver.evolutionReleases), scalaVersion := crossScalaVersions.value.head, - crossScalaVersions := Seq("2.13.8"), + crossScalaVersions := Seq("2.13.14"), Compile / doc / scalacOptions ++= Seq("-groups", "-implicits", "-no-link-warnings"), scalacOptsFailOnWarn := Some(false), licenses := Seq(("MIT", url("https://opensource.org/licenses/MIT"))), diff --git a/journal/src/main/scala/com/evolutiongaming/kafka/journal/JsonCodec.scala b/journal/src/main/scala/com/evolutiongaming/kafka/journal/JsonCodec.scala index b05c367f0..d47f33f95 100644 --- a/journal/src/main/scala/com/evolutiongaming/kafka/journal/JsonCodec.scala +++ b/journal/src/main/scala/com/evolutiongaming/kafka/journal/JsonCodec.scala @@ -4,9 +4,9 @@ import java.nio.charset.StandardCharsets import cats.syntax.all._ import cats.~> +import com.evolution.playjson.jsoniter.PlayJsonJsoniter import com.evolutiongaming.catshelper.CatsHelper._ import com.evolutiongaming.catshelper.{ApplicativeThrowable, FromTry, MonadThrowable} -import com.evolutiongaming.jsonitertool.PlayJsonJsoniter import com.evolutiongaming.kafka.journal.util.ScodecHelper._ import play.api.libs.json.{JsValue, Json} import scodec.bits.ByteVector diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 5c7282e72..12dfca52b 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -2,12 +2,12 @@ import sbt._ object Dependencies { - val scalatest = "org.scalatest" %% "scalatest" % "3.2.13" + val scalatest = "org.scalatest" %% "scalatest" % "3.2.19" val `scala-java8-compat` = "org.scala-lang.modules" %% "scala-java8-compat" % "1.0.2" - val `kind-projector` = "org.typelevel" % "kind-projector" % "0.13.2" + val `kind-projector` = "org.typelevel" % "kind-projector" % "0.13.3" val `cassandra-driver` = "com.datastax.cassandra" % "cassandra-driver-core" % "3.11.2" - val `play-json` = "com.typesafe.play" %% "play-json" % "2.9.3" - val `play-json-jsoniter` = "com.evolutiongaming" %% "play-json-jsoniter" % "0.10.2" + val `play-json` = "com.typesafe.play" %% "play-json" % "2.10.5" + val `play-json-jsoniter` = "com.evolution" %% "play-json-jsoniter" % "1.1.1" val `executor-tools` = "com.evolutiongaming" %% "executor-tools" % "1.0.3" val `config-tools` = "com.evolutiongaming" %% "config-tools" % "1.0.3" val `akka-serialization` = "com.evolutiongaming" %% "akka-serialization" % "1.0.4" @@ -21,13 +21,13 @@ object Dependencies { val random = "com.evolutiongaming" %% "random" % "0.1.1" val retry = "com.evolutiongaming" %% "retry" % "2.1.1" val sstream = "com.evolutiongaming" %% "sstream" % "0.3.0" - val skafka = "com.evolutiongaming" %% "skafka" % "11.16.0" - val scache = "com.evolution" %% "scache" % "3.8.0" + val skafka = "com.evolutiongaming" %% "skafka" % "11.18.0" + val scache = "com.evolution" %% "scache" % "3.9.0" val `akka-test-actor` = "com.evolutiongaming" %% "akka-test-actor" % "0.1.0" val `resource-pool` = "com.evolution" %% "resource-pool" % "0.0.4" object Cats { - val core = "org.typelevel" %% "cats-core" % "2.10.0" + val core = "org.typelevel" %% "cats-core" % "2.12.0" val effect = "org.typelevel" %% "cats-effect" % "2.5.5" } @@ -44,7 +44,7 @@ object Dependencies { } object Akka { - private val version = "2.6.13" + private val version = "2.6.21" val actor = "com.typesafe.akka" %% "akka-actor" % version val testkit = "com.typesafe.akka" %% "akka-testkit" % version val stream = "com.typesafe.akka" %% "akka-stream" % version @@ -60,7 +60,7 @@ object Dependencies { } object Scodec { - val core = "org.scodec" %% "scodec-core" % "1.11.7" + val core = "org.scodec" %% "scodec-core" % "1.11.10" val bits = "org.scodec" %% "scodec-bits" % "1.1.20" } diff --git a/project/build.properties b/project/build.properties index b1e589d9f..3829f19f7 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.7.1 \ No newline at end of file +sbt.version=1.10.2 \ No newline at end of file diff --git a/project/plugins.sbt b/project/plugins.sbt index 9a57b00b3..936327505 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.6") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.0") addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.2") diff --git a/version.sbt b/version.sbt index 661352764..eae5ef9b8 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "0.3.14-SNAPSHOT" +ThisBuild / version := "0.4.0"