diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ac2abf5..e28b4e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,8 +10,8 @@ jobs: strategy: matrix: scala: - - 2.13.7 - - 2.12.15 + - 2.13.15 + - 2.12.20 steps: - uses: actions/checkout@v2 diff --git a/build.sbt b/build.sbt index b7b5e9e..b35d603 100644 --- a/build.sbt +++ b/build.sbt @@ -58,7 +58,7 @@ val commonSettings = Seq( organizationName := "Evolution", organizationHomepage := Some(url("http://evolution.com")), scalaVersion := crossScalaVersions.value.head, - crossScalaVersions := Seq("2.13.7", "2.12.15"), + crossScalaVersions := Seq("2.13.15", "2.12.20"), releaseCrossBuild := true, licenses := Seq(("MIT", url("https://opensource.org/licenses/MIT"))), publishTo := Some(Resolver.evolutionReleases), diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 3dc85e8..41abfd2 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -7,7 +7,7 @@ object Dependencies { val `cats-helper` = "com.evolutiongaming" %% "cats-helper" % "2.11.0" val random = "com.evolutiongaming" %% "random" % "0.1.1" val configTools = "com.evolutiongaming" %% "config-tools" % "1.0.4" - val skafka = "com.evolutiongaming" %% "skafka" % "11.16.0" + val skafka = "com.evolutiongaming" %% "skafka" % "11.18.0" object Cats { private val version = "2.7.0" @@ -25,14 +25,14 @@ object Dependencies { } object PlayJsonTools { - private val version = "0.11.0" + private val version = "1.1.1" - val tools = "com.evolutiongaming" %% "play-json-tools" % version + val tools = "com.evolution" %% "play-json-tools" % version } object Circe { - private val version = "0.12.3" - private val versionExtras = "0.12.2" + private val version = "0.14.9" + private val versionExtras = "0.14.1" val core = "io.circe" %% "circe-core" % version val generic = "io.circe" %% "circe-generic" % version diff --git a/project/build.properties b/project/build.properties index fd5b157..3829f19 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.0 \ 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 58dfba5..e0ae084 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.3") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.1") addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.1") diff --git a/stracer-play-json/src/main/scala/com/evolutiongaming/stracer/TraceJson.scala b/stracer-play-json/src/main/scala/com/evolutiongaming/stracer/TraceJson.scala index 3a1c1be..cab4116 100644 --- a/stracer-play-json/src/main/scala/com/evolutiongaming/stracer/TraceJson.scala +++ b/stracer-play-json/src/main/scala/com/evolutiongaming/stracer/TraceJson.scala @@ -1,7 +1,7 @@ package com.evolutiongaming.stracer +import com.evolution.playjson.tools.PlayJsonHelper._ import com.evolutiongaming.stracer.hex.{FromHex, ToHex} -import com.evolutiongaming.playjsontools.PlayJsonHelper._ import play.api.libs.json._ object TraceJson { @@ -34,7 +34,7 @@ object TraceJson { def jsResult: JsResult[A] = self match { case Right(a) => JsSuccess(a) - case Left(a) => JsError(a) + case Left(a) => JsError(a) } } } diff --git a/version.sbt b/version.sbt index 7655dbd..7dc7be4 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "2.4.2-SNAPSHOT" +ThisBuild / version := "2.5.0"