Skip to content

Commit

Permalink
Scala 3.1.2 (#464)
Browse files Browse the repository at this point in the history
* Scala 3.1.2

* Update sbt to 1.7.0-M1 and set scalaOutputVersion
  • Loading branch information
joroKr21 authored Apr 13, 2022
1 parent f1b74cd commit 735d569
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.12.15, 2.13.8, 3.1.2-RC3]
scala: [2.12.15, 2.13.8, 3.1.2]
java: [temurin@8]
project: [rootJS, rootJVM]
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [3.1.2-RC3]
scala: [3.1.2]
java: [temurin@8]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -168,22 +168,22 @@ jobs:
tar xf targets.tar
rm targets.tar
- name: Download target directories (3.1.2-RC3, rootJS)
- name: Download target directories (3.1.2, rootJS)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.2-RC3-rootJS
name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.2-rootJS

- name: Inflate target directories (3.1.2-RC3, rootJS)
- name: Inflate target directories (3.1.2, rootJS)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (3.1.2-RC3, rootJVM)
- name: Download target directories (3.1.2, rootJVM)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.2-RC3-rootJVM
name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.2-rootJVM

- name: Inflate target directories (3.1.2-RC3, rootJVM)
- name: Inflate target directories (3.1.2, rootJVM)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
3 changes: 2 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ import sbt._

val scala212 = "2.12.15"
val scala213 = "2.13.8"
val scala3 = "3.1.2-RC3"
val scala3 = "3.1.2"

ThisBuild / crossScalaVersions := Seq(scala212, scala213, scala3)
ThisBuild / scalaVersion := scala3
ThisBuild / scalaOutputVersion := (if (tlIsScala3.value) "3.0.2" else scalaVersion.value)
ThisBuild / tlBaseVersion := "3.0"
ThisBuild / organization := "org.typelevel"

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.6.2
sbt.version=1.7.0-M1

0 comments on commit 735d569

Please sign in to comment.