From e535074dddc909c8324ea1d84edcfbeae983fefb Mon Sep 17 00:00:00 2001 From: Nikita Vilunov Date: Mon, 30 Sep 2024 11:21:02 +0200 Subject: [PATCH 1/7] Bump libraries --- build.sbt | 2 +- project/Dependencies.scala | 12 ++++++------ project/build.properties | 2 +- .../com/evolutiongaming/stracer/TraceJson.scala | 2 +- .../random/ThreadLocalRandomSpec.scala | 10 ++++------ 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/build.sbt b/build.sbt index 8eb3d9c..73b33a7 100644 --- a/build.sbt +++ b/build.sbt @@ -59,7 +59,7 @@ val commonSettings = Seq( organizationName := "Evolution", organizationHomepage := Some(url("https://evolution.com")), scalaVersion := crossScalaVersions.value.head, - crossScalaVersions := Seq("2.13.7", "2.12.15"), + crossScalaVersions := Seq("2.13.14", "2.12.15"), 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 64112e9..9200dfc 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -7,7 +7,7 @@ object Dependencies { val `cats-helper` = "com.evolutiongaming" %% "cats-helper" % "3.5.0" val random = "com.evolutiongaming" %% "random" % "1.0.0" val configTools = "com.evolutiongaming" %% "config-tools" % "1.0.4" - val skafka = "com.evolutiongaming" %% "skafka" % "16.0.0" + val skafka = "com.evolutiongaming" %% "skafka" % "17.1.2" object Cats { @@ -16,7 +16,7 @@ object Dependencies { } object CatsEffect { - private val version = "3.3.14" + private val version = "3.5.3" val effect = "org.typelevel" %% "cats-effect" % version } @@ -26,14 +26,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 fdb2429..3829f19 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.3 \ No newline at end of file +sbt.version=1.10.2 \ No newline at end of file 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 59e1c8a..5f8f9e9 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 { diff --git a/stracer/src/test/scala/com/evolutiongaming/random/ThreadLocalRandomSpec.scala b/stracer/src/test/scala/com/evolutiongaming/random/ThreadLocalRandomSpec.scala index 2fd25ef..a2e285d 100644 --- a/stracer/src/test/scala/com/evolutiongaming/random/ThreadLocalRandomSpec.scala +++ b/stracer/src/test/scala/com/evolutiongaming/random/ThreadLocalRandomSpec.scala @@ -1,8 +1,6 @@ package com.evolutiongaming.random -import cats.syntax.all._ -import cats.effect.{Clock, IO, Sync} -import com.evolutiongaming.catshelper.ThreadLocalOf +import cats.effect.IO import com.evolutiongaming.stracer.IOSuite._ import org.scalatest.funsuite.AsyncFunSuite import org.scalatest.matchers.should.Matchers @@ -10,12 +8,12 @@ import org.scalatest.matchers.should.Matchers class ThreadLocalRandomSpec extends AsyncFunSuite with Matchers { test("return random numbers") { - randomTraces[IO].run() + randomTraces.run() } - private def randomTraces[F[_]: Sync: Clock: ThreadLocalOf]: F[Unit] = + private def randomTraces: IO[Unit] = for { - random <- ThreadLocalRandom.of[F] + random <- ThreadLocalRandom.of[IO] n1 <- random.int n2 <- random.int } yield { From 0059b578d0b6f7009b85570b43519feb4f6a05a2 Mon Sep 17 00:00:00 2001 From: Nikita Vilunov Date: Mon, 30 Sep 2024 11:35:39 +0200 Subject: [PATCH 2/7] Bump ver --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index 5fae3e3..c078614 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "5.0.2-SNAPSHOT" +ThisBuild / version := "6.0.0" From 4cb9b0bdb2147f22683fa4e21657e0e8cbd30534 Mon Sep 17 00:00:00 2001 From: Nikita Vilunov Date: Mon, 30 Sep 2024 12:03:11 +0200 Subject: [PATCH 3/7] Bump ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ac2abf5..e8bfc8f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: matrix: scala: - - 2.13.7 + - 2.13.14 - 2.12.15 steps: From 23913bcd7113da2095e8a79c9d32bc8163e93e1b Mon Sep 17 00:00:00 2001 From: Nikita Vilunov Date: Mon, 30 Sep 2024 12:12:34 +0200 Subject: [PATCH 4/7] Bump scoverage --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 58dfba5..1e446f6 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.0") addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.1") From 4d451bed1934ce8100df33543623b26ee42f3ed0 Mon Sep 17 00:00:00 2001 From: Nikita Vilunov Date: Mon, 30 Sep 2024 12:29:42 +0200 Subject: [PATCH 5/7] Bump scoverage --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 1e446f6..e0ae084 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.0") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.1") addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.1") From 703df7524510e260fabaafd4b12b095516d5b4d3 Mon Sep 17 00:00:00 2001 From: Nikita Vilunov Date: Mon, 30 Sep 2024 12:35:26 +0200 Subject: [PATCH 6/7] Bump scalac --- .github/workflows/ci.yml | 2 +- build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e8bfc8f..71f9095 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: matrix: scala: - - 2.13.14 + - 2.13.15 - 2.12.15 steps: diff --git a/build.sbt b/build.sbt index 73b33a7..7794a98 100644 --- a/build.sbt +++ b/build.sbt @@ -59,7 +59,7 @@ val commonSettings = Seq( organizationName := "Evolution", organizationHomepage := Some(url("https://evolution.com")), scalaVersion := crossScalaVersions.value.head, - crossScalaVersions := Seq("2.13.14", "2.12.15"), + crossScalaVersions := Seq("2.13.15", "2.12.15"), releaseCrossBuild := true, licenses := Seq(("MIT", url("https://opensource.org/licenses/MIT"))), publishTo := Some(Resolver.evolutionReleases), From 89b1863b824ea4229abb6ee54adcf2e6d729ec25 Mon Sep 17 00:00:00 2001 From: Nikita Vilunov Date: Mon, 30 Sep 2024 12:46:25 +0200 Subject: [PATCH 7/7] Bump scalac --- .github/workflows/ci.yml | 2 +- build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 71f9095..e28b4e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: matrix: scala: - 2.13.15 - - 2.12.15 + - 2.12.20 steps: - uses: actions/checkout@v2 diff --git a/build.sbt b/build.sbt index 7794a98..d40035f 100644 --- a/build.sbt +++ b/build.sbt @@ -59,7 +59,7 @@ val commonSettings = Seq( organizationName := "Evolution", organizationHomepage := Some(url("https://evolution.com")), scalaVersion := crossScalaVersions.value.head, - crossScalaVersions := Seq("2.13.15", "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),