diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f3f0e16..027bf37 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-22.04] - scala: [2.13, 3] + scala: [3.9.0, 3.3.8] java: [temurin@21, temurin@17, temurin@11] runs-on: ${{ matrix.os }} timeout-minutes: 60 @@ -179,22 +179,22 @@ jobs: if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false' run: sbt +update - - name: Download target directories (2.13) + - name: Download target directories (3.9.0) uses: actions/download-artifact@v6 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13 + name: target-${{ matrix.os }}-${{ matrix.java }}-3.9.0 - - name: Inflate target directories (2.13) + - name: Inflate target directories (3.9.0) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3) + - name: Download target directories (3.3.8) uses: actions/download-artifact@v6 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3 + name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.8 - - name: Inflate target directories (3) + - name: Inflate target directories (3.3.8) run: | tar xf targets.tar rm targets.tar @@ -282,7 +282,7 @@ jobs: - name: Submit Dependencies uses: scalacenter/sbt-dependency-submission@v2 with: - modules-ignore: root_2.13 root_3 sbt-http4s-org-scalafix-internal_2.13 sbt-http4s-org-scalafix-internal_3 + modules-ignore: root_3 root_3 sbt-http4s-org-scalafix-internal_3 sbt-http4s-org-scalafix-internal_3 configs-ignore: test scala-tool scala-doc-tool test-internal coverage: @@ -290,7 +290,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04] - scala: [2.13.18] + scala: [3.9.0] java: [temurin@8] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index 01a7d55..c0f71b4 100644 --- a/build.sbt +++ b/build.sbt @@ -33,7 +33,7 @@ ThisBuild / githubWorkflowAddedJobs ++= Seq( ) ) -val Scala213 = "2.13.18" +val Scala213 = "3.9.0" val Scala3 = "3.3.8" ThisBuild / scalaVersion := Scala213 ThisBuild / crossScalaVersions := Seq(Scala213, Scala3) diff --git a/mise.toml b/mise.toml index 1a22e00..86da3d2 100644 --- a/mise.toml +++ b/mise.toml @@ -1,7 +1,7 @@ [tools] java="temurin-21" sbt="1.11.6" -scala="2.13.18" +scala="3.9.0" [env] # SBT options for better performance