Skip to content

Commit

Permalink
Merge pull request #390 from typelevel/feature/upgrade-ce
Browse files Browse the repository at this point in the history
Updated Scala and Cats Effect versions
  • Loading branch information
djspiewak authored Nov 14, 2022
2 parents 952d168 + adee7f7 commit f955166
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 14 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down

0 comments on commit f955166

Please sign in to comment.