Skip to content

Commit

Permalink
Merge pull request #1966 from typelevel/topic/dotty-for-ce2
Browse files Browse the repository at this point in the history
Scala 3.0.0 final [CE2]
  • Loading branch information
larsrh authored May 13, 2021
2 parents 7b8e783 + ca4cc16 commit 7dce14d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 4 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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(
Expand Down
1 change: 1 addition & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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")

0 comments on commit 7dce14d

Please sign in to comment.