Skip to content

Commit aca13f2

Browse files
authored
Merge pull request #3838 from typelevel/topic/dotty-rc2
Scala 3.0.0-RC2
2 parents 35967b4 + 34db8a6 commit aca13f2

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
os: [ubuntu-latest]
26-
scala: [2.12.13, 2.13.5, 3.0.0-M3, 3.0.0-RC1]
26+
scala: [2.12.13, 2.13.5, 3.0.0-RC1, 3.0.0-RC2]
2727
java:
2828
2929
@@ -43,10 +43,10 @@ jobs:
4343
4444
- platform: native
4545
46-
- platform: native
47-
scala: 3.0.0-M3
4846
- platform: native
4947
scala: 3.0.0-RC1
48+
- platform: native
49+
scala: 3.0.0-RC2
5050
runs-on: ${{ matrix.os }}
5151
steps:
5252
- name: Checkout current branch (full)
@@ -83,23 +83,23 @@ jobs:
8383
run: sbt ++${{ matrix.scala }} validateAllNative
8484

8585
- name: Validate JVM (scala 2)
86-
if: matrix.platform == 'jvm' && (matrix.scala != '3.0.0-M3' && matrix.scala != '3.0.0-RC1')
86+
if: matrix.platform == 'jvm' && (matrix.scala != '3.0.0-RC1' && matrix.scala != '3.0.0-RC2')
8787
run: sbt ++${{ matrix.scala }} buildJVM bench/test
8888

8989
- name: Validate JVM (scala 3)
90-
if: matrix.platform == 'jvm' && (matrix.scala == '3.0.0-M3' || matrix.scala == '3.0.0-RC1')
90+
if: matrix.platform == 'jvm' && (matrix.scala == '3.0.0-RC1' || matrix.scala == '3.0.0-RC2')
9191
run: sbt ++${{ matrix.scala }} buildJVM bench/test
9292

9393
- name: Binary compatibility ${{ matrix.scala }}
94-
if: matrix.platform == 'jvm' && (matrix.scala != '3.0.0-M3' && matrix.scala != '3.0.0-RC1')
94+
if: matrix.platform == 'jvm' && (matrix.scala != '3.0.0-RC1' && matrix.scala != '3.0.0-RC2')
9595
run: sbt ++${{ matrix.scala }} clean validateBC
9696

9797
scalafix:
9898
name: Scalafix
9999
strategy:
100100
matrix:
101101
os: [ubuntu-latest]
102-
scala: [2.12.13, 2.13.5, 3.0.0-M3, 3.0.0-RC1]
102+
scala: [2.12.13, 2.13.5, 3.0.0-RC1, 3.0.0-RC2]
103103
104104
runs-on: ${{ matrix.os }}
105105
steps:
@@ -135,7 +135,7 @@ jobs:
135135
strategy:
136136
matrix:
137137
os: [ubuntu-latest]
138-
scala: [2.12.13, 2.13.5, 3.0.0-M3, 3.0.0-RC1]
138+
scala: [2.12.13, 2.13.5, 3.0.0-RC1, 3.0.0-RC2]
139139
140140
runs-on: ${{ matrix.os }}
141141
steps:
@@ -162,7 +162,7 @@ jobs:
162162
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
163163

164164
- name: Check formatting
165-
if: (matrix.scala != '3.0.0-M3' && matrix.scala != '3.0.0-RC1')
165+
if: (matrix.scala != '3.0.0-RC1' && matrix.scala != '3.0.0-RC2')
166166
run: sbt ++${{ matrix.scala }} fmtCheck
167167

168168
microsite:

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ val scalaCheckVersion = "1.15.3"
2121
val disciplineVersion = "1.1.4"
2222

2323
val disciplineScalatestVersion = "2.0.1"
24-
val disciplineMunitVersion = "1.0.6"
24+
val disciplineMunitVersion = "1.0.7"
2525

2626
val kindProjectorVersion = "0.11.3"
2727

@@ -37,8 +37,8 @@ ThisBuild / githubWorkflowJavaVersions := Seq(PrimaryJava, LTSJava, LatestJava,
3737

3838
val Scala212 = "2.12.13"
3939
val Scala213 = "2.13.5"
40-
val DottyOld = "3.0.0-M3"
41-
val DottyNew = "3.0.0-RC1"
40+
val DottyOld = "3.0.0-RC1"
41+
val DottyNew = "3.0.0-RC2"
4242

4343
ThisBuild / crossScalaVersions := Seq(Scala212, Scala213, DottyOld, DottyNew)
4444
ThisBuild / scalaVersion := Scala213

0 commit comments

Comments
 (0)