Skip to content

Commit

Permalink
Add Scala 3.0.0 support (#208)
Browse files Browse the repository at this point in the history
* Add Scala 3.0.0 support

* upgrade deps to Scala 3.0.0
  • Loading branch information
grzegorz-bielski authored May 24, 2021
1 parent 0abf61b commit 2b851ed
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 14 deletions.
8 changes: 4 additions & 4 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]
scala: [2.12.12, 2.13.5, 3.0.0-M3]
scala: [2.12.12, 2.13.5, 3.0.0]
java: [[email protected]]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -52,12 +52,12 @@ jobs:
run: sbt ++${{ matrix.scala }} githubWorkflowCheck

- name: Test
if: matrix.scala != '3.0.0-M3'
if: matrix.scala != '3.0.0'
run: sbt ++${{ matrix.scala }} clean coverage test coverageReport scalastyle scalafmtCheckAll

- name: Test
if: matrix.scala == '3.0.0-M3'
if: matrix.scala == '3.0.0'
run: sbt ++${{ matrix.scala }} clean test

- if: matrix.scala != '3.0.0-M3'
- if: matrix.scala != '3.0.0'
uses: codecov/codecov-action@v1
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
.idea
target
.DS_Store

.bloop
.bsp
.metals
.vscode
project/**/metals.sbt
18 changes: 9 additions & 9 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ val compilerOptions = Seq(
)

val Versions = new {
val circe = "0.14.0-M3"
val discipline = "1.1.4"
val scalaCheck = "1.15.3"
val scalaTest = "3.2.3"
val scalaTestPlus = "3.2.3.0"
val circe = "0.14.0-M7"
val discipline = "1.1.5"
val scalaCheck = "1.15.4"
val scalaTest = "3.2.9"
val scalaTestPlus = "3.2.9.0"
val snakeYaml = "1.28"
val previousCirceYaml = "0.13.0"
}

val docMappingsApiDir = settingKey[String]("Subdirectory in site target directory for API docs")

ThisBuild / crossScalaVersions := Seq("2.12.12", "2.13.5", "3.0.0-M3")
ThisBuild / crossScalaVersions := Seq("2.12.12", "2.13.5", "3.0.0")

val root = project
.in(file("."))
Expand Down Expand Up @@ -121,19 +121,19 @@ ThisBuild / githubWorkflowBuild := Seq(
List("clean", "coverage", "test", "coverageReport", "scalastyle", "scalafmtCheckAll"),
id = None,
name = Some("Test"),
cond = Some("matrix.scala != '3.0.0-M3'")
cond = Some("matrix.scala != '3.0.0'")
),
WorkflowStep.Sbt(
List("clean", "test"),
id = None,
name = Some("Test"),
cond = Some("matrix.scala == '3.0.0-M3'")
cond = Some("matrix.scala == '3.0.0'")
),
WorkflowStep.Use(
"codecov",
"codecov-action",
"v1",
cond = Some("matrix.scala != '3.0.0-M3'")
cond = Some("matrix.scala != '3.0.0'")
)
)

Expand Down
1 change: 0 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@ addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.8.1")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7")
addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.9.5")
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.5")

0 comments on commit 2b851ed

Please sign in to comment.