Skip to content

Commit 898b91f

Browse files
authored
Merge pull request #401 from typelevel/scala-3.1
Upgrade to Scala 3.1.2
2 parents f687137 + 5def89a commit 898b91f

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

.github/workflows/ci.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@ jobs:
2828
strategy:
2929
matrix:
3030
os: [ubuntu-latest]
31-
scala: [2.12.15, 3.0.2, 2.13.8]
31+
scala: [2.12.15, 3.1.2, 2.13.8]
3232
java: [temurin@8, temurin@11, temurin@17]
3333
project: [rootJS, rootJVM]
3434
exclude:
3535
- scala: 2.12.15
3636
java: temurin@11
3737
- scala: 2.12.15
3838
java: temurin@17
39-
- scala: 3.0.2
39+
- scala: 3.1.2
4040
java: temurin@11
41-
- scala: 3.0.2
41+
- scala: 3.1.2
4242
java: temurin@17
4343
- project: rootJS
4444
java: temurin@11
@@ -244,22 +244,22 @@ jobs:
244244
tar xf targets.tar
245245
rm targets.tar
246246
247-
- name: Download target directories (3.0.2, rootJS)
247+
- name: Download target directories (3.1.2, rootJS)
248248
uses: actions/download-artifact@v2
249249
with:
250-
name: target-${{ matrix.os }}-${{ matrix.java }}-3.0.2-rootJS
250+
name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.2-rootJS
251251

252-
- name: Inflate target directories (3.0.2, rootJS)
252+
- name: Inflate target directories (3.1.2, rootJS)
253253
run: |
254254
tar xf targets.tar
255255
rm targets.tar
256256
257-
- name: Download target directories (3.0.2, rootJVM)
257+
- name: Download target directories (3.1.2, rootJVM)
258258
uses: actions/download-artifact@v2
259259
with:
260-
name: target-${{ matrix.os }}-${{ matrix.java }}-3.0.2-rootJVM
260+
name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.2-rootJVM
261261

262-
- name: Inflate target directories (3.0.2, rootJVM)
262+
- name: Inflate target directories (3.1.2, rootJVM)
263263
run: |
264264
tar xf targets.tar
265265
rm targets.tar

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
val Scala212 = "2.12.15"
22
val Scala213 = "2.13.8"
3-
val Scala3 = "3.0.2"
3+
val Scala3 = "3.1.2"
44

5-
ThisBuild / tlBaseVersion := "3.1"
5+
ThisBuild / tlBaseVersion := "3.2"
66
ThisBuild / crossScalaVersions := Seq(Scala212, Scala3, Scala213)
77
ThisBuild / tlVersionIntroduced := Map("3" -> "3.0.3")
88
ThisBuild / licenses := List("MIT" -> url("http://opensource.org/licenses/MIT"))

0 commit comments

Comments
 (0)