Skip to content

Commit

Permalink
Upgrade scalac 3.x and Cats version built with it
Browse files Browse the repository at this point in the history
Incorporates PRs
    - typelevel/pull/515
    - typelevel/pull/522
as they need to be done together.
  • Loading branch information
gemelen committed Jun 17, 2022
1 parent fa575d3 commit 96a7404
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [3.0.2, 2.13.8, 2.12.15]
scala: [3.1.2, 2.13.8, 2.12.15]
java: [temurin@8, temurin@11, temurin@17]
project: [rootJS, rootJVM]
exclude:
- scala: 3.0.2
- scala: 3.1.2
java: temurin@11
- scala: 3.0.2
- scala: 3.1.2
java: temurin@17
- scala: 2.13.8
java: temurin@11
Expand Down Expand Up @@ -224,22 +224,22 @@ jobs:
~/Library/Caches/Coursier/v1
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Download target directories (3.0.2, rootJS)
- name: Download target directories (3.1.2, rootJS)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-3.0.2-rootJS
name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.2-rootJS

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

- name: Inflate target directories (3.0.2, rootJVM)
- name: Inflate target directories (3.1.2, rootJVM)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import com.typesafe.tools.mima.core._

val catsVersion = "2.7.0"
val catsVersion = "2.8.0"
val munitVersion = "0.7.29"
val munitDisciplineVersion = "1.0.9"
val scalacheckVersion = "1.15.4"
val algebraVersion = "2.7.0"
val algebraVersion = "2.8.0"
val Scala212 = "2.12.15"
val Scala213 = "2.13.8"
val Scala3 = "3.0.2"
val Scala3 = "3.1.2"

ThisBuild / tlBaseVersion := "0.9"
ThisBuild / startYear := Some(2015)
Expand Down

0 comments on commit 96a7404

Please sign in to comment.