Skip to content

Commit

Permalink
Merge pull request #3718 from mpilquist/topic/m3
Browse files Browse the repository at this point in the history
Upgrade to Scala 3.0.0-M3
  • Loading branch information
mpilquist authored Dec 18, 2020
2 parents a65b2c6 + 65ab0b6 commit ba5f1dd
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
24 changes: 12 additions & 12 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.3, 3.0.0-M1, 3.0.0-M2]
scala: [2.12.12, 2.13.3, 3.0.0-M2, 3.0.0-M3]
java:
- [email protected]
- [email protected]
Expand All @@ -38,10 +38,10 @@ jobs:
java: [email protected]
- platform: jvm
java: [email protected]
scala: 3.0.0-M1
scala: 3.0.0-M2
- platform: js
java: [email protected]
scala: 3.0.0-M1
scala: 3.0.0-M2
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
Expand Down Expand Up @@ -74,37 +74,37 @@ jobs:
run: sbt ++${{ matrix.scala }} validateAllJS

- name: Setup Python
if: matrix.platform == 'jvm' && (matrix.scala != '3.0.0-M1' && matrix.scala != '3.0.0-M2')
if: matrix.platform == 'jvm' && (matrix.scala != '3.0.0-M2' && matrix.scala != '3.0.0-M3')
uses: actions/setup-python@v2
with:
python-version: 3.x

- name: Setup codecov
if: matrix.platform == 'jvm' && (matrix.scala != '3.0.0-M1' && matrix.scala != '3.0.0-M2')
if: matrix.platform == 'jvm' && (matrix.scala != '3.0.0-M2' && matrix.scala != '3.0.0-M3')
run: pip install codecov

- name: Validate JVM (scala 2)
if: matrix.platform == 'jvm' && (matrix.scala != '3.0.0-M1' && matrix.scala != '3.0.0-M2')
if: matrix.platform == 'jvm' && (matrix.scala != '3.0.0-M2' && matrix.scala != '3.0.0-M3')
run: sbt ++${{ matrix.scala }} coverage buildJVM bench/test coverageReport

- name: Validate JVM (scala 3)
if: matrix.platform == 'jvm' && (matrix.scala == '3.0.0-M1' || matrix.scala == '3.0.0-M2')
if: matrix.platform == 'jvm' && (matrix.scala == '3.0.0-M2' || matrix.scala == '3.0.0-M3')
run: sbt ++${{ matrix.scala }} buildJVM bench/test

- name: Upload Codecov Results
if: matrix.platform == 'jvm' && (matrix.scala != '3.0.0-M1' && matrix.scala != '3.0.0-M2')
if: matrix.platform == 'jvm' && (matrix.scala != '3.0.0-M2' && matrix.scala != '3.0.0-M3')
run: codecov -F ${{ matrix.scala }}

- name: Binary compatibility ${{ matrix.scala }}
if: matrix.platform == 'jvm' && (matrix.scala != '3.0.0-M1' && matrix.scala != '3.0.0-M2')
if: matrix.platform == 'jvm' && (matrix.scala != '3.0.0-M2' && matrix.scala != '3.0.0-M3')
run: sbt ++${{ matrix.scala }} clean validateBC

scalafix:
name: Scalafix
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.12.12, 2.13.3, 3.0.0-M1, 3.0.0-M2]
scala: [2.12.12, 2.13.3, 3.0.0-M2, 3.0.0-M3]
java: [[email protected]]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -140,7 +140,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.12.12, 2.13.3, 3.0.0-M1, 3.0.0-M2]
scala: [2.12.12, 2.13.3, 3.0.0-M2, 3.0.0-M3]
java: [[email protected]]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -167,7 +167,7 @@ jobs:
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Check formatting
if: (matrix.scala != '3.0.0-M1' && matrix.scala != '3.0.0-M2')
if: (matrix.scala != '3.0.0-M2' && matrix.scala != '3.0.0-M3')
run: sbt ++${{ matrix.scala }} fmtCheck

microsite:
Expand Down
14 changes: 7 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ lazy val scoverageSettings = Seq(
)

organization in ThisBuild := "org.typelevel"
scalafixDependencies in ThisBuild += "org.typelevel" %% "simulacrum-scalafix" % "0.5.1"
scalafixDependencies in ThisBuild += "org.typelevel" %% "simulacrum-scalafix" % "0.5.3"

val scalaCheckVersion = "1.15.1"
val scalaCheckVersion = "1.15.2"

val disciplineVersion = "1.1.2"
val disciplineVersion = "1.1.3"

val disciplineScalatestVersion = "2.0.1"
val disciplineMunitVersion = "1.0.3"
val disciplineMunitVersion = "1.0.4"

val kindProjectorVersion = "0.11.2"

Expand All @@ -43,8 +43,8 @@ ThisBuild / githubWorkflowJavaVersions := Seq(PrimaryJava, LTSJava, LatestJava,

val Scala212 = "2.12.12"
val Scala213 = "2.13.3"
val DottyOld = "3.0.0-M1"
val DottyNew = "3.0.0-M2"
val DottyOld = "3.0.0-M2"
val DottyNew = "3.0.0-M3"

ThisBuild / crossScalaVersions := Seq(Scala212, Scala213, DottyOld, DottyNew)
ThisBuild / scalaVersion := Scala213
Expand Down Expand Up @@ -191,7 +191,7 @@ lazy val simulacrumSettings = Seq(
scalacOptions ++= (
if (isDotty.value) Nil else Seq(s"-P:semanticdb:targetroot:${baseDirectory.value}/target/.semanticdb", "-Yrangepos")
),
libraryDependencies += "org.typelevel" %% "simulacrum-scalafix-annotations" % "0.5.1"
libraryDependencies += "org.typelevel" %% "simulacrum-scalafix-annotations" % "0.5.3"
)

lazy val tagName = Def.setting {
Expand Down

0 comments on commit ba5f1dd

Please sign in to comment.