Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scala 3.0.0 final [CE3] #1967

Merged
merged 1 commit into from
May 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions .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, windows-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
Expand All @@ -37,9 +37,7 @@ jobs:
- ci: ciJS
java: graalvm-ce-java8@21.1
- os: windows-latest
scala: 3.0.0-RC2
- os: windows-latest
scala: 3.0.0-RC3
scala: 3.0.0
- os: windows-latest
scala: 2.12.13
- os: windows-latest
Expand All @@ -51,9 +49,7 @@ jobs:
- ci: ciFirefox
java: graalvm-ce-java8@21.1
- os: windows-latest
scala: 3.0.0-RC2
- os: windows-latest
scala: 3.0.0-RC3
scala: 3.0.0
- os: windows-latest
scala: 2.12.13
- os: windows-latest
Expand Down
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ val Windows = "windows-latest"
val ScalaJSJava = "adopt@1.8"
val Scala213 = "2.13.5"

ThisBuild / crossScalaVersions := Seq("3.0.0-RC2", "3.0.0-RC3", "2.12.13", Scala213)
ThisBuild / crossScalaVersions := Seq("3.0.0", "2.12.13", Scala213)

ThisBuild / githubWorkflowTargetBranches := Seq("series/3.x")

Expand Down Expand Up @@ -146,11 +146,11 @@ ThisBuild / apiURL := Some(url("https://typelevel.org/cats-effect/api/3.x/"))

ThisBuild / autoAPIMappings := true

val CatsVersion = "2.6.0"
val CatsVersion = "2.6.1"
val Specs2Version = "4.11.0"
val ScalaCheckVersion = "1.15.4"
val DisciplineVersion = "1.1.5"
val CoopVersion = "1.1.0"
val DisciplineVersion = "1.1.6"
val CoopVersion = "1.1.1"

replaceCommandAlias(
"ci",
Expand Down
2 changes: 1 addition & 1 deletion example/test-js.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ sbt ++$1 exampleJS/fastOptJS
output=$(mktemp)
expected=$(mktemp)

cd example/js/target/scala-$(echo $1 | sed -E 's/\.[0-9]+$//')/
cd example/js/target/scala-$(echo $1 | sed -E 's/^(2\.[0-9]+)\.[0-9]+$/\1/')/

set +e
node cats-effect-example-fastopt.js left right > $output
Expand Down
1 change: 1 addition & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.2")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.20")
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.3")
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.5")