Skip to content

Commit

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

Update scala-library to 2.12.20 in series/3.x
  • Loading branch information
armanbilge authored Sep 5, 2024
2 parents dab9d23 + 25666c5 commit fbbb854
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
38 changes: 19 additions & 19 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.3, 2.12.19, 2.13.14]
scala: [3.3.3, 2.12.20, 2.13.14]
java:
- temurin@8
- temurin@11
Expand All @@ -41,13 +41,13 @@ jobs:
java: temurin@11
- scala: 3.3.3
java: temurin@21
- scala: 2.12.19
- scala: 2.12.20
java: temurin@11
- scala: 2.12.19
- scala: 2.12.20
java: temurin@17
- scala: 2.12.19
- scala: 2.12.20
java: temurin@21
- scala: 2.12.19
- scala: 2.12.20
java: graalvm@17
- os: windows-latest
scala: 3.3.3
Expand All @@ -56,10 +56,10 @@ jobs:
scala: 3.3.3
ci: ciJVM
- os: windows-latest
scala: 2.12.19
scala: 2.12.20
ci: ciJVM
- os: macos-14
scala: 2.12.19
scala: 2.12.20
ci: ciJVM
- os: macos-14
java: temurin@8
Expand All @@ -68,9 +68,9 @@ jobs:
- ci: ciChrome
scala: 3.3.3
- ci: ciFirefox
scala: 2.12.19
scala: 2.12.20
- ci: ciChrome
scala: 2.12.19
scala: 2.12.20
- ci: ciJS
java: temurin@11
- ci: ciJS
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
ci: ciNative
- os: macos-14
ci: ciNative
scala: 2.12.19
scala: 2.12.20
- os: windows-latest
java: graalvm@17
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -422,32 +422,32 @@ jobs:
tar xf targets.tar
rm targets.tar
- name: Download target directories (2.12.19, ciJVM)
- name: Download target directories (2.12.20, ciJVM)
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.19-ciJVM
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.20-ciJVM

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

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

- name: Inflate target directories (2.12.19, ciJS)
- name: Inflate target directories (2.12.20, ciJS)
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 @@ -112,7 +112,7 @@ val PrimaryOS = "ubuntu-latest"
val Windows = "windows-latest"
val MacOS = "macos-14"

val Scala212 = "2.12.19"
val Scala212 = "2.12.20"
val Scala213 = "2.13.14"
val Scala3 = "3.3.3"

Expand Down

0 comments on commit fbbb854

Please sign in to comment.