From ca4cc16d5247147cdf5f1423a10a994ae9f69a3d Mon Sep 17 00:00:00 2001 From: Lars Hupel Date: Thu, 13 May 2021 20:08:19 +0200 Subject: [PATCH] Scala 3.0.0 final [CE2] --- .github/workflows/ci.yml | 2 +- build.sbt | 9 ++++----- project/plugins.sbt | 1 + 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 66f0cb2e92..a5c7f53b56 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [3.0.0-RC2, 3.0.0-RC3, 2.12.13, 2.13.5] + scala: [3.0.0, 2.12.13, 2.13.5] java: [adopt@1.8, adopt@1.11] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index 17adae9a17..46d3b83403 100644 --- a/build.sbt +++ b/build.sbt @@ -23,10 +23,9 @@ ThisBuild / baseVersion := "2.5" val OldScala = "2.12.13" val NewScala = "2.13.5" -val OldDotty = "3.0.0-RC2" -val NewDotty = "3.0.0-RC3" +val Dotty = "3.0.0" -ThisBuild / crossScalaVersions := Seq(OldDotty, NewDotty, OldScala, NewScala) +ThisBuild / crossScalaVersions := Seq(Dotty, OldScala, NewScala) ThisBuild / scalaVersion := (ThisBuild / crossScalaVersions).value.last ThisBuild / githubWorkflowJavaVersions := Seq("adopt@1.8", "adopt@1.11") @@ -59,8 +58,8 @@ ThisBuild / scmInfo := Some( ScmInfo(url("https://github.com/typelevel/cats-effect"), "git@github.com:typelevel/cats-effect.git") ) -val CatsVersion = "2.6.0" -val DisciplineMunitVersion = "1.0.8" +val CatsVersion = "2.6.1" +val DisciplineMunitVersion = "1.0.9" val SilencerVersion = "1.7.3" replaceCommandAlias( diff --git a/project/plugins.sbt b/project/plugins.sbt index 5df4e4b7ce..30e3b0ae8e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,3 +4,4 @@ addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.20") addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.20.4") +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.5")