From 962b541c660d34c59e75b254cfc3153b3c3340f5 Mon Sep 17 00:00:00 2001 From: Daniel Spiewak Date: Mon, 14 Nov 2022 11:15:06 -0700 Subject: [PATCH 1/2] Updated Scala and Cats Effect versions --- .github/workflows/ci.yml | 22 +++++++++++----------- build.sbt | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 31130d5..4550e98 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [3.2.1, 2.12.17, 2.13.8] + scala: [3.2.1, 2.12.17, 2.13.10] java: [temurin@8] project: [rootJS, rootJVM, rootNative] runs-on: ${{ matrix.os }} @@ -114,7 +114,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.8] + scala: [2.13.10] java: [temurin@8] runs-on: ${{ matrix.os }} steps: @@ -211,32 +211,32 @@ jobs: tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.8, rootJS) + - name: Download target directories (2.13.10, rootJS) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.8-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootJS - - name: Inflate target directories (2.13.8, rootJS) + - name: Inflate target directories (2.13.10, rootJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.8, rootJVM) + - name: Download target directories (2.13.10, rootJVM) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.8-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootJVM - - name: Inflate target directories (2.13.8, rootJVM) + - name: Inflate target directories (2.13.10, rootJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.8, rootNative) + - name: Download target directories (2.13.10, rootNative) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.8-rootNative + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootNative - - name: Inflate target directories (2.13.8, rootNative) + - name: Inflate target directories (2.13.10, rootNative) run: | tar xf targets.tar rm targets.tar diff --git a/build.sbt b/build.sbt index 5e75056..ee228e9 100644 --- a/build.sbt +++ b/build.sbt @@ -20,12 +20,12 @@ ThisBuild / tlBaseVersion := "1.5" ThisBuild / startYear := Some(2020) ThisBuild / developers += tlGitHubDev("djspiewak", "Daniel Spiewak") -ThisBuild / crossScalaVersions := Seq("3.2.1", "2.12.17", "2.13.8") +ThisBuild / crossScalaVersions := Seq("3.2.1", "2.12.17", "2.13.10") ThisBuild / tlVersionIntroduced := Map("3" -> "1.1.1") ThisBuild / tlCiReleaseBranches := Seq("series/1.x") -val CatsEffectVersion = "3.3.14" +val CatsEffectVersion = "3.4.0" lazy val root = tlCrossRootProject .aggregate(core, specs2, utest, minitest, scalatest) From adee7f76f0c27f792677377ea42df7f8e4c63e5d Mon Sep 17 00:00:00 2001 From: Daniel Spiewak Date: Mon, 14 Nov 2022 12:10:34 -0700 Subject: [PATCH 2/2] Deal with warning things --- .../test/scala/cats/effect/testing/minitest/TestDetSuite.scala | 1 + .../src/main/scala/cats/effect/testing/utest/IOTestSuite.scala | 2 +- .../src/test/scala/cats/effect/testing/utest/TestDetSuite.scala | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/minitest/shared/src/test/scala/cats/effect/testing/minitest/TestDetSuite.scala b/minitest/shared/src/test/scala/cats/effect/testing/minitest/TestDetSuite.scala index 9743fb0..ff862c8 100644 --- a/minitest/shared/src/test/scala/cats/effect/testing/minitest/TestDetSuite.scala +++ b/minitest/shared/src/test/scala/cats/effect/testing/minitest/TestDetSuite.scala @@ -20,6 +20,7 @@ import cats.effect.IO import scala.concurrent.duration._ import cats.implicits._ +@deprecated("use TestControl instead", since = "1.5.0") object TestDetSuite extends DeterministicIOTestSuite { test("IO values should work") { IO(true).flatMap(b => IO(assert(b))) diff --git a/utest/shared/src/main/scala/cats/effect/testing/utest/IOTestSuite.scala b/utest/shared/src/main/scala/cats/effect/testing/utest/IOTestSuite.scala index a0a1303..e16b766 100644 --- a/utest/shared/src/main/scala/cats/effect/testing/utest/IOTestSuite.scala +++ b/utest/shared/src/main/scala/cats/effect/testing/utest/IOTestSuite.scala @@ -24,7 +24,7 @@ import scala.concurrent.duration._ import scala.concurrent.{ExecutionContext, Future} import scala.reflect.ClassTag -@nowarn("msg=parameter value evidence\\$1 in class EffectTestSuite is never used") +@nowarn abstract class EffectTestSuite[F[_]: Temporal: UnsafeRun](implicit Tag: ClassTag[F[Any]]) extends _root_.utest.TestSuite { diff --git a/utest/shared/src/test/scala/cats/effect/testing/utest/TestDetSuite.scala b/utest/shared/src/test/scala/cats/effect/testing/utest/TestDetSuite.scala index 5fa7a06..7bf2519 100644 --- a/utest/shared/src/test/scala/cats/effect/testing/utest/TestDetSuite.scala +++ b/utest/shared/src/test/scala/cats/effect/testing/utest/TestDetSuite.scala @@ -21,6 +21,7 @@ import cats.effect.IO import scala.concurrent.duration._ import utest._ +@deprecated("use TestControl instead", since = "1.5.0") object TestDetSuite extends DeterministicIOTestSuite { val tests = Tests { test("IO values should work") {