Skip to content

Commit

Permalink
Merge pull request #4239 from typelevel/update/series/3.x/scala-libra…
Browse files Browse the repository at this point in the history
…ry-2.13.16

Update scala-library to 2.13.16 in series/3.x
  • Loading branch information
djspiewak authored Jan 19, 2025
2 parents 47f33c1 + 6e88d00 commit cb3c29b
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
36 changes: 18 additions & 18 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, windows-latest, macos-14]
scala: [3.3.4, 2.12.20, 2.13.15]
scala: [3.3.4, 2.12.20, 2.13.16]
java:
- temurin@8
- temurin@11
Expand Down Expand Up @@ -249,7 +249,7 @@ jobs:
- shell: bash
run: sbt '++ ${{ matrix.scala }}' '${{ matrix.ci }}'

- if: (matrix.scala == '2.13.15' || matrix.scala == '3.3.4') && matrix.ci == 'ciJVM' && matrix.java == 'temurin@17'
- if: (matrix.scala == '2.13.16' || matrix.scala == '3.3.4') && matrix.ci == 'ciJVM' && matrix.java == 'temurin@17'
shell: bash
run: sbt '++ ${{ matrix.scala }}' docs/mdoc

Expand All @@ -269,7 +269,7 @@ jobs:
run: example/test-native.sh ${{ matrix.scala }}

- name: Scalafix tests
if: matrix.scala == '2.13.15' && matrix.ci == 'ciJVM' && matrix.os == 'ubuntu-latest'
if: matrix.scala == '2.13.16' && matrix.ci == 'ciJVM' && matrix.os == 'ubuntu-latest'
shell: bash
run: |
cd scalafix
Expand Down Expand Up @@ -439,52 +439,52 @@ jobs:
tar xf targets.tar
rm targets.tar
- name: Download target directories (2.13.15, ciJVM)
- name: Download target directories (2.13.16, ciJVM)
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.15-ciJVM
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.16-ciJVM

- name: Inflate target directories (2.13.15, ciJVM)
- name: Inflate target directories (2.13.16, ciJVM)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (2.13.15, ciNative)
- name: Download target directories (2.13.16, ciNative)
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.15-ciNative
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.16-ciNative

- name: Inflate target directories (2.13.15, ciNative)
- name: Inflate target directories (2.13.16, ciNative)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (2.13.15, ciJS)
- name: Download target directories (2.13.16, ciJS)
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.15-ciJS
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.16-ciJS

- name: Inflate target directories (2.13.15, ciJS)
- name: Inflate target directories (2.13.16, ciJS)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (2.13.15, ciFirefox)
- name: Download target directories (2.13.16, ciFirefox)
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.15-ciFirefox
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.16-ciFirefox

- name: Inflate target directories (2.13.15, ciFirefox)
- name: Inflate target directories (2.13.16, ciFirefox)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (2.13.15, ciChrome)
- name: Download target directories (2.13.16, ciChrome)
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.15-ciChrome
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.16-ciChrome

- name: Inflate target directories (2.13.15, ciChrome)
- name: Inflate target directories (2.13.16, ciChrome)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ val Windows = "windows-latest"
val MacOS = "macos-14"

val Scala212 = "2.12.20"
val Scala213 = "2.13.15"
val Scala213 = "2.13.16"
val Scala3 = "3.3.4"

ThisBuild / crossScalaVersions := Seq(Scala3, Scala212, Scala213)
Expand Down

0 comments on commit cb3c29b

Please sign in to comment.