Merge pull request #3860 from typelevel/topic/dotty-rc3

Scala 3.0.0-RC3
typelevel · Apr 19, 2021 · ce18a2a · ce18a2a
2 parents c993049 + 3a2eb82
commit ce18a2a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12.13, 2.13.5, 3.0.0-RC1, 3.0.0-RC2]
+        scala: [2.12.13, 2.13.5, 3.0.0-RC2, 3.0.0-RC3]
         java:
           - adopt@1.8
           - adopt@1.11
@@ -43,10 +43,10 @@ jobs:
             java: graalvm-ce-java8@20.2.0
           - platform: native
             java: graalvm-ce-java8@20.2.0
-          - platform: native
-            scala: 3.0.0-RC1
           - platform: native
             scala: 3.0.0-RC2
+          - platform: native
+            scala: 3.0.0-RC3
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
@@ -83,23 +83,23 @@ jobs:
         run: sbt ++${{ matrix.scala }} validateAllNative
 
       - name: Validate JVM (scala 2)
-        if: matrix.platform == 'jvm' && (matrix.scala != '3.0.0-RC1' && matrix.scala != '3.0.0-RC2')
+        if: matrix.platform == 'jvm' && (matrix.scala != '3.0.0-RC2' && matrix.scala != '3.0.0-RC3')
         run: sbt ++${{ matrix.scala }} buildJVM bench/test
 
       - name: Validate JVM (scala 3)
-        if: matrix.platform == 'jvm' && (matrix.scala == '3.0.0-RC1' || matrix.scala == '3.0.0-RC2')
+        if: matrix.platform == 'jvm' && (matrix.scala == '3.0.0-RC2' || matrix.scala == '3.0.0-RC3')
         run: sbt ++${{ matrix.scala }} buildJVM bench/test
 
       - name: Binary compatibility ${{ matrix.scala }}
-        if: matrix.platform == 'jvm' && (matrix.scala != '3.0.0-RC1' && matrix.scala != '3.0.0-RC2')
+        if: matrix.platform == 'jvm' && (matrix.scala != '3.0.0-RC2' && matrix.scala != '3.0.0-RC3')
         run: sbt ++${{ matrix.scala }} clean validateBC
 
   scalafix:
     name: Scalafix
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12.13, 2.13.5, 3.0.0-RC1, 3.0.0-RC2]
+        scala: [2.12.13, 2.13.5, 3.0.0-RC2, 3.0.0-RC3]
         java: [adopt@1.8]
     runs-on: ${{ matrix.os }}
     steps:
@@ -135,7 +135,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12.13, 2.13.5, 3.0.0-RC1, 3.0.0-RC2]
+        scala: [2.12.13, 2.13.5, 3.0.0-RC2, 3.0.0-RC3]
         java: [adopt@1.8]
     runs-on: ${{ matrix.os }}
     steps:
@@ -162,7 +162,7 @@ jobs:
           key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
       - name: Check formatting
-        if: (matrix.scala != '3.0.0-RC1' && matrix.scala != '3.0.0-RC2')
+        if: (matrix.scala != '3.0.0-RC2' && matrix.scala != '3.0.0-RC3')
         run: sbt ++${{ matrix.scala }} fmtCheck
 
   microsite:

diff --git a/build.sbt b/build.sbt
@@ -20,7 +20,7 @@ val scalaCheckVersion = "1.15.3"
 
 val disciplineVersion = "1.1.4"
 
-val disciplineMunitVersion = "1.0.7"
+val disciplineMunitVersion = "1.0.8"
 
 val kindProjectorVersion = "0.11.3"
 
@@ -36,8 +36,8 @@ ThisBuild / githubWorkflowJavaVersions := Seq(PrimaryJava, LTSJava, LatestJava,
 
 val Scala212 = "2.12.13"
 val Scala213 = "2.13.5"
-val DottyOld = "3.0.0-RC1"
-val DottyNew = "3.0.0-RC2"
+val DottyOld = "3.0.0-RC2"
+val DottyNew = "3.0.0-RC3"
 
 ThisBuild / crossScalaVersions := Seq(Scala212, Scala213, DottyOld, DottyNew)
 ThisBuild / scalaVersion := Scala213