Skip to content

Commit

Permalink
Merge branch 'master' into scalajs
Browse files Browse the repository at this point in the history
  • Loading branch information
sirocchj authored Sep 14, 2023
2 parents cfdf22c + bc3c8d8 commit 3fafad2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 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.18, 2.13.11, 3.3.1]
scala: [2.12.18, 2.13.12, 3.3.1]
java: [temurin@11, temurin@17]
project: [rootJS, rootJVM]
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -208,12 +208,12 @@ jobs:
tar xf targets.tar
rm targets.tar
- name: Download target directories (2.13.11, rootJVM)
- name: Download target directories (2.13.12, rootJVM)
uses: actions/download-artifact@v3
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-rootJVM
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.12-rootJVM

- name: Inflate target directories (2.13.11, rootJVM)
- name: Inflate target directories (2.13.12, rootJVM)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
val scala_212 = "2.12.18"
val scala_213 = "2.13.11"
val scala_213 = "2.13.12"
val scala_3 = "3.3.1"

val V = new {
val cats = "2.10.0"
val catsEffect = "3.5.1"
val fs2 = "3.9.1"
val fs2 = "3.9.2"
val kindProjector = "0.13.2"
val log4cats = "2.6.0"
val log4s = "1.10.0"
Expand Down

0 comments on commit 3fafad2

Please sign in to comment.