Skip to content

Commit

Permalink
upgrade scala
Browse files Browse the repository at this point in the history
  • Loading branch information
pjfanning committed Sep 27, 2024
1 parent e38523e commit 550981a
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.11.12, 2.12.19, 2.13.14, 3.3.3]
scala: [2.11.12, 2.12.20, 2.13.15, 3.3.4]
java: [zulu@8, zulu@11, zulu@17, zulu@21]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.14]
scala: [2.13.15]
java: [zulu@8]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -136,32 +136,32 @@ jobs:
tar xf targets.tar
rm targets.tar
- name: Download target directories (2.12.19)
- name: Download target directories (2.12.20)
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-2.12.19-${{ matrix.java }}
name: target-${{ matrix.os }}-2.12.20-${{ matrix.java }}

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

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

- name: Inflate target directories (3.3.3)
- name: Inflate target directories (3.3.4)
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
Expand Up @@ -6,10 +6,10 @@ name := "jackson-module-scala"

organization := "com.fasterxml.jackson.module"

val scala213Version = "2.13.14"
val scala213Version = "2.13.15"
ThisBuild / scalaVersion := scala213Version

ThisBuild / crossScalaVersions := Seq("2.11.12", "2.12.19", scala213Version, "3.3.3")
ThisBuild / crossScalaVersions := Seq("2.11.12", "2.12.20", scala213Version, "3.3.4")

// resolvers ++= Resolver.sonatypeOssRepos("snapshots")

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.10.1
sbt.version=1.10.2

0 comments on commit 550981a

Please sign in to comment.